diff --git a/requirements.txt b/requirements.txt index 0e994c5..b8a2e38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -ptvp35 @ git+https://gitea.parrrate.ru/PTV/ptvp35.git@8be67bf834c7acb2d302060025e1a4c87e614cf8 -v6d0auth @ git+https://gitea.parrrate.ru/PTV/v6d0auth.git@f67bdf12ca73087333c07812442b25fd20a5e35d -v6d1tokens @ git+https://gitea.parrrate.ru/PTV/v6d1tokens.git@cbaf3df2facba2fe7951fa6d5e9325844844e9e7 -v6d2ctx @ git+https://gitea.parrrate.ru/PTV/v6d2ctx.git@1422f0a7628af65eb4f388cf0ebe384bede3164b +ptvp35 @ git+https://gitea.parrrate.ru/PTV/ptvp35.git@87ba808c2af1be87f4fbb9d9b3b97ba748cb9fae +v6d0auth @ git+https://gitea.parrrate.ru/PTV/v6d0auth.git@324236f435c92756aefe22877a97a906c462ef2c +v6d1tokens @ git+https://gitea.parrrate.ru/PTV/v6d1tokens.git@96567a0cb0c3cb60f20647518df5370df6dc6664 +v6d2ctx @ git+https://gitea.parrrate.ru/PTV/v6d2ctx.git@cbfae4ad868403e4133863b321ca615cc1c26086 rainbowadn @ git+https://gitea.parrrate.ru/PTV/rainbowadn.git@e9fba7b064902ceedee0dd5578cb47030665a6aa -adaas @ git+https://gitea.parrrate.ru/PTV/adaas.git@f49611b017064db616bcb77975e4afdf2aa0c3f5 +adaas @ git+https://gitea.parrrate.ru/PTV/adaas.git@5e407a73be3fc52e66a91725996087d4d11522f2 diff --git a/v6d3music/app.py b/v6d3music/app.py index 8d0a74d..5f68c62 100644 --- a/v6d3music/app.py +++ b/v6d3music/app.py @@ -14,7 +14,7 @@ from v6d1tokens.client import request_token from v6d3music.config import auth_redirect, myroot from v6d3music.utils.bytes_hash import bytes_hash -session_db = Db(myroot / 'session.db', kvrequest_type=KVJson) +session_db = Db(myroot / 'session.db', kvfactory=KVJson()) class MusicAppFactory(AppFactory): diff --git a/v6d3music/core/cache_url.py b/v6d3music/core/cache_url.py index b05c342..4faedd7 100644 --- a/v6d3music/core/cache_url.py +++ b/v6d3music/core/cache_url.py @@ -8,7 +8,7 @@ from v6d3music.utils.tor_prefix import tor_prefix cache_root = myroot / 'cache' cache_root.mkdir(exist_ok=True) -cache_db = Db(myroot / 'cache.db', kvrequest_type=KVJson) +cache_db = Db(myroot / 'cache.db', kvfactory=KVJson()) async def cache_url(hurl: str, rurl: str, override: bool, tor: bool) -> None: diff --git a/v6d3music/core/mainaudio.py b/v6d3music/core/mainaudio.py index 04a02e9..86debdd 100644 --- a/v6d3music/core/mainaudio.py +++ b/v6d3music/core/mainaudio.py @@ -6,7 +6,7 @@ from v6d3music.config import myroot from v6d3music.core.queueaudio import QueueAudio from v6d3music.utils.assert_admin import assert_admin -volume_db = Db(myroot / 'volume.db', kvrequest_type=KVJson) +volume_db = Db(myroot / 'volume.db', kvfactory=KVJson()) class MainAudio(discord.PCMVolumeTransformer): diff --git a/v6d3music/core/queueaudio.py b/v6d3music/core/queueaudio.py index e9314f4..066ccd3 100644 --- a/v6d3music/core/queueaudio.py +++ b/v6d3music/core/queueaudio.py @@ -10,7 +10,7 @@ from v6d3music.core.ytaudio import YTAudio from v6d3music.utils.assert_admin import assert_admin from v6d3music.utils.fill import FILL -queue_db = Db(myroot / 'queue.db', kvrequest_type=KVJson) +queue_db = Db(myroot / 'queue.db', kvfactory=KVJson()) PRE_SET_LENGTH = 24 diff --git a/v6d3music/utils/entries_effects_for_args.py b/v6d3music/utils/entries_effects_for_args.py index 232dbd3..920adf5 100644 --- a/v6d3music/utils/entries_effects_for_args.py +++ b/v6d3music/utils/entries_effects_for_args.py @@ -12,7 +12,7 @@ from v6d3music.utils.presets import allowed_effects from v6d3music.utils.sparq import sparq -effects_db = Db(myroot / 'effects.db', kvrequest_type=KVJson) +effects_db = Db(myroot / 'effects.db', kvfactory=KVJson()) def default_effects(gid: int) -> Optional[str]: diff --git a/v6d3music/utils/info_tuple.py b/v6d3music/utils/info_tuple.py index 07db908..c990778 100644 --- a/v6d3music/utils/info_tuple.py +++ b/v6d3music/utils/info_tuple.py @@ -1,3 +1,3 @@ from typing import Any, TypeAlias -info_tuple: TypeAlias = tuple[dict[str, Any], str, int, bool] +info_tuple: TypeAlias = tuple[dict[str, Any], str | None, int, bool] diff --git a/v6d3music/utils/options_for_effects.py b/v6d3music/utils/options_for_effects.py index ee00c09..b5fa780 100644 --- a/v6d3music/utils/options_for_effects.py +++ b/v6d3music/utils/options_for_effects.py @@ -2,5 +2,5 @@ import shlex from typing import Optional -def options_for_effects(effects: str) -> Optional[str]: +def options_for_effects(effects: str | None) -> Optional[str]: return f'-af {shlex.quote(effects)}' if effects else None