move download_spacer to somewhere accessible

cyberdrop_dl/__init__.py

@@ -1 +1 @@
-__version__ = "5.1.7"
+__version__ = "5.1.8"

cyberdrop_dl/clients/download_client.py

@@ -35,7 +35,7 @@ def limiter(func):
     @wraps(func)
     async def wrapper(self, *args, **kwargs):
         domain_limiter = await self.client_manager.get_rate_limiter(args[0])
-        await asyncio.sleep(await self.get_downloader_spacer(args[0]))
+        await asyncio.sleep(await self.client_manager.get_downloader_spacer(args[0]))
         await self._global_limiter.acquire()
         await domain_limiter.acquire()
 

cyberdrop_dl/managers/client_manager.py

@@ -45,6 +45,9 @@ def __init__(self, manager: Manager):
             "pixeldrain": AsyncLimiter(10, 1),
             "other": AsyncLimiter(25, 1)
         }
+        self.download_spacer = {'bunkr': 0.5, 'bunkrr': 0.5, 'cyberdrop': 0, 'coomer': 0, 'cyberfile': 0, 'kemono': 0,
+                                "pixeldrain": 0}
+
         self.global_rate_limiter = AsyncLimiter(self.rate_limit, 1)
         self.session_limit = asyncio.Semaphore(50)
         self.download_session_limit = asyncio.Semaphore(self.manager.config_manager.global_settings_data['Rate_Limiting_Options']['max_simultaneous_downloads'])
@@ -54,6 +57,12 @@ def __init__(self, manager: Manager):
 
     """~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"""
 
+    async def get_downloader_spacer(self, key: str) -> float:
+        """Returns the download spacer for a domain"""
+        if key in self.download_spacer:
+            return self.download_spacer[key]
+        return 0.1
+
     async def get_rate_limiter(self, domain: str) -> AsyncLimiter:
         """Get a rate limiter for a domain"""
         if domain in self.domain_rate_limits:

cyberdrop_dl/managers/download_manager.py

@@ -43,13 +43,6 @@ def __init__(self, manager: Manager):
         self.file_lock = FileLock()
 
         self.download_limits = {'bunkr': 1, 'bunkrr': 1, 'cyberdrop': 1, 'coomer': 2, 'cyberfile': 2, 'kemono': 2, "pixeldrain": 2}
-        self.download_spacer = {'bunkr': 0.5, 'bunkrr': 0.5, 'cyberdrop': 0, 'coomer': 0, 'cyberfile': 0, 'kemono': 0, "pixeldrain": 0}
-
-    async def get_downloader_spacer(self, key: str) -> float:
-        """Returns the download spacer for a domain"""
-        if key in self.download_spacer:
-            return self.download_spacer[key]
-        return 0.1
 
     async def get_download_limit(self, key: str) -> int:
         """Returns the download limit for a domain"""

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cyberdrop-dl"
-version = "5.1.7"
+version = "5.1.8"
 description = "Bulk downloader for multiple file hosts"
 authors = ["Jules Winnfield <[email protected]>"]
 readme = "README.md"