diff --git a/cyberdrop_dl/__init__.py b/cyberdrop_dl/__init__.py index 6cb4518aa..8d1bfbac7 100644 --- a/cyberdrop_dl/__init__.py +++ b/cyberdrop_dl/__init__.py @@ -1 +1 @@ -__version__ = "5.2.17" +__version__ = "5.2.18" diff --git a/cyberdrop_dl/main.py b/cyberdrop_dl/main.py index 781c1a2ce..ebbfa4b50 100644 --- a/cyberdrop_dl/main.py +++ b/cyberdrop_dl/main.py @@ -69,9 +69,9 @@ async def director(manager: Manager) -> None: file_handler_debug.setFormatter(formatter) logger_debug.addHandler(file_handler_debug) - aiosqlite_log = logging.getLogger("aiosqlite") - aiosqlite_log.setLevel(manager.config_manager.settings_data['Runtime_Options']['log_level']) - aiosqlite_log.addHandler(file_handler_debug) + # aiosqlite_log = logging.getLogger("aiosqlite") + # aiosqlite_log.setLevel(manager.config_manager.settings_data['Runtime_Options']['log_level']) + # aiosqlite_log.addHandler(file_handler_debug) while True: logger = logging.getLogger("cyberdrop_dl") diff --git a/cyberdrop_dl/scraper/crawlers/gofile_crawler.py b/cyberdrop_dl/scraper/crawlers/gofile_crawler.py index adc2782b5..a7ac839a9 100644 --- a/cyberdrop_dl/scraper/crawlers/gofile_crawler.py +++ b/cyberdrop_dl/scraper/crawlers/gofile_crawler.py @@ -23,6 +23,7 @@ def __init__(self, manager: Manager): super().__init__(manager, "gofile", "GoFile") self.api_address = URL("https://api.gofile.io") self.js_address = URL("https://gofile.io/dist/js/alljs.js") + self.primary_base_domain = URL("https://gofile.io") self.token = "" self.websiteToken = "" self.headers = {} @@ -69,7 +70,7 @@ async def album(self, scrape_item: ScrapeItem) -> None: for content_id in contents: content = contents[content_id] if content["type"] == "folder": - new_scrape_item = await self.create_scrape_item(scrape_item, URL(content["name"]), title, True) + new_scrape_item = await self.create_scrape_item(scrape_item, self.primary_base_domain / "d" / content["code"], title, True) self.manager.task_group.create_task(self.run(new_scrape_item)) continue if content["link"] == "overloaded": diff --git a/cyberdrop_dl/utils/utilities.py b/cyberdrop_dl/utils/utilities.py index c258324a3..b18599c00 100644 --- a/cyberdrop_dl/utils/utilities.py +++ b/cyberdrop_dl/utils/utilities.py @@ -103,7 +103,7 @@ async def log(message: [str, Exception], level: int) -> None: async def log_debug(message: [str, Exception], level: int) -> None: """Simple logging function""" if DEBUG_VAR: - logger_debug.log(level, message) + logger_debug.log(level, message.encode('ascii', 'ignore').decode('ascii')) async def log_with_color(message: str, style: str, level: int) -> None: diff --git a/pyproject.toml b/pyproject.toml index b5c70a50d..c8d87bfb7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cyberdrop-dl" -version = "5.2.17" +version = "5.2.18" description = "Bulk downloader for multiple file hosts" authors = ["Jules Winnfield "] readme = "README.md"