From 1202825ede0e718b45e2c0f7dd57109a057ccf0e Mon Sep 17 00:00:00 2001 From: JackDandy Date: Sat, 20 Jun 2015 18:18:36 +0100 Subject: [PATCH] Remove HDTorrents torrent provider. --- CHANGES.md | 1 + gui/slick/images/providers/hdtorrents.png | Bin 3315 -> 0 bytes sickbeard/__init__.py | 2 +- sickbeard/providers/__init__.py | 1 - sickbeard/providers/hdtorrents.py | 327 ---------------------- 5 files changed, 2 insertions(+), 329 deletions(-) delete mode 100644 gui/slick/images/providers/hdtorrents.png delete mode 100644 sickbeard/providers/hdtorrents.py diff --git a/CHANGES.md b/CHANGES.md index 345564b5..c10c8180 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ * Change provider KAT to use mediaExtensions from common instead of private list * Change provider KAT provider PEP8 and code convention cleanup * Change refactor and code simplification for torrent providers +* Remove HDTorrents torrent provider * Remove NextGen torrent provider * Add Rarbg torrent provider * Fix getManualSearchStatus: object has no attribute 'segment' diff --git a/gui/slick/images/providers/hdtorrents.png b/gui/slick/images/providers/hdtorrents.png deleted file mode 100644 index 2a5d0721d746190d8731860eebf474d7f69f1600..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3315 zcmVKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0006WNklf?A5lJDVTc{bC(ecjQduKaez-rF}di>(OjBSzTSF*XuDgHH8-hfe=FAc^(rJ6TH8_Gaipgk_2N6MNyFF`N!*8YqBiE z7(<@trOfl3vMiBO62~zoCnxm#eWEC0d3l+lC`gh7fJURi+S(dtXJj7B4}Ec-CUaZHjVEG;e3?RKfx>s(x1Fc=JwQX+)#rE@N-*XxW%BMuJ_8IQ*R z^!t63Qsj9~6h#C. - -import re -import traceback -import datetime - -import sickbeard -import generic -from sickbeard.common import Quality -from sickbeard import logger,tvcache,db,classes,helpers,show_name_helpers -from sickbeard.exceptions import ex, AuthException -from lib import requests -from lib.requests import exceptions -from sickbeard.bs4_parser import BS4Parser -from lib.unidecode import unidecode -from sickbeard.helpers import sanitizeSceneName - - -class HDTorrentsProvider(generic.TorrentProvider): - urls = {'base_url': 'https://hdts.ru/index.php', - 'login': 'https://hdts.ru/login.php', - 'detail': 'https://www.hdts.ru/details.php?id=%s', - 'search': 'https://hdts.ru/torrents.php?search=%s&active=1&options=0%s', - 'download': 'https://www.sceneaccess.eu/%s', - 'home': 'https://www.hdts.ru/%s' - } - - def __init__(self): - generic.TorrentProvider.__init__(self, 'HDTorrents', True, False) - self._uid = None - self._hash = None - self.username = None - self.password = None - self.ratio = None - self.minseed = None - self.minleech = None - self.cache = HDTorrentsCache(self) - self.url = self.urls['base_url'] - self.categories = "&category[]=59&category[]=60&category[]=30&category[]=38" - self.cookies = None - - def getQuality(self, item, anime=False): - - quality = Quality.sceneQuality(item[0]) - return quality - - def _checkAuth(self): - - if not self.username or not self.password: - raise AuthException("Your authentication credentials for " + self.name + " are missing, check your config.") - - return True - - def _doLogin(self): - - if any(requests.utils.dict_from_cookiejar(self.session.cookies).values()): - return True - - if self._uid and self._hash: - - requests.utils.add_dict_to_cookiejar(self.session.cookies, self.cookies) - - else: - - login_params = {'uid': self.username, - 'pwd': self.password, - 'submit': 'Confirm', - } - - try: - response = self.session.post(self.urls['login'], data=login_params, timeout=30, verify=False) - except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError) as e: - logger.log(u'Unable to connect to ' + self.name + ' provider: ' + ex(e), logger.ERROR) - return False - - if re.search('You need cookies enabled to log in.', response.text) \ - or response.status_code == 401: - logger.log(u'Your authentication credentials for ' + self.name + ' are incorrect, check your config.', logger.ERROR) - return False - - self._uid = requests.utils.dict_from_cookiejar(self.session.cookies)['uid'] - self._hash = requests.utils.dict_from_cookiejar(self.session.cookies)['pass'] - - self.cookies = {'uid': self._uid, - 'pass': self._hash - } - - return True - - def _get_season_search_strings(self, ep_obj): - - search_string = {'Season': []} - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - if ep_obj.show.air_by_date or ep_obj.show.sports: - ep_string = show_name + ' ' + str(ep_obj.airdate).split('-')[0] - elif ep_obj.show.anime: - ep_string = show_name + ' ' + "%d" % ep_obj.scene_absolute_number - else: - ep_string = show_name + ' S%02d' % int(ep_obj.scene_season) #1) showName SXX - - search_string['Season'].append(ep_string) - - - return [search_string] - - def _get_episode_search_strings(self, ep_obj, add_string=''): - search_string = {'Episode': []} - - if not ep_obj: - return [] - - if self.show.air_by_date: - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - str(ep_obj.airdate).replace('-', '|') - search_string['Episode'].append(ep_string) - elif self.show.sports: - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - str(ep_obj.airdate).replace('-', '|') + '|' + \ - ep_obj.airdate.strftime('%b') - search_string['Episode'].append(ep_string) - elif self.show.anime: - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - "%i" % int(ep_obj.scene_absolute_number) - search_string['Episode'].append(ep_string) - else: - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ - sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} - - search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) - - return [search_string] - - def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0): - - results = [] - items = {'Season': [], 'Episode': [], 'RSS': []} - - if not self._doLogin(): - return [] - - for mode in search_params.keys(): - for search_string in search_params[mode]: - - if isinstance(search_string, unicode): - search_string = unidecode(search_string) - - if search_string == '': - continue - search_string = str(search_string).replace('.', ' ') - searchURL = self.urls['search'] % (search_string, self.categories) - - logger.log(u"Search string: " + searchURL, logger.DEBUG) - - data = self.getURL(searchURL) - if not data: - continue - - # Remove HDTorrents NEW list - split_data = data.partition('\n\n\n\n') - data = split_data[2] - - try: - with BS4Parser(data, features=["html5lib", "permissive"]) as html: - #Get first entry in table - entries = html.find_all('td', attrs={'align': 'center'}) - - if html.find(text='No torrents here...'): - logger.log(u"No results found for: " + search_string + " (" + searchURL + ")", logger.DEBUG) - continue - - if not entries: - logger.log(u"The data returned from " + self.name + " does not contain any torrents", - logger.DEBUG) - continue - - try: - title = entries[22].find('a')['title'].strip('History - ').replace('Blu-ray', 'bd50') - url = self.urls['home'] % entries[15].find('a')['href'] - download_url = self.urls['home'] % entries[15].find('a')['href'] - id = entries[23].find('div')['id'] - seeders = int(entries[20].get_text()) - leechers = int(entries[21].get_text()) - except (AttributeError, TypeError): - continue - - if mode != 'RSS' and (seeders < self.minseed or leechers < self.minleech): - continue - - if not title or not download_url: - continue - - item = title, download_url, id, seeders, leechers - logger.log(u"Found result: " + title + "(" + searchURL + ")", logger.DEBUG) - - items[mode].append(item) - - #Now attempt to get any others - result_table = html.find('table', attrs={'class': 'mainblockcontenttt'}) - - if not result_table: - continue - - entries = result_table.find_all('td', attrs={'align': 'center', 'class': 'listas'}) - - if not entries: - continue - - for result in entries: - block2 = result.find_parent('tr').find_next_sibling('tr') - if not block2: - continue - cells = block2.find_all('td') - - try: - title = cells[1].find('b').get_text().strip('\t ').replace('Blu-ray', 'bd50') - url = self.urls['home'] % cells[4].find('a')['href'] - download_url = self.urls['home'] % cells[4].find('a')['href'] - detail = cells[1].find('a')['href'] - id = detail.replace('details.php?id=', '') - seeders = int(cells[9].get_text()) - leechers = int(cells[10].get_text()) - except (AttributeError, TypeError): - continue - - if mode != 'RSS' and (seeders < self.minseed or leechers < self.minleech): - continue - - if not title or not download_url: - continue - - item = title, download_url, id, seeders, leechers - logger.log(u"Found result: " + title + "(" + searchURL + ")", logger.DEBUG) - - items[mode].append(item) - - except Exception as e: - logger.log(u"Failed parsing " + self.name + " Traceback: " + traceback.format_exc(), logger.ERROR) - - #For each search mode sort all the items by seeders - items[mode].sort(key=lambda tup: tup[3], reverse=True) - - results += items[mode] - - return results - - def _get_title_and_url(self, item): - - title, url, id, seeders, leechers = item - - if title: - title = u'' + title - title = title.replace(' ', '.') - - if url: - url = str(url).replace('&', '&') - - return (title, url) - - def findPropers(self, search_date=datetime.datetime.today()): - - results = [] - - myDB = db.DBConnection() - sqlResults = myDB.select( - 'SELECT s.show_name, e.showid, e.season, e.episode, e.status, e.airdate FROM tv_episodes AS e' + - ' INNER JOIN tv_shows AS s ON (e.showid = s.indexer_id)' + - ' WHERE e.airdate >= ' + str(search_date.toordinal()) + - ' AND (e.status IN (' + ','.join([str(x) for x in Quality.DOWNLOADED]) + ')' + - ' OR (e.status IN (' + ','.join([str(x) for x in Quality.SNATCHED]) + ')))' - ) - - if not sqlResults: - return [] - - for sqlshow in sqlResults: - self.show = curshow = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"])) - if not self.show: continue - curEp = curshow.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"])) - - searchString = self._get_episode_search_strings(curEp, add_string='PROPER|REPACK') - - for item in self._doSearch(searchString[0]): - title, url = self._get_title_and_url(item) - results.append(classes.Proper(title, url, datetime.datetime.today(), self.show)) - - return results - - def seedRatio(self): - return self.ratio - - -class HDTorrentsCache(tvcache.TVCache): - def __init__(self, provider): - - tvcache.TVCache.__init__(self, provider) - - # only poll HDTorrents every 10 minutes max - self.minTime = 20 - - def _getRSSData(self): - search_params = {'RSS': []} - return self.provider._doSearch(search_params) - - -provider = HDTorrentsProvider()