diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 21aab4b3..72657193 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -706,18 +706,6 @@ -
-
- -
-
-
- - -
-
-
-
@@ -2587,12 +2575,10 @@ initConfigCheckbox("#use_rutracker"); initConfigCheckbox("#use_apollo"); initConfigCheckbox("#use_redacted"); - initConfigCheckbox("#use_strike"); initConfigCheckbox("#api_enabled"); initConfigCheckbox("#enable_https"); initConfigCheckbox("#customauth"); initConfigCheckbox("#mb_ignore_age_missing"); - initConfigCheckbox("#use_tquattrecentonze"); $('#twitterStep1').click(function () { $.get("/twitterStep1", function (data) {window.open(data); }) diff --git a/headphones/config.py b/headphones/config.py index 131e8cc2..e41d7d9a 100644 --- a/headphones/config.py +++ b/headphones/config.py @@ -271,8 +271,6 @@ _CONFIG_DEFINITIONS = { 'SONGKICK_ENABLED': (int, 'Songkick', 1), 'SONGKICK_FILTER_ENABLED': (int, 'Songkick', 0), 'SONGKICK_LOCATION': (str, 'Songkick', ''), - 'STRIKE': (int, 'Strike', 0), - 'STRIKE_RATIO': (str, 'Strike', ''), 'SUBSONIC_ENABLED': (int, 'Subsonic', 0), 'SUBSONIC_HOST': (str, 'Subsonic', ''), 'SUBSONIC_PASSWORD': (str, 'Subsonic', ''), diff --git a/headphones/searcher.py b/headphones/searcher.py index d223fc5c..baf4e815 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -176,8 +176,6 @@ def get_seed_ratio(provider): seed_ratio = headphones.CONFIG.WAFFLES_RATIO elif provider == 'Mininova': seed_ratio = headphones.CONFIG.MININOVA_RATIO - elif provider == 'Strike': - seed_ratio = headphones.CONFIG.STRIKE_RATIO else: seed_ratio = None @@ -279,8 +277,7 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False): headphones.CONFIG.WAFFLES or headphones.CONFIG.RUTRACKER or headphones.CONFIG.APOLLO or - headphones.CONFIG.REDACTED or - headphones.CONFIG.STRIKE) + headphones.CONFIG.REDACTED) results = [] myDB = db.DBConnection() @@ -1896,46 +1893,6 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None, logger.error( u"An unknown error occurred in the Old Pirate Bay parser: %s" % e) - # Strike - if headphones.CONFIG.STRIKE: - provider = "Strike" - s_term = term.replace("!", "") - providerurl = fix_url("https://getstrike.net/api/v2/torrents/search/?phrase=") - - providerurl = providerurl + s_term + "&category=Music" - - if headphones.CONFIG.PREFERRED_QUALITY == 3 or losslessOnly: - providerurl = providerurl + "&subcategory=Lossless" - maxsize = 10000000000 - elif headphones.CONFIG.PREFERRED_QUALITY == 1 or allow_lossless: - maxsize = 10000000000 - else: - maxsize = 300000000 - - logger.info("Searching %s using term: %s" % (provider, s_term)) - data = request.request_json(url=providerurl, - whitelist_status_code=[404]) - - if not data or not data.get('torrents'): - logger.info("No results found on %s using search term: %s" % (provider, s_term)) - else: - for item in data['torrents']: - try: - title = item['torrent_title'] - seeders = item['seeds'] - url = item['magnet_uri'] - size = int(item['size']) - - if size < maxsize and minimumseeders < int(seeders): - resultlist.append((title, size, url, provider, 'torrent', True)) - logger.info('Found %s. Size: %s' % (title, helpers.bytes_to_mb(size))) - else: - logger.info( - '%s is larger than the maxsize, the wrong format or has too little seeders for this category, skipping. (Size: %i bytes, Seeders: %d)', - title, size, int(seeders)) - except Exception as e: - logger.exception("Unhandled exception in the Strike parser") - # Mininova if headphones.CONFIG.MININOVA: provider = "Mininova" diff --git a/headphones/webserve.py b/headphones/webserve.py index 542a5b3c..885aef94 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -1254,8 +1254,6 @@ class WebInterface(object): "redacted_username": headphones.CONFIG.REDACTED_USERNAME, "redacted_password": headphones.CONFIG.REDACTED_PASSWORD, "redacted_ratio": headphones.CONFIG.REDACTED_RATIO, - "use_strike": checked(headphones.CONFIG.STRIKE), - "strike_ratio": headphones.CONFIG.STRIKE_RATIO, "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), @@ -1464,7 +1462,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_apollo", "use_redacted", "use_strike", "preferred_bitrate_allow_lossless", + "use_apollo", "use_redacted", "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",