diff --git a/CHANGES.md b/CHANGES.md index 9e47dda6..cd21ec35 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -40,6 +40,7 @@ * Change javascript urls in templates to allow proper caching * Change downloads to prevent cache misfiring with "Result is not a valid torrent file" * Change remove AlphaRatio until their secure login page over https is fixed +* Add Torrenting provider ### 0.10.0 (2015-08-06 11:05:00 UTC) diff --git a/gui/slick/images/providers/torrenting.png b/gui/slick/images/providers/torrenting.png new file mode 100644 index 00000000..061df87d Binary files /dev/null and b/gui/slick/images/providers/torrenting.png differ diff --git a/gui/slick/interfaces/default/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl index 6391f0ab..2fcfc5eb 100644 --- a/gui/slick/interfaces/default/config_providers.tmpl +++ b/gui/slick/interfaces/default/config_providers.tmpl @@ -360,9 +360,13 @@ #if $hasattr($curTorrentProvider, 'digest'):
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index fbbd04a3..75e122df 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -38,7 +38,7 @@ from sickbeard import providers, metadata, config, webserveInit, searchBacklog, from sickbeard.providers.generic import GenericProvider from providers import btn, newznab, womble, thepiratebay, torrentleech, kat, iptorrents, grabtheinfo, scenetime, pretome, \ omgwtfnzbs, scc, torrentday, hdbits, speedcd, nyaatorrents, torrentbytes, beyondhd, gftracker, transmithe_net, \ - freshontv, bitsoup, tokyotoshokan, animenzb, totv, rarbg, morethan, pisexy, strike, torrentshack + freshontv, bitsoup, tokyotoshokan, animenzb, totv, rarbg, morethan, pisexy, strike, torrentshack, torrenting from sickbeard.config import CheckSection, check_setting_int, check_setting_str, check_setting_float, ConfigMigrator, \ naming_ep_type, minimax from indexers.indexer_api import indexerApi diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 4864e9a0..89cc41a7 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -45,6 +45,7 @@ __all__ = ['womble', 'grabtheinfo', 'scenetime', 'pretome', + 'torrenting', ] from os import sys diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 348e30e5..1cc71845 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -149,6 +149,8 @@ class GenericProvider: return False if GenericProvider.TORRENT == self.providerType: + final_dir = sickbeard.TORRENT_DIR + link_type = 'magnet' try: torrent_hash = re.findall('(?i)urn:btih:([0-9a-f]{32,40})', result.url)[0].upper() @@ -163,9 +165,12 @@ class GenericProvider: for u in (('s', 'torcache.net/torrent'), ('s', 'getstrike.net/torrents/api/download'), ('s', 'itorrents.org/torrent'))] except: + link_type = 'torrent' urls = [result.url] elif GenericProvider.NZB == self.providerType: + final_dir = sickbeard.NZB_DIR + link_type = 'nzb' urls = [result.url] else: @@ -183,8 +188,6 @@ class GenericProvider: if self._verify_download(cache_file): logger.log(u'Downloaded %s result from %s' % (self.name, url)) - final_dir, link_type = ((sickbeard.TORRENT_DIR, 'magnet'), (sickbeard.NZB_DIR, 'nzb') - )[GenericProvider.NZB == self.providerType] final_file = ek.ek(os.path.join, final_dir, base_name) try: helpers.moveFile(cache_file, final_file) diff --git a/sickbeard/providers/torrenting.py b/sickbeard/providers/torrenting.py new file mode 100644 index 00000000..9e4645c1 --- /dev/null +++ b/sickbeard/providers/torrenting.py @@ -0,0 +1,152 @@ +# 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 datetime +import traceback + +from . import generic +from sickbeard import logger, tvcache, helpers +from sickbeard.bs4_parser import BS4Parser +from lib.unidecode import unidecode + + +class TorrentingProvider(generic.TorrentProvider): + + def __init__(self): + generic.TorrentProvider.__init__(self, 'Torrenting') + + self.url_base = 'https://www.torrenting.com/' + + self.api = 'https://ttonline.us/' + self.urls = {'config_provider_home_uri': self.url_base, + 'login_test': self.api + 'rss.php', + 'search': self.api + 'browse.php?%ssearch=%s', + 'get': self.api + '%s'} + + self.categories = 'c4=1&c5=1&' + + self.url = self.urls['config_provider_home_uri'] + + self.digest, self.minseed, self.minleech = 3 * [None] + self.cache = TorrentingCache(self) + + def _do_login(self): + + logged_in = lambda: 'uid' in self.session.cookies and 'pass' in self.session.cookies + if logged_in(): + return True + + self.cookies = re.sub(r'(?i)([\s\']+|cookie\s*:)', '', self.digest) + success, msg = self._check_cookie() + if not success: + logger.log(u'%s: [%s]' % (msg, self.cookies), logger.WARNING) + else: + response = helpers.getURL(self.urls['login_test'], session=self.session) + if response and logged_in() and 'Generate RSS' in response[8550:]: + return True + logger.log(u'Invalid cookie details for %s. Check settings' % self.name, logger.ERROR) + + self.cookies = None + return False + + def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0): + + results = [] + if not self._do_login(): + return results + + items = {'Season': [], 'Episode': [], 'Cache': []} + + rc = dict((k, re.compile('(?i)' + v)) for (k, v) in {'info': 'detail', 'get': 'download', + 'cats': 'cat=(?:4|5)'}.items()) + for mode in search_params.keys(): + for search_string in search_params[mode]: + if isinstance(search_string, unicode): + search_string = unidecode(search_string) + + search_url = self.urls['search'] % (self.categories, search_string) + 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('div', id='torrenttable').find('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 = [int(tr.find_all('td')[x].get_text().strip()) for x in (-2, -1)] + if None is tr.find('a', href=rc['cats'])\ + or ('Cache' != mode and (seeders < self.minseed or leechers < self.minleech)): + continue + + info = tr.find('a', href=rc['info']) + title = 'title' in info.attrs and info.attrs['title'] or info.get_text().strip() + download_url = self.urls['get'] % tr.find('a', href=rc['get']).get('href') + except (AttributeError, TypeError): + continue + + if title and download_url: + items[mode].append((title, download_url, seeders)) + + except generic.HaltParseException: + pass + except Exception: + logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR) + + self._log_result(mode, len(items[mode]) - cnt, search_url) + + results += items[mode] + + return results + + def find_propers(self, search_date=datetime.datetime.today()): + + return self._find_propers(search_date) + + def _get_episode_search_strings(self, ep_obj, add_string='', **kwargs): + + return generic.TorrentProvider._get_episode_search_strings(self, ep_obj, add_string, use_or=False) + + @staticmethod + def ui_string(key): + result = '' + if 'torrenting_digest' == key: + result = 'use... \'uid=xx; pass=yy\'' + return result + + +class TorrentingCache(tvcache.TVCache): + + def __init__(self, this_provider): + tvcache.TVCache.__init__(self, this_provider) + + self.minTime = 7 # cache update frequency + + def _getRSSData(self): + + return self.provider.get_cache_data() + + +provider = TorrentingProvider() diff --git a/sickbeard/tv.py b/sickbeard/tv.py index 1d6df92c..47d3c702 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -917,6 +917,8 @@ class TVShow(object): logger.log(u'Retrieving show info from IMDb', logger.DEBUG) try: self._get_imdb_info() + except imdb_exceptions.IMDbDataAccessError as e: + logger.log(u'Timeout waiting for IMDb api: ' + ex(e), logger.WARNING) except imdb_exceptions.IMDbError as e: logger.log(u'Something is wrong with IMDb api: ' + ex(e), logger.WARNING) except Exception as e: