Merge pull request #78 from pymedusa/providers

Providers
pymedusa · Mar 2, 2016 · cccdb25 · cccdb25
2 parents 2b51fb5 + 2c52a68
commit cccdb25
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/sickbeard/providers/rarbg.py b/sickbeard/providers/rarbg.py
@@ -65,8 +65,8 @@ def login(self):
             "app_id": "sickrage2"
         }
 
-        #Maximum requests allowed are 1req/2sec
-        time.sleep(3)
+        # Maximum requests allowed are 1req/2sec
+        time.sleep(max(2, cpu_presets[sickbeard.CPU_PRESET]))
 
         response = self.get_url(self.urls["api"], params=login_params, timeout=30, returns="json")
         if not response:
@@ -127,8 +127,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                 if not self.login():
                     continue
 
-                #Maximum requests allowed are 1req/2sec
-                time.sleep(3)
+                # Maximum requests allowed are 1req/2sec
+                time.sleep(max(2, cpu_presets[CPU_PRESET]))
 
                 data = self.get_url(self.urls["api"], params=search_params, returns="json")
                 if not isinstance(data, dict):

diff --git a/sickbeard/providers/tvchaosuk.py b/sickbeard/providers/tvchaosuk.py
@@ -169,7 +169,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             torrent_size = torrent.find_all('td')[labels.index('Size')].get_text(strip=True)
                             size = convert_size(torrent_size, units=units) or -1
 
-                            item = title, download_url, size, seeders, leechers
+                            item = title + '.hdtv.x264', download_url, size, seeders, leechers
                             if mode != 'RSS':
                                 logger.log(u"Found result: {} with {} seeders and {} leechers".format
                                            (title, seeders, leechers), logger.DEBUG)

diff --git a/sickrage/recompiled/tags.py b/sickrage/recompiled/tags.py
@@ -8,7 +8,7 @@
 # Sources
 tv = re.compile(r'([sph]d).?tv|tv(rip|mux)', re.IGNORECASE)
 dvd = re.compile(r'(?P<hd>hd)?dvd(?P<rip>rip|mux)?', re.IGNORECASE)
-web = re.compile(r'(web.?(?P<dl>dl)|web(?P<rip>rip|mux|hd))', re.IGNORECASE)
+web = re.compile(r'(web(?P<type>rip|mux|hd|.?dl|\b))', re.IGNORECASE)
 bluray = re.compile(r'(blue?-?ray|b[rd](?:rip|mux))', re.IGNORECASE)
 sat = re.compile(r'(dsr|satrip)', re.IGNORECASE)
 itunes = re.compile(r'(itunes)', re.IGNORECASE)

diff --git a/sickrage/tagger/episode.py b/sickrage/tagger/episode.py
@@ -117,9 +117,12 @@ def web(self):
 
         :returns: an empty string if not found
         """
-        attr = 'web'
-        match = self._get_match_obj(attr)
-        return '' if not match else match.group('dl') or match.group('rip')
+        if 'dlmux' in self.name.lower():
+            return 'dlmux'
+        else:
+            attr = 'web'
+            match = self._get_match_obj(attr)
+            return '' if not match else match.group('type')
 
     @property
     def sat(self):