PersonalPublic/different
1
0
Fork 0
mirror of https://github.com/Balshgit/different synced 2025-09-11 02:50:41 +03:00
Code Issues Projects Releases Wiki Activity

update dockerhub and goodgame

Browse Source
This commit is contained in:
Dmitry Afanasyev 2024-03-05 23:57:05 +03:00
parent 2687794443
commit e271a04900
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dockerhub.py
View File

@ -14,41 +14,41 @@ SERVICES: dict[str: dict[str, Any]] = {
'general': { 'general': {
'components': [ 'components': [
{'name': 'caddy', 'version': '2.7.6'}, {'name': 'caddy', 'version': '2.7.6'},
{'name': 'python', 'version': '3.12.1'}, {'name': 'python', 'version': '3.12.2'},
] ]
}, },
'nextcloud': { 'nextcloud': {
'components': [ 'components': [
{'name': 'nextcloud', 'version': '28.0.1'}, {'name': 'nextcloud', 'version': '28.0.3'},
{'name': 'mysql', 'version': '8.2.0'}, {'name': 'mysql', 'version': '8.3.0'},
{'name': 'redis', 'version': '7.2.3'}, {'name': 'redis', 'version': '7.2.4'},
{'name': 'nginx', 'version': '1.25.3'}, {'name': 'nginx', 'version': '1.25.4'},
{'name': 'onlyoffice/documentserver', 'version': '7.5.1.1'}, {'name': 'onlyoffice/documentserver', 'version': '8.0.1.1'},
], ],
}, },
'gitea': { 'gitea': {
'components': [ 'components': [
{'name': 'gitea/gitea', 'version': '1.21.3'}, {'name': 'gitea/gitea', 'version': '1.21.7'},
{'name': 'postgres', 'version': '16.1'}, {'name': 'postgres', 'version': '16.2'},
], ],
}, },
'mediawiki': { 'mediawiki': {
'components': [ 'components': [
{'name': 'mediawiki', 'version': '1.41.0'}, {'name': 'mediawiki', 'version': '1.41.0'},
{'name': 'mariadb', 'version': '11.2.2'}, {'name': 'mariadb', 'version': '11.3.2'},
], ],
}, },
'bitwarden': { 'bitwarden': {
'components': [ 'components': [
{'name': 'bitwarden/web', 'version': '2023.12.0'}, {'name': 'bitwarden/web', 'version': '2024.2.2'},
{'name': 'bitwarden/server', 'version': '2023.12.0'}, {'name': 'bitwarden/server', 'version': '2024.2.2'},
], ],
}, },
'mosgortrans': { 'mosgortrans': {
'deprecated': False, 'deprecated': False,
'components': [ 'components': [
{'name': 'selenoid/chrome', 'version': '120.0'}, {'name': 'selenoid/chrome', 'version': '121.0'},
{'name': 'aerokube/selenoid', 'version': '1.11.1'}, {'name': 'aerokube/selenoid', 'version': '1.11.2'},
], ],
}, },
} }

12
goodgame.py
View File

@ -42,7 +42,7 @@ logger = configure_logger()
class GoodGame: class GoodGame:
BASE_URL = 'https://goodgame.ru' BASE_URL = 'https://goodgame.ru'
API_URL = BASE_URL + '/api/4/streams' API_URL = BASE_URL + '/api/4/streams?hidden=true&only_gg=true&except=false'
PAGES_FOR_ASYNC_SCAN = 25 PAGES_FOR_ASYNC_SCAN = 25
CURRENT_WATCHERS_FILTER = 1 CURRENT_WATCHERS_FILTER = 1
INTERESTING_STREAMERS = ('snowboy', 'hell_girl', ) INTERESTING_STREAMERS = ('snowboy', 'hell_girl', )
@ -70,7 +70,7 @@ class GoodGame:
""" """
last_page = 1 last_page = 1
for page in range(self.PAGES_FOR_ASYNC_SCAN, 0, -1): for page in range(self.PAGES_FOR_ASYNC_SCAN, 0, -1):
response = requests.get(f'{self.API_URL}?page={page}') response = requests.get(f'{self.API_URL}&page={page}')
if response.json()["streams"]: if response.json()["streams"]:
last_page = page last_page = page
break break
@ -80,7 +80,7 @@ class GoodGame:
""" """
Deprecated Deprecated
""" """
response = requests.get(f'{self.API_URL}?page=1') response = requests.get(f'{self.API_URL}&page=1')
max_current_viewers = response.json()['streams'][0].get('viewers', None) max_current_viewers = response.json()['streams'][0].get('viewers', None)
return max_current_viewers return max_current_viewers
@ -158,7 +158,7 @@ class GoodGame:
streams = await asyncio.gather( streams = await asyncio.gather(
*[ *[
self._async_request(session, f'{self.API_URL}?page={page}') self._async_request(session, f'{self.API_URL}&page={page}')
for page in range(1, self.PAGES_FOR_ASYNC_SCAN + 1) for page in range(1, self.PAGES_FOR_ASYNC_SCAN + 1)
], ],
return_exceptions=True, return_exceptions=True,
@ -177,14 +177,14 @@ class GoodGame:
def sync_counter(self) -> str: def sync_counter(self) -> str:
page = 1 page = 1
response = requests.get(f'{self.API_URL}?page={page}', timeout=2) response = requests.get(f'{self.API_URL}&page={page}', timeout=2)
streams = response.json()['streams'] streams = response.json()['streams']
for stream in streams: for stream in streams:
self.all_streams.update({stream['id']: stream}) self.all_streams.update({stream['id']: stream})
max_current_viewers = streams[0]['viewers'] max_current_viewers = streams[0]['viewers']
while streams: while streams:
page += 1 page += 1
response = requests.get(f'{self.API_URL}?page={page}', timeout=2) response = requests.get(f'{self.API_URL}&page={page}', timeout=2)
streams = response.json()['streams'] streams = response.json()['streams']
for stream in streams: for stream in streams:
self.all_streams.update({stream['id']: stream}) self.all_streams.update({stream['id']: stream})