Add optional KAT proxy config

Fixes #1778
This commit is contained in:
Pieter Janssens
2014-08-05 09:28:53 +02:00
parent 1ee76f7488
commit 9122136594
4 changed files with 24 additions and 1 deletions

View File

@@ -396,6 +396,12 @@
</div>
<div class="row checkbox">
<input type="checkbox" name="use_kat" value="1" ${config['use_kat']} /><label>Kick Ass Torrents</label>
</div>
<div class="config">
<div class="row">
<label>Proxy URL (Optional): </label>
<input type="text" name="kat_proxy_url" value="${config['kat_proxy_url']}" size="36">
</div>
</div>
<div class="row checkbox">
<input id="usewaffles" type="checkbox" name="waffles" onclick="initConfigCheckbox($(this));" value="1" ${config['use_waffles']} /><label>Waffles.fm</label>

View File

@@ -188,6 +188,7 @@ ALBUM_COMPLETION_PCT = None # This is used in importer.py to determine how co
TORRENTBLACKHOLE_DIR = None
NUMBEROFSEEDERS = 10
KAT = None
KAT_PROXY_URL = None
MININOVA = None
PIRATEBAY = None
PIRATEBAY_PROXY_URL = None

View File

@@ -897,7 +897,21 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None):
if headphones.KAT:
provider = "Kick Ass Torrents"
providerurl = url_fix("http://kickass.to/usearch/" + term)
if headphones.KAT_PROXY_URL:
#Might need to clean up the user submitted url
kat_proxy = headphones.KAT_PROXY_URL
if not kat_proxy.startswith('http'):
kat_proxy = 'http://' + kat_proxy
if kat_proxy.endswith('/'):
kat_proxy = kat_proxy[:-1]
providerurl = url_fix(kat_proxy + "/usearch/" + term)
else:
providerurl = url_fix("http://kickass.to/usearch/" + term)
if headphones.PREFERRED_QUALITY == 3 or losslessOnly:
categories = "7" #music
format = "2" #flac

View File

@@ -1007,6 +1007,7 @@ class WebInterface(object):
"download_torrent_dir" : headphones.DOWNLOAD_TORRENT_DIR,
"numberofseeders" : headphones.NUMBEROFSEEDERS,
"use_kat" : checked(headphones.KAT),
"kat_proxy_url" : headphones.KAT_PROXY_URL,
"use_piratebay" : checked(headphones.PIRATEBAY),
"piratebay_proxy_url" : headphones.PIRATEBAY_PROXY_URL,
"use_mininova" : checked(headphones.MININOVA),
@@ -1224,6 +1225,7 @@ class WebInterface(object):
headphones.NUMBEROFSEEDERS = numberofseeders
headphones.DOWNLOAD_TORRENT_DIR = download_torrent_dir
headphones.KAT = use_kat
headphones.KAT_PROXY_URL = kat_proxy_url
headphones.PIRATEBAY = use_piratebay
headphones.PIRATEBAY_PROXY_URL = piratebay_proxy_url
headphones.MININOVA = use_mininova