From 6f8f2c292b8685392f70ec077db54af61642f2d4 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Mon, 23 Sep 2013 18:27:27 +0530 Subject: [PATCH] Added ability to use a piratebay proxy to the backend --- headphones/__init__.py | 5 ++++- headphones/searcher.py | 15 ++++++++++++++- headphones/webserve.py | 4 +++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/headphones/__init__.py b/headphones/__init__.py index 3959f1fc..234d2cea 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -184,6 +184,7 @@ ISOHUNT = None KAT = None MININOVA = None PIRATEBAY = None +PIRATEBAY_PROXY_URL = None WAFFLES = None WAFFLES_UID = None WAFFLES_PASSKEY = None @@ -299,7 +300,7 @@ def initialize(): LOSSLESS_DESTINATION_DIR, PREFERRED_QUALITY, PREFERRED_BITRATE, DETECT_BITRATE, ADD_ARTISTS, CORRECT_METADATA, MOVE_FILES, \ RENAME_FILES, FOLDER_FORMAT, FILE_FORMAT, FILE_UNDERSCORES, CLEANUP_FILES, INCLUDE_EXTRAS, EXTRAS, AUTOWANT_UPCOMING, AUTOWANT_ALL, KEEP_TORRENT_FILES, \ ADD_ALBUM_ART, ALBUM_ART_FORMAT, EMBED_ALBUM_ART, EMBED_LYRICS, DOWNLOAD_DIR, BLACKHOLE, BLACKHOLE_DIR, USENET_RETENTION, SEARCH_INTERVAL, \ - TORRENTBLACKHOLE_DIR, NUMBEROFSEEDERS, ISOHUNT, KAT, PIRATEBAY, MININOVA, WAFFLES, WAFFLES_UID, WAFFLES_PASSKEY, \ + TORRENTBLACKHOLE_DIR, NUMBEROFSEEDERS, ISOHUNT, KAT, PIRATEBAY, PIRATEBAY_PROXY_URL, MININOVA, WAFFLES, WAFFLES_UID, WAFFLES_PASSKEY, \ RUTRACKER, RUTRACKER_USER, RUTRACKER_PASSWORD, WHATCD, WHATCD_USERNAME, WHATCD_PASSWORD, DOWNLOAD_TORRENT_DIR, \ LIBRARYSCAN, LIBRARYSCAN_INTERVAL, DOWNLOAD_SCAN_INTERVAL, SAB_HOST, SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, \ NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_HOST, HEADPHONES_INDEXER, NZBMATRIX, TRANSMISSION_HOST, TRANSMISSION_USERNAME, TRANSMISSION_PASSWORD, \ @@ -410,6 +411,7 @@ def initialize(): ISOHUNT = bool(check_setting_int(CFG, 'General', 'isohunt', 0)) KAT = bool(check_setting_int(CFG, 'General', 'kat', 0)) PIRATEBAY = bool(check_setting_int(CFG, 'General', 'piratebay', 0)) + PIRATEBAY_PROXY_URL = check_setting_str(CFG, 'General', 'piratebay_proxy_url', '') MININOVA = bool(check_setting_int(CFG, 'General', 'mininova', 0)) DOWNLOAD_TORRENT_DIR = check_setting_str(CFG, 'General', 'download_torrent_dir', '') @@ -768,6 +770,7 @@ def config_write(): new_config['General']['kat'] = int(KAT) new_config['General']['mininova'] = int(MININOVA) new_config['General']['piratebay'] = int(PIRATEBAY) + new_config['General']['piratebay_proxy_url'] = PIRATEBAY_PROXY_URL new_config['General']['download_torrent_dir'] = DOWNLOAD_TORRENT_DIR new_config['Waffles'] = {} diff --git a/headphones/searcher.py b/headphones/searcher.py index 3472499a..eb227622 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -1075,7 +1075,20 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False): # Pirate Bay if headphones.PIRATEBAY: provider = "The Pirate Bay" - providerurl = url_fix("http://thepiratebay.sx/search/" + term + "/0/99/") + if headphones.PIRATEBAY_PROXY_URL: + #Might need to clean up the user submitted url + pirate_proxy = headphones.PIRATEBAY_PROXY_URL + + if not pirate_proxy.startswith('http'): + pirate_proxy = 'http://' + pirate_proxy + if pirate_proxy.endswith('/'): + pirate_proxy = pirate_proxy[:-1] + + providerurl = url_fix(pirate_proxy + "/search/" + term + "/0/99/") + + else: + providerurl = url_fix("http://thepiratebay.sx/search/" + term + "/0/99/") + if headphones.PREFERRED_QUALITY == 3 or losslessOnly: category = '104' #flac maxsize = 10000000000 diff --git a/headphones/webserve.py b/headphones/webserve.py index 5aa452ef..3477c293 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -619,6 +619,7 @@ class WebInterface(object): "use_isohunt" : checked(headphones.ISOHUNT), "use_kat" : checked(headphones.KAT), "use_piratebay" : checked(headphones.PIRATEBAY), + "piratebay_proxy_url" : headphones.PIRATEBAY_PROXY_URL, "use_mininova" : checked(headphones.MININOVA), "use_waffles" : checked(headphones.WAFFLES), "waffles_uid" : headphones.WAFFLES_UID, @@ -724,7 +725,7 @@ class WebInterface(object): utorrent_host=None, utorrent_username=None, utorrent_password=None, nzb_downloader=0, torrent_downloader=0, download_dir=None, blackhole_dir=None, usenet_retention=None, use_headphones_indexer=0, newznab=0, newznab_host=None, newznab_apikey=None, newznab_enabled=0, nzbsorg=0, nzbsorg_uid=None, nzbsorg_hash=None, nzbsrus=0, nzbsrus_uid=None, nzbsrus_apikey=None, preferred_words=None, required_words=None, ignored_words=None, preferred_quality=0, preferred_bitrate=None, detect_bitrate=0, move_files=0, torrentblackhole_dir=None, download_torrent_dir=None, - numberofseeders=None, use_piratebay=0, use_isohunt=0, use_kat=0, use_mininova=0, waffles=0, waffles_uid=None, waffles_passkey=None, whatcd=0, whatcd_username=None, whatcd_password=None, + numberofseeders=None, use_piratebay=0, piratebay_proxy_url=None, use_isohunt=0, use_kat=0, use_mininova=0, waffles=0, waffles_uid=None, waffles_passkey=None, whatcd=0, whatcd_username=None, whatcd_password=None, rutracker=0, rutracker_user=None, rutracker_password=None, rename_files=0, correct_metadata=0, cleanup_files=0, add_album_art=0, album_art_format=None, embed_album_art=0, embed_lyrics=0, destination_dir=None, lossless_destination_dir=None, folder_format=None, file_format=None, file_underscores=0, include_extras=0, single=0, ep=0, compilation=0, soundtrack=0, live=0, remix=0, spokenword=0, audiobook=0, autowant_upcoming=False, autowant_all=False, keep_torrent_files=False, interface=None, log_dir=None, cache_dir=None, music_encoder=0, encoder=None, xldprofile=None, @@ -788,6 +789,7 @@ class WebInterface(object): headphones.ISOHUNT = use_isohunt headphones.KAT = use_kat headphones.PIRATEBAY = use_piratebay + headphones.PIRATEBAY_PROXY_URL = piratebay_proxy_url headphones.MININOVA = use_mininova headphones.WAFFLES = waffles headphones.WAFFLES_UID = waffles_uid