diff --git a/CHANGES.md b/CHANGES.md index eba00b81..82575510 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -78,6 +78,7 @@ * Add provider Anizb * Change TorrentDay to use its 2.x interface * Add button 'Discover' Emby server to notifications +* Add Bit-HDTV torrent provider ### 0.11.11 (2016-04-05 19:20:00 UTC) diff --git a/gui/slick/images/providers/bithdtv.png b/gui/slick/images/providers/bithdtv.png new file mode 100644 index 00000000..e2b2969e Binary files /dev/null and b/gui/slick/images/providers/bithdtv.png differ diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py index 78840870..abc98316 100644 --- a/sickbeard/helpers.py +++ b/sickbeard/helpers.py @@ -1173,6 +1173,10 @@ def getURL(url, post_data=None, params=None, headers=None, timeout=30, session=N resp = session.post(url, timeout=timeout, **kwargs) else: resp = session.get(url, timeout=timeout, **kwargs) + if resp.ok and not resp.content and 'url=' in resp.headers.get('Refresh', '').lower(): + parsed[2] = '/%s' % resp.headers.get('Refresh').lower().split('url=')[1].strip('/') + url = urlparse.urlunparse(parsed) + resp = session.get(url, timeout=timeout, **kwargs) if not resp.ok: if resp.status_code in clients.http_error_code: diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 007d8747..7b51ee94 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -26,11 +26,11 @@ from sickbeard import logger, encodingKludge as ek # usenet from . import newznab, omgwtfnzbs, womble # torrent -from . import alpharatio, anizb, beyondhd, bitmetv, btn, filelist, freshontv, funfile, gftracker, grabtheinfo, \ +from . import alpharatio, beyondhd, bithdtv, bitmetv, btn, filelist, freshontv, funfile, gftracker, grabtheinfo, \ hd4free, hdbits, hdspace, iptorrents, kat, morethan, pisexy, pretome, rarbg, scc, scenetime, shazbat, speedcd, \ thepiratebay, torrentbytes, torrentday, torrenting, torrentleech, torrentshack, transmithe_net, tvchaosuk # anime -from . import nyaatorrents, tokyotoshokan +from . import anizb, nyaatorrents, tokyotoshokan # custom try: from . import custom01 @@ -42,6 +42,7 @@ __all__ = ['omgwtfnzbs', 'alpharatio', 'anizb', 'beyondhd', + 'bithdtv', 'bitmetv', 'btn', 'custom01', diff --git a/sickbeard/providers/bithdtv.py b/sickbeard/providers/bithdtv.py new file mode 100644 index 00000000..5fabd99a --- /dev/null +++ b/sickbeard/providers/bithdtv.py @@ -0,0 +1,113 @@ +# coding=utf-8 +# +# This file is part of SickGear. +# +# SickGear is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# SickGear is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with SickGear. If not, see . + +import re +import traceback + +from . import generic +from sickbeard import logger +from sickbeard.bs4_parser import BS4Parser +from sickbeard.helpers import tryInt +from lib.unidecode import unidecode + + +class BitHDTVProvider(generic.TorrentProvider): + + def __init__(self): + generic.TorrentProvider.__init__(self, 'BitHDTV', cache_update_freq=20) + + self.url_home = ['https://www.bit-hdtv.com/'] + + self.url_vars = {'login_action': 'login.php', 'search': 'torrents.php?search=%s&%s', 'get': '%s'} + self.url_tmpl = {'config_provider_home_uri': '%(home)s', 'login_action': '%(home)s%(vars)s', + 'search': '%(home)s%(vars)s', 'get': '%(home)s%(vars)s'} + + self.categories = {'Season': [12], 'Episode': [4, 5, 10], 'Anime': [1]} + self.categories['Cache'] = self.categories['Season'] + self.categories['Episode'] + + self.username, self.password, self.freeleech, self.minseed, self.minleech = 5 * [None] + + def _authorised(self, **kwargs): + + return super(BitHDTVProvider, self)._authorised( + logged_in=(lambda x=None: self.has_all_cookies(['h_sl', 'h_sp', 'h_su']))) and 'search' in self.urls + + @staticmethod + def _has_signature(data=None): + return generic.TorrentProvider._has_signature(data) or (data and re.search(r'(?sim) len(torrent_rows): + raise generic.HaltParseException + + for tr in torrent_rows[1:]: + try: + seeders, leechers, size = [tryInt(n, n) for n in [ + tr.find_all('td')[x].get_text().strip() for x in (-3, -2, -5)]] + if self.freeleech and not tr.attrs.get('bgcolor').endswith('FF99') or \ + self._peers_fail(mode, seeders, leechers): + continue + + info = tr.find('a', href=rc['info']) + title = (info.attrs.get('title') or info.contents[0].get_text()).strip() + download_url = self.urls['get'] % str(tr.find('a', href=rc['get'])['href']).lstrip('/') + except (AttributeError, TypeError, ValueError): + continue + + if title and download_url: + items[mode].append((title, download_url, seeders, self._bytesizer(size))) + + except generic.HaltParseException: + pass + except Exception: + logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR) + + self._log_search(mode, len(items[mode]) - cnt, search_url) + + self._sort_seeders(mode, items) + + results = list(set(results + items[mode])) + + return results + + +provider = BitHDTVProvider()