From 379a54db152ace9ca148791533f0671a7124d3aa Mon Sep 17 00:00:00 2001 From: nichind Date: Tue, 12 Nov 2024 01:48:14 +0300 Subject: [PATCH] hotfix --- pybalt/__main__.py | 20 +++++++++++++++++--- pybalt/cobalt.py | 22 ++++++++++------------ setup.py | 4 ++-- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/pybalt/__main__.py b/pybalt/__main__.py index fa81d81..f4d8933 100644 --- a/pybalt/__main__.py +++ b/pybalt/__main__.py @@ -36,13 +36,27 @@ async def _(): required=False, ) parser.add_argument( - "-filenameStyle", "-fs", type=str, help="Filename style", required=False + "-filenameStyle", + "-fs", + type=str, + help="Filename style", + required=False, + options=["classic", "pretty", "basic", "nerdy"], ) parser.add_argument( - "-audioFormat", "-af", type=str, help="Audio format", required=False + "-audioFormat", + "-af", + type=str, + help="Audio format", + required=False, + options=["mp3", "ogg", "wav", "opus"], ) parser.add_argument( - "-youtubeVideoCodec", "-yvc", help="Youtube video codec", required=False + "-youtubeVideoCodec", + "-yvc", + help="Youtube video codec", + required=False, + options=["vp9", "h264"], ) parser.add_argument( "-show", diff --git a/pybalt/cobalt.py b/pybalt/cobalt.py index a89cf12..940a766 100644 --- a/pybalt/cobalt.py +++ b/pybalt/cobalt.py @@ -11,7 +11,6 @@ from dotenv import load_dotenv from re import findall from importlib.metadata import version -from aiocfscrape import CloudflareScraper async def check_updates() -> bool: @@ -181,17 +180,16 @@ async def get_instance(self): key=lambda instance: instance["score"], reverse=True ) try: - async with CloudflareScraper() as session: - async with session.get( - good_instances[0]["protocol"] - + "://" - + good_instances[0]["api"] - ) as resp: - json = await resp.json() - if json["cobalt"]["url"] in self.skipped_instances: - raise exceptions.BadInstance() - self.api_instance = json["cobalt"]["url"] - break + async with cs.get( + good_instances[0]["protocol"] + + "://" + + good_instances[0]["api"] + ) as resp: + json = await resp.json() + if json["cobalt"]["url"] in self.skipped_instances: + raise exceptions.BadInstance() + self.api_instance = json["cobalt"]["url"] + break except Exception as exc: good_instances.pop(0) return self.api_instance diff --git a/setup.py b/setup.py index 3d9dd1d..b251bf9 100644 --- a/setup.py +++ b/setup.py @@ -8,10 +8,10 @@ def readme(): setup( name="pybalt", - version="2024.11.11", + version="2024.11.12", author="nichind", author_email="nichinddev@gmail.com", - description="", + description="Download mediafiles from YouTube, Twitter (X), Instagram, Reddit & more. CLI wrapper and python module for @imputnet's cobalt processing instance api.", long_description=readme(), long_description_content_type="text/markdown", url="https://github.com/nichind/pybalt",