Ensure user specified domain_delay overrides any built in limiters.

Flexget · Nov 19, 2023 · 8e05b8b · 8e05b8b
1 parent e9a39a6
commit 8e05b8b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/flexget/components/sites/sites/awesomehd.py b/flexget/components/sites/sites/awesomehd.py
@@ -58,8 +58,7 @@ def search(self, task, entry, config):
         config = self.prepare_config(config)
 
         # set a domain limit, but allow the user to overwrite it
-        if 'awesome-hd.me' not in task.requests.domain_limiters:
-            task.requests.add_domain_limiter(TimedLimiter('awesome-hd.me', '5 seconds'))
+        task.requests.add_domain_limiter(TimedLimiter('awesome-hd.me', '5 seconds'), replace=False)
 
         entries = set()
 

diff --git a/flexget/components/sites/sites/btn.py b/flexget/components/sites/sites/btn.py
@@ -46,7 +46,7 @@ def prepare_config(self, config):
         return config
 
     def search(self, task, entry, config):
-        task.requests.add_domain_limiter(self.request_limiter)
+        task.requests.add_domain_limiter(self.request_limiter, replace=False)
         config = self.prepare_config(config)
         api_key = config['api_key']
 

diff --git a/flexget/components/sites/sites/iptorrents.py b/flexget/components/sites/sites/iptorrents.py
@@ -146,10 +146,8 @@ def search(self, task, entry, config=None):
 
         entries = set()
 
-        if not task.requests.domain_limiters.get(DOMAIN, None):
-            logger.debug('limiting requests with a delay of {}', DELAY)
-            rate_limiter = requests.TokenBucketLimiter(DOMAIN, 1, DELAY, True)
-            task.requests.add_domain_limiter(rate_limiter)
+        rate_limiter = requests.TokenBucketLimiter(DOMAIN, 1, DELAY, True)
+        task.requests.add_domain_limiter(rate_limiter, replace=False)
 
         for search_string in entry.get('search_strings', [entry['title']]):
             search_params = dict(category_params.items())

diff --git a/flexget/components/sites/sites/passthepopcorn.py b/flexget/components/sites/sites/passthepopcorn.py
@@ -154,7 +154,9 @@ def search(self, task, entry, config):
                         f"Searching for '{entry['title']}'  ignoring non numeric movie_year: '{entry['movie_year']}'"
                     )
 
-        task.requests.add_domain_limiter(TimedLimiter('passthepopcorn.me', '5 seconds'))
+        task.requests.add_domain_limiter(
+            TimedLimiter('passthepopcorn.me', '5 seconds'), replace=False
+        )
 
         for search_string in search_strings:
             params['searchstr'] = search_string

diff --git a/flexget/plugins/operate/domain_delay.py b/flexget/plugins/operate/domain_delay.py
@@ -21,7 +21,7 @@ class DomainDelay:
     def on_task_start(self, task, config):
         for domain, delay in config.items():
             logger.debug('Adding minimum interval of {} between requests to {}', delay, domain)
-            task.requests.add_domain_limiter(TimedLimiter(domain, delay))
+            task.requests.add_domain_limiter(TimedLimiter(domain, delay), replace=True)
 
 
 @event('plugin.register')