Browse Source

Add DrunkenSlug usenet provider and fix PiSexy torrent provider.

tags/release_0.14.7^2
JackDandy 7 years ago
parent
commit
3ea006912d
  1. 8
      CHANGES.md
  2. BIN
      gui/slick/images/providers/drunkenslug.png
  3. 1
      sickbeard/providers/__init__.py
  4. 23
      sickbeard/providers/pisexy.py

8
CHANGES.md

@ -1,4 +1,10 @@
### 0.14.6 (2018-03-05 15:40:00 UTC)
### 0.14.7 (2018-03-12 21:30:00 UTC)
Add DrunkenSlug usenet provider
Fix PiSexy torrent provider
### 0.14.6 (2018-03-05 15:40:00 UTC)
Fix config/notifications Trakt "inactive" status not displayed when it should be
Fix saving multiple account "Update collection" selection at config/notifications Trakt

BIN
gui/slick/images/providers/drunkenslug.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 890 B

1
sickbeard/providers/__init__.py

@ -252,6 +252,7 @@ def getDefaultNewznabProviders():
return '!!!'.join(['Sick Beard Index|http://lolo.sickbeard.com/|0|5030,5040|0|eponly|0|0|0',
'NZBgeek|https://api.nzbgeek.info/||5030,5040|0|eponly|0|0|0',
'NZBs.org|https://nzbs.org/||5030,5040|0|eponly|0|0|0',
'DrunkenSlug|https://api.drunkenslug.com/||5030,5040|0|eponly|0|0|0',
])

23
sickbeard/providers/pisexy.py

@ -51,7 +51,7 @@ class PiSexyProvider(generic.TorrentProvider):
items = {'Cache': [], 'Season': [], 'Episode': [], 'Propers': []}
rc = dict((k, re.compile('(?i)' + v)) for (k, v) in {
'info': 'download', 'get': 'download', 'valid_cat': 'cat=(?:0|50[12])', 'filter': 'free',
'info': 'download', 'get': 'info.php\?id', 'valid_cat': 'cat=(?:0|50[12])', 'filter': 'free',
'title': r'Download\s([^\s]+).*', 'seeders': r'(^\d+)', 'leechers': r'(\d+)$'}.items())
for mode in search_params.keys():
for search_string in search_params[mode]:
@ -109,5 +109,26 @@ class PiSexyProvider(generic.TorrentProvider):
return results
def get_data(self, url):
result = None
html = self.get_url(url, timeout=90)
if self.should_skip():
return result
try:
result = self._link(re.findall('(?i)"([^"]*?download\.php[^"]+?&(?!pimp)[^"]*)"', html)[0])
except IndexError:
logger.log('Failed no torrent in response', logger.DEBUG)
return result
def get_result(self, episodes, url):
result = None
if url:
result = super(PiSexyProvider, self).get_result(episodes, url)
result.get_data_func = self.get_data
return result
provider = PiSexyProvider()

Loading…
Cancel
Save