diff --git a/CHANGES.md b/CHANGES.md index 82575510..e8add6c1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -79,6 +79,7 @@ * Change TorrentDay to use its 2.x interface * Add button 'Discover' Emby server to notifications * Add Bit-HDTV torrent provider +* Add PrivateHD torrent provider ### 0.11.11 (2016-04-05 19:20:00 UTC) diff --git a/gui/slick/images/providers/privatehd.png b/gui/slick/images/providers/privatehd.png new file mode 100644 index 00000000..b15f74ff Binary files /dev/null and b/gui/slick/images/providers/privatehd.png differ diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 7b51ee94..28fddf74 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -27,7 +27,7 @@ from sickbeard import logger, encodingKludge as ek from . import newznab, omgwtfnzbs, womble # torrent 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, \ + hd4free, hdbits, hdspace, iptorrents, kat, morethan, pisexy, pretome, privatehd, rarbg, scc, scenetime, shazbat, speedcd, \ thepiratebay, torrentbytes, torrentday, torrenting, torrentleech, torrentshack, transmithe_net, tvchaosuk # anime from . import anizb, nyaatorrents, tokyotoshokan @@ -59,6 +59,7 @@ __all__ = ['omgwtfnzbs', 'morethan', 'pisexy', 'pretome', + 'privatehd', 'rarbg', 'scc', 'scenetime', diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 697479b1..f6beb83a 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -914,11 +914,14 @@ class TorrentProvider(object, GenericProvider): return super(TorrentProvider, self)._authorised() if hasattr(self, 'username') and hasattr(self, 'password'): - creds = dict(username=self.username, password=self.password) if not post_params: - post_params = creds.copy() - elif self.password not in post_params.values() and isinstance(post_params, type({})): - post_params.update(creds) + post_params = dict(username=self.username, password=self.password) + elif isinstance(post_params, type({})): + if self.username not in post_params.values(): + post_params['username'] = self.username + if self.password not in post_params.values(): + post_params['password'] = self.password + response = helpers.getURL(url, post_data=post_params, session=self.session, timeout=timeout) if response: diff --git a/sickbeard/providers/privatehd.py b/sickbeard/providers/privatehd.py new file mode 100644 index 00000000..d4c0306b --- /dev/null +++ b/sickbeard/providers/privatehd.py @@ -0,0 +1,120 @@ +# 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 PrivateHDProvider(generic.TorrentProvider): + + def __init__(self): + generic.TorrentProvider.__init__(self, 'PrivateHD') + + self.url_base = 'https://privatehd.to/' + self.urls = {'config_provider_home_uri': self.url_base, + 'login_action': self.url_base + 'auth/login', + 'search': self.url_base + 'torrents?%s' % '&'.join( + ['in=1', 'tags=', 'type=2', 'language=0', 'subtitle=0', 'rip_type=0', + 'video_quality=0', 'uploader=', 'search=%s', 'tv_type=%s', 'discount=%s'])} + + self.categories = {'Season': [2], 'Episode': [1], 'Cache': [0]} + + self.url = self.urls['config_provider_home_uri'] + + self.username, self.password, self.freeleech, self.minseed, self.minleech = 5 * [None] + + def _authorised(self, **kwargs): + + return super(PrivateHDProvider, self)._authorised( + logged_in=lambda x=None: self.has_all_cookies(['privatehdlove']), + post_params={'username_email': self.username}) + + def _search_provider(self, search_params, **kwargs): + + results = [] + if not self._authorised(): + return results + + items = {'Cache': [], 'Season': [], 'Episode': [], 'Propers': []} + + rc = dict((k, re.compile('(?i)' + v)) + for (k, v) in {'info': '.*?details\s*-\s*', 'get': 'download'}.items()) + for mode in search_params.keys(): + if mode in ['Season', 'Episode']: + show_type = self.show.air_by_date and 'Air By Date' \ + or self.show.is_sports and 'Sports' or self.show.is_anime and 'Anime' or None + if show_type: + logger.log(u'Provider does not carry shows of type: [%s], skipping' % show_type, logger.DEBUG) + return results + + for search_string in search_params[mode]: + search_string = isinstance(search_string, unicode) and unidecode(search_string) or search_string + search_url = self.urls['search'] % ( + '+'.join(search_string.split()), self._categories_string(mode, ''), (1, 0)[not self.freeleech]) + + html = self.get_url(search_url) + + cnt = len(items[mode]) + try: + if not html or self._has_no_results(html): + raise generic.HaltParseException + + with BS4Parser(html, features=['html5lib', 'permissive']) as soup: + torrent_table = soup.find('table', attrs={'class': 'table'}) + torrent_rows = [] if not torrent_table else torrent_table.find_all('tr') + + if 2 > 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._peers_fail(mode, seeders, leechers): + continue + + title = rc['info'].sub('', tr.find('a', attrs={'data-title': rc['info']})['data-title']) + + download_url = tr.find('a', href=rc['get'])['href'] + + except (AttributeError, TypeError, ValueError, IndexError): + 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 = PrivateHDProvider()