diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index a22a0ea7..baf39586 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -743,6 +743,22 @@
+
+
@@ -2400,6 +2416,7 @@
initConfigCheckbox("#api_enabled");
initConfigCheckbox("#enable_https");
initConfigCheckbox("#customauth");
+ initConfigCheckbox("#use_tquattrecentonze");
$('#twitterStep1').click(function () {
diff --git a/headphones/config.py b/headphones/config.py
index 5b819007..e825cc68 100644
--- a/headphones/config.py
+++ b/headphones/config.py
@@ -274,6 +274,9 @@ _CONFIG_DEFINITIONS = {
'TWITTER_PASSWORD': (str, 'Twitter', ''),
'TWITTER_PREFIX': (str, 'Twitter', 'Headphones'),
'TWITTER_USERNAME': (str, 'Twitter', ''),
+ 'TQUATTRECENTONZE': (int, 'tquattrecentonze', 0),
+ 'TQUATTRECENTONZE_PASSWORD': (str, 'tquattrecentonze', ''),
+ 'TQUATTRECENTONZE_USER': (str, 'tquattrecentonze', ''),
'UPDATE_DB_INTERVAL': (int, 'General', 24),
'USENET_RETENTION': (int, 'General', '1500'),
'UTORRENT_HOST': (str, 'uTorrent', ''),
diff --git a/headphones/searcher.py b/headphones/searcher.py
index c8f16184..6c7fe8cf 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -14,6 +14,7 @@
# along with Headphones. If not, see .
# NZBGet support added by CurlyMo as a part of XBian - XBMC on the Raspberry Pi
+# t411 support added by a1ex, @likeitneverwentaway on github for maintenance
from base64 import b16encode, b32decode
from hashlib import sha1
@@ -24,6 +25,7 @@ import datetime
import subprocess
import unicodedata
import urlparse
+from json import loads
import os
import re
@@ -813,6 +815,19 @@ def send_to_downloader(data, bestqual, album):
torrent_name = helpers.replace_illegal_chars(folder_name) + '.torrent'
download_path = os.path.join(headphones.CONFIG.TORRENTBLACKHOLE_DIR, torrent_name)
+ # Blackhole for t411
+ if bestqual[2].lower().startswith("http://api.t411"):
+ if headphones.CONFIG.MAGNET_LINKS == 2:
+ try:
+ url = bestqual[2].split('TOKEN')[0]
+ token = bestqual[2].split('TOKEN')[1]
+ data = request.request_content(url, headers={'Authorization': token})
+ torrent_to_file(download_path, data)
+ logger.info('Successfully converted magnet to torrent file')
+ except Exception as e:
+ logger.error("Error converting magnet link: %s" % str(e))
+ return
+
if bestqual[2].lower().startswith("magnet:"):
if headphones.CONFIG.MAGNET_LINKS == 1:
try:
@@ -1763,6 +1778,77 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None,
resultlist.append((title, size, url, provider, 'torrent', match))
except Exception as e:
logger.exception("Unhandled exception in Mininova Parser")
+ # t411
+ if headphones.CONFIG.TQUATTRECENTONZE:
+ username = headphones.CONFIG.TQUATTRECENTONZE_USER
+ password = headphones.CONFIG.TQUATTRECENTONZE_PASSWORD
+ API_URL = "http://api.t411.ch"
+ AUTH_URL = API_URL + '/auth'
+ DL_URL = API_URL + '/torrents/download/'
+ provider = "t411"
+ t411_term = term.replace(" ", "%20")
+ SEARCH_URL = API_URL + '/torrents/search/' + t411_term + "?limit=15&cid=395&subcat=623"
+ headers_login = {'username': username, 'password': password}
+
+ # Requesting content
+ logger.info('Parsing results from t411 using search term: %s' % term)
+ req = request.request_content(AUTH_URL, method='post', data=headers_login)
+
+ if len(req.split('"')) == 9:
+ token = req.split('"')[7]
+ headers_auth = {'Authorization': token}
+ logger.info('t411 - User %s logged in' % username)
+ else:
+ logger.info('t411 - Login error : %s' % req.split('"')[3])
+
+ # Quality
+ if headphones.CONFIG.PREFERRED_QUALITY == 3 or losslessOnly:
+ providerurl = "&term[16][]=529&term[16][]=1184"
+ elif headphones.CONFIG.PREFERRED_QUALITY == 1 or allow_lossless:
+ providerurl = fix_url(SEARCH_URL + "&term[16][]=685&term[16][]=527&term[16][]=1070&term[16][]=528&term[16][]=1167&term[16][]=1166&term[16][]=530&term[16][]=529&term[16][]=1184&term[16][]=532&term[16][]=533&term[16][]=1085&term[16][]=534&term[16][]=535&term[16][]=1069&term[16][]=537&term[16][]=538")
+ elif headphones.CONFIG.PREFERRED_QUALITY == 0:
+ providerurl = fix_url(SEARCH_URL + "&term[16][]=685&term[16][]=527&term[16][]=1070&term[16][]=528&term[16][]=1167&term[16][]=1166&term[16][]=530&term[16][]=532&term[16][]=533&term[16][]=1085&term[16][]=534&term[16][]=535&term[16][]=1069&term[16][]=537&term[16][]=538")
+ else:
+ providerurl = fix_url(SEARCH_URL)
+
+ # Tracker search
+ req = request.request_content(providerurl, headers=headers_auth)
+ req = loads(req)
+ total = req['total']
+
+ # Process feed
+ if total == '0':
+ logger.info("No results found from t411 for %s" % term)
+ else:
+ logger.info('Found %s results from t411' % total)
+ torrents = req['torrents']
+ for torrent in torrents:
+ try:
+ title = torrent['name']
+ if torrent['seeders'] < minimumseeders:
+ logger.info('Skipping torrent %s : seeders below minimum set' % title)
+ continue
+ id = torrent['id']
+ size = int(torrent['size'])
+ data = request.request_content(DL_URL + id, headers=headers_auth)
+
+ # Blackhole
+ if headphones.CONFIG.TORRENT_DOWNLOADER == 0 and headphones.CONFIG.MAGNET_LINKS == 2:
+ url = DL_URL + id + 'TOKEN' + token
+ resultlist.append((title, size, url, provider, 'torrent', True))
+
+ # Build magnet
+ else:
+ metadata = bdecode(data)
+ hashcontents = bencode(metadata['info'])
+ digest = sha1(hashcontents).hexdigest()
+ trackers = [metadata["announce"]][0]
+ url = 'magnet:?xt=urn:btih:%s&tr=%s' % (digest, trackers)
+ resultlist.append((title, size, url, provider, 'torrent', True))
+
+ except Exception as e:
+ logger.error("Error converting magnet link: %s" % str(e))
+ return
# attempt to verify that this isn't a substring result
# when looking for "Foo - Foo" we don't want "Foobar"
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 249bf9f9..9b09feba 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -14,6 +14,7 @@
# along with Headphones. If not, see .
# NZBGet support added by CurlyMo as a part of XBian - XBMC on the Raspberry Pi
+# t411 support added by a1ex, @likeitneverwentaway on github for maintenance
from operator import itemgetter
import threading
@@ -1229,6 +1230,9 @@ class WebInterface(object):
"whatcd_ratio": headphones.CONFIG.WHATCD_RATIO,
"use_strike": checked(headphones.CONFIG.STRIKE),
"strike_ratio": headphones.CONFIG.STRIKE_RATIO,
+ "use_tquattrecentonze": checked(headphones.CONFIG.TQUATTRECENTONZE),
+ "tquattrecentonze_user": headphones.CONFIG.TQUATTRECENTONZE_USER,
+ "tquattrecentonze_password": headphones.CONFIG.TQUATTRECENTONZE_PASSWORD,
"pref_qual_0": radio(headphones.CONFIG.PREFERRED_QUALITY, 0),
"pref_qual_1": radio(headphones.CONFIG.PREFERRED_QUALITY, 1),
"pref_qual_2": radio(headphones.CONFIG.PREFERRED_QUALITY, 2),
@@ -1425,7 +1429,7 @@ class WebInterface(object):
"use_newznab", "newznab_enabled", "use_torznab", "torznab_enabled",
"use_nzbsorg", "use_omgwtfnzbs", "use_kat", "use_piratebay", "use_oldpiratebay",
"use_mininova", "use_waffles", "use_rutracker",
- "use_whatcd", "use_strike", "preferred_bitrate_allow_lossless", "detect_bitrate",
+ "use_whatcd", "use_strike", "use_tquattrecentonze", "preferred_bitrate_allow_lossless", "detect_bitrate",
"ignore_clean_releases", "freeze_db", "cue_split", "move_files",
"rename_files", "correct_metadata", "cleanup_files", "keep_nfo", "add_album_art",
"embed_album_art", "embed_lyrics",