monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #223 from JackDandy/feature/ChangeTPB

Browse source 
Change TPB webproxy list and add SSL variants.
This commit is contained in:
JackDandy 2015-02-23 00:50:38 +00:00
commit c1a674862b
2 changed files with 68 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -75,6 +75,7 @@
* Change SCC URLs to remove redirection overhead * Change SCC URLs to remove redirection overhead
* Change TorrentBytes login parameter in line with site change * Change TorrentBytes login parameter in line with site change
* Change FreshOnTv login parameter and use secure URLs, add logging of Cloudflare blocking and prevent vacant cookie tracebacks * Change FreshOnTv login parameter and use secure URLs, add logging of Cloudflare blocking and prevent vacant cookie tracebacks
* Change TPB webproxy list and add SSL variants
* Add YTV network logo * Add YTV network logo
[develop changelog] [develop changelog]

138
sickbeard/providers/thepiratebay.py
View file

@ -18,29 +18,21 @@
from __future__ import with_statement from __future__ import with_statement
import time
import re import re
import urllib, urllib2, urlparse import urllib
import sys
import os import os
import datetime import datetime
import sickbeard import sickbeard
import generic import generic
from sickbeard.common import Quality, cpu_presets from sickbeard.common import Quality
from sickbeard.name_parser.parser import NameParser, InvalidNameException, InvalidShowException from sickbeard.name_parser.parser import NameParser, InvalidNameException, InvalidShowException
from sickbeard import db from sickbeard import db
from sickbeard import classes from sickbeard import classes
from sickbeard import logger from sickbeard import logger
from sickbeard import tvcache from sickbeard import tvcache
from sickbeard import helpers from sickbeard import helpers
from sickbeard import clients
from sickbeard.show_name_helpers import allPossibleShowNames, sanitizeSceneName from sickbeard.show_name_helpers import allPossibleShowNames, sanitizeSceneName
from sickbeard.common import Overview
from sickbeard.exceptions import ex
from sickbeard import encodingKludge as ek
from lib import requests
from lib.requests import exceptions
from lib.unidecode import unidecode from lib.unidecode import unidecode
@ -63,7 +55,7 @@ class ThePirateBayProvider(generic.TorrentProvider):
self.url = 'https://thepiratebay.se/' self.url = 'https://thepiratebay.se/'
self.searchurl = self.url + 'search/%s/0/7/200' # order by seed self.searchurl = self.url + 'search/%s/0/7/200' # order by seed
self.re_title_url = '/torrent/(?P<id>\d+)/(?P<title>.*?)//1".+?(?P<url>magnet.*?)//1".+?(?P<seeders>\d+)</td>.+?(?P<leechers>\d+)</td>' self.re_title_url = '/torrent/(?P<id>\d+)/(?P<title>.*?)//1".+?(?P<url>magnet.*?)//1".+?(?P<seeders>\d+)</td>.+?(?P<leechers>\d+)</td>'
@ -82,23 +74,23 @@ class ThePirateBayProvider(generic.TorrentProvider):
quality_string = '' quality_string = ''
if quality == Quality.SDTV: if Quality.SDTV == quality:
quality_string = 'HDTV x264' quality_string = 'HDTV x264'
if quality == Quality.SDDVD: if Quality.SDDVD == quality:
quality_string = 'DVDRIP' quality_string = 'DVDRIP'
elif quality == Quality.HDTV: elif Quality.HDTV == quality:
quality_string = '720p HDTV x264' quality_string = '720p HDTV x264'
elif quality == Quality.FULLHDTV: elif Quality.FULLHDTV == quality:
quality_string = '1080p HDTV x264' quality_string = '1080p HDTV x264'
elif quality == Quality.RAWHDTV: elif Quality.RAWHDTV == quality:
quality_string = '1080i HDTV mpeg2' quality_string = '1080i HDTV mpeg2'
elif quality == Quality.HDWEBDL: elif Quality.HDWEBDL == quality:
quality_string = '720p WEB-DL h264' quality_string = '720p WEB-DL h264'
elif quality == Quality.FULLHDWEBDL: elif Quality.FULLHDWEBDL == quality:
quality_string = '1080p WEB-DL h264' quality_string = '1080p WEB-DL h264'
elif quality == Quality.HDBLURAY: elif Quality.HDBLURAY == quality:
quality_string = '720p Bluray x264' quality_string = '720p Bluray x264'
elif quality == Quality.FULLHDBLURAY: elif Quality.FULLHDBLURAY == quality:
quality_string = '1080p Bluray x264' quality_string = '1080p Bluray x264'
return quality_string return quality_string
@ -126,31 +118,31 @@ class ThePirateBayProvider(generic.TorrentProvider):
filesList = re.findall('<td.+>(.*?)</td>', data) filesList = re.findall('<td.+>(.*?)</td>', data)
if not filesList: if not filesList:
logger.log(u"Unable to get the torrent file list for " + title, logger.ERROR) logger.log(u'Unable to get the torrent file list for ' + title, logger.ERROR)
videoFiles = filter(lambda x: x.rpartition(".")[2].lower() in mediaExtensions, filesList) videoFiles = filter(lambda x: x.rpartition('.')[2].lower() in mediaExtensions, filesList)
#Filtering SingleEpisode/MultiSeason Torrent # Filtering SingleEpisode/MultiSeason Torrent
if len(videoFiles) < ep_number or len(videoFiles) > float(ep_number * 1.1): if ep_number > len(videoFiles) or float(ep_number * 1.1) < len(videoFiles):
logger.log( logger.log(u'Result %s has episode %s and total episodes retrieved in torrent are %s'
u"Result " + title + " have " + str(ep_number) + " episode and episodes retrived in torrent are " + str( % (title, str(ep_number), str(len(videoFiles))), logger.DEBUG)
len(videoFiles)), logger.DEBUG) logger.log(u'Result %s seems to be a single episode or multiseason torrent, skipping result...'
logger.log(u"Result " + title + " Seem to be a Single Episode or MultiSeason torrent, skipping result...", % title, logger.DEBUG)
logger.DEBUG)
return None return None
if Quality.sceneQuality(title) != Quality.UNKNOWN: if Quality.UNKNOWN != Quality.sceneQuality(title):
return title return title
for fileName in videoFiles: for fileName in videoFiles:
quality = Quality.sceneQuality(os.path.basename(fileName)) quality = Quality.sceneQuality(os.path.basename(fileName))
if quality != Quality.UNKNOWN: break if Quality.UNKNOWN != quality:
break
if fileName is not None and quality == Quality.UNKNOWN: if None is not fileName and Quality.UNKNOWN == quality:
quality = Quality.assumeQuality(os.path.basename(fileName)) quality = Quality.assumeQuality(os.path.basename(fileName))
if quality == Quality.UNKNOWN: if Quality.UNKNOWN == quality:
logger.log(u"Unable to obtain a Season Quality for " + title, logger.DEBUG) logger.log(u'Unable to obtain a Season Quality for ' + title, logger.DEBUG)
return None return None
try: try:
@ -159,11 +151,12 @@ class ThePirateBayProvider(generic.TorrentProvider):
except (InvalidNameException, InvalidShowException): except (InvalidNameException, InvalidShowException):
return None return None
logger.log(u"Season quality for " + title + " is " + Quality.qualityStrings[quality], logger.DEBUG) logger.log(u'Season quality for %s is %s' % (title, Quality.qualityStrings[quality]), logger.DEBUG)
if parse_result.series_name and parse_result.season_number: if parse_result.series_name and parse_result.season_number:
title = parse_result.series_name + ' S%02d' % int(parse_result.season_number) + ' ' + self._reverseQuality( title = '%s S%02d %s' % (parse_result.series_name,
quality) int(parse_result.season_number),
self._reverseQuality(quality))
return title return title
@ -177,12 +170,12 @@ class ThePirateBayProvider(generic.TorrentProvider):
ep_string = show_name + ' Season ' + str(ep_obj.airdate).split('-')[0] ep_string = show_name + ' Season ' + str(ep_obj.airdate).split('-')[0]
search_string['Season'].append(ep_string) search_string['Season'].append(ep_string)
elif ep_obj.show.anime: elif ep_obj.show.anime:
ep_string = show_name + ' ' + "%02d" % ep_obj.scene_absolute_number ep_string = show_name + ' ' + '%02d' % ep_obj.scene_absolute_number
search_string['Season'].append(ep_string) search_string['Season'].append(ep_string)
else: else:
ep_string = show_name + ' S%02d' % int(ep_obj.scene_season) ep_string = show_name + ' S%02d' % int(ep_obj.scene_season)
search_string['Season'].append(ep_string) search_string['Season'].append(ep_string)
ep_string = show_name + ' Season ' + str(ep_obj.scene_season) + ' -Ep*' ep_string = show_name + ' Season %s -Ep*' % str(ep_obj.scene_season)
search_string['Season'].append(ep_string) search_string['Season'].append(ep_string)
search_string['Season'].append(ep_string) search_string['Season'].append(ep_string)
@ -196,26 +189,26 @@ class ThePirateBayProvider(generic.TorrentProvider):
if self.show.air_by_date: if self.show.air_by_date:
for show_name in set(allPossibleShowNames(self.show)): for show_name in set(allPossibleShowNames(self.show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(ep_obj.airdate).replace('-', ' ') str(ep_obj.airdate).replace('-', ' ')
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
elif self.show.sports: elif self.show.sports:
for show_name in set(allPossibleShowNames(self.show)): for show_name in set(allPossibleShowNames(self.show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(ep_obj.airdate).replace('-', '|') + '|' + \ str(ep_obj.airdate).replace('-', '|') + '|' + \
ep_obj.airdate.strftime('%b') ep_obj.airdate.strftime('%b')
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
elif self.show.anime: elif self.show.anime:
for show_name in set(allPossibleShowNames(self.show)): for show_name in set(allPossibleShowNames(self.show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
"%02i" % int(ep_obj.scene_absolute_number) '%02i' % int(ep_obj.scene_absolute_number)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(allPossibleShowNames(self.show)): for show_name in set(allPossibleShowNames(self.show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season,
'episodenumber': ep_obj.scene_episode} + '|' + \ 'episodenumber': ep_obj.scene_episode} + '|' + \
sickbeard.config.naming_ep_type[0] % {'seasonnumber': ep_obj.scene_season, sickbeard.config.naming_ep_type[0] % {'seasonnumber': ep_obj.scene_season,
'episodenumber': ep_obj.scene_episode} + ' %s' % add_string 'episodenumber': ep_obj.scene_episode} + ' %s' % add_string
search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) search_string['Episode'].append(re.sub('\s+', ' ', ep_string))
return [search_string] return [search_string]
@ -230,13 +223,16 @@ class ThePirateBayProvider(generic.TorrentProvider):
for mode in search_params.keys(): for mode in search_params.keys():
for search_string in search_params[mode]: for search_string in search_params[mode]:
search_string, url = self._get_title_and_url([search_string, '', '', '', ''])
if isinstance(search_string, unicode):
search_string = unidecode(search_string)
if mode != 'RSS': if 'RSS' != mode:
searchURL = self.proxy._buildURL(self.searchurl % (urllib.quote(unidecode(search_string)))) searchURL = self.proxy._buildURL(self.searchurl % (urllib.quote(search_string)))
else: else:
searchURL = self.proxy._buildURL(self.url + 'tv/latest/') searchURL = self.proxy._buildURL(self.url + 'tv/latest/')
logger.log(u"Search string: " + searchURL, logger.DEBUG) logger.log(u'Search string: ' + searchURL, logger.DEBUG)
data = self.getURL(searchURL) data = self.getURL(searchURL)
if not data: if not data:
@ -244,28 +240,28 @@ class ThePirateBayProvider(generic.TorrentProvider):
re_title_url = self.proxy._buildRE(self.re_title_url) re_title_url = self.proxy._buildRE(self.re_title_url)
#Extracting torrent information from data returned by searchURL # Extracting torrent information from data returned by searchURL
match = re.compile(re_title_url, re.DOTALL).finditer(urllib.unquote(data)) match = re.compile(re_title_url, re.DOTALL).finditer(urllib.unquote(data))
for torrent in match: for torrent in match:
title = torrent.group('title').replace('_', '.') #Do not know why but SickBeard skip release with '_' in name title = torrent.group('title').replace('_', '.') # Do not know why but SickBeard skip release with '_' in name
url = torrent.group('url') url = torrent.group('url')
id = int(torrent.group('id')) id = int(torrent.group('id'))
seeders = int(torrent.group('seeders')) seeders = int(torrent.group('seeders'))
leechers = int(torrent.group('leechers')) leechers = int(torrent.group('leechers'))
#Filter unseeded torrent # Filter unseeded torrent
if mode != 'RSS' and (seeders < self.minseed or leechers < self.minleech): if 'RSS' != mode and (self.minseed > seeders or self.minleech > leechers):
continue continue
#Accept Torrent only from Good People for every Episode Search # Accept Torrent only from Good People for every Episode Search
if self.confirmed and re.search('(VIP|Trusted|Helper|Moderator)', torrent.group(0)) is None: if self.confirmed and re.search('(VIP|Trusted|Helper|Moderator)', torrent.group(0)) is None:
logger.log(u"ThePirateBay Provider found result " + torrent.group( logger.log(u'ThePirateBay Provider found result ' + torrent.group(
'title') + " but that doesn't seem like a trusted result so I'm ignoring it", logger.DEBUG) 'title') + ' but that doesn\'t seem like a trusted result so I\'m ignoring it', logger.DEBUG)
continue continue
#Check number video files = episode in season and find the real Quality for full season torrent analyzing files in torrent # Check number video files = episode in season and find the real Quality for full season torrent analyzing files in torrent
if mode == 'Season' and search_mode == 'sponly': if 'Season' == mode and 'sponly' == search_mode:
ep_number = int(epcount / len(set(allPossibleShowNames(self.show)))) ep_number = int(epcount / len(set(allPossibleShowNames(self.show))))
title = self._find_season_quality(title, id, ep_number) title = self._find_season_quality(title, id, ep_number)
@ -276,7 +272,7 @@ class ThePirateBayProvider(generic.TorrentProvider):
items[mode].append(item) items[mode].append(item)
#For each search mode sort all the items by seeders # For each search mode sort all the items by seeders
items[mode].sort(key=lambda tup: tup[3], reverse=True) items[mode].sort(key=lambda tup: tup[3], reverse=True)
results += items[mode] results += items[mode]
@ -288,12 +284,13 @@ class ThePirateBayProvider(generic.TorrentProvider):
title, url, id, seeders, leechers = item title, url, id, seeders, leechers = item
if title: if title:
title = u'' + title.replace(' ', '.') title += u''
title = re.sub(r'\s+', '.', title)
if url: if url:
url = url.replace('&amp;', '&') url = url.replace('&amp;', '&')
return (title, url) return title, url
def findPropers(self, search_date=datetime.datetime.today()): def findPropers(self, search_date=datetime.datetime.today()):
@ -309,13 +306,13 @@ class ThePirateBayProvider(generic.TorrentProvider):
) )
if not sqlResults: if not sqlResults:
return [] return results
for sqlshow in sqlResults: for sqlshow in sqlResults:
self.show = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"])) self.show = helpers.findCertainShow(sickbeard.showList, int(sqlshow['showid']))
if self.show: if self.show:
curEp = self.show.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"])) curEp = self.show.getEpisode(int(sqlshow['season']), int(sqlshow['episode']))
searchString = self._get_episode_search_strings(curEp, add_string='PROPER|REPACK') searchString = self._get_episode_search_strings(curEp, add_string='PROPER|REPACK')
@ -352,14 +349,13 @@ class ThePirateBayWebproxy:
self.urls = { self.urls = {
'Getprivate.eu (NL)': 'http://getprivate.eu/', 'Getprivate.eu (NL)': 'http://getprivate.eu/',
'15bb51.info (US)': 'http://15bb51.info/',
'Hideme.nl (NL)': 'http://hideme.nl/', 'Hideme.nl (NL)': 'http://hideme.nl/',
'Proxite.eu (DE)': 'http://proxite.eu/',
'Webproxy.cz (CZ)': 'http://webproxy.cz/',
'2me2u (CZ)': 'http://2me2u.me/',
'Interproxy.net (EU)': 'http://interproxy.net/',
'Unblockersurf.info (DK)': 'http://unblockersurf.info/',
'Hiload.org (NL)': 'http://hiload.org/', 'Hiload.org (NL)': 'http://hiload.org/',
'Hiload.org (NL) SSL': 'https://hiload.org/',
'Interproxy.net (EU)': 'http://interproxy.net/',
'Interproxy.net (EU) SSL': 'https://interproxy.net/',
'Proxite.eu (DE)': 'http://proxite.eu/',
'Proxite.eu (DE) SSL ': 'https://proxite.eu/',
} }
def isEnabled(self): def isEnabled(self):