diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 974aba6b..d09f3a7d 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -770,18 +770,6 @@ -
- @@ -2564,7 +2552,6 @@ initConfigCheckbox("#use_torznab"); initConfigCheckbox("#use_piratebay"); initConfigCheckbox("#use_oldpiratebay"); - initConfigCheckbox("#use_mininova"); initConfigCheckbox("#use_waffles"); initConfigCheckbox("#use_rutracker"); initConfigCheckbox("#use_orpheus"); diff --git a/headphones/config.py b/headphones/config.py index 0afc34a0..7a8b93fc 100644 --- a/headphones/config.py +++ b/headphones/config.py @@ -165,8 +165,6 @@ _CONFIG_DEFINITIONS = { 'LOSSLESS_DESTINATION_DIR': (path, 'General', ''), 'MB_IGNORE_AGE': (int, 'General', 365), 'MB_IGNORE_AGE_MISSING': (int, 'General', 0), - 'MININOVA': (int, 'Mininova', 0), - 'MININOVA_RATIO': (str, 'Mininova', ''), 'MIRROR': (str, 'General', 'musicbrainz.org'), 'MOVE_FILES': (int, 'General', 0), 'MPC_ENABLED': (bool_int, 'MPC', False), diff --git a/headphones/searcher.py b/headphones/searcher.py index 10e5e604..16eab896 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -170,8 +170,6 @@ def get_seed_ratio(provider): seed_ratio = headphones.CONFIG.OLDPIRATEBAY_RATIO elif provider == 'Waffles.ch': seed_ratio = headphones.CONFIG.WAFFLES_RATIO - elif provider == 'Mininova': - seed_ratio = headphones.CONFIG.MININOVA_RATIO elif provider.startswith("Jackett_"): provider = provider.split("Jackett_")[1] if provider in headphones.CONFIG.TORZNAB_HOST: @@ -277,7 +275,6 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False): TORRENT_PROVIDERS = (headphones.CONFIG.TORZNAB or headphones.CONFIG.PIRATEBAY or headphones.CONFIG.OLDPIRATEBAY or - headphones.CONFIG.MININOVA or headphones.CONFIG.WAFFLES or headphones.CONFIG.RUTRACKER or headphones.CONFIG.ORPHEUS or @@ -1831,67 +1828,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) - # Mininova - if headphones.CONFIG.MININOVA: - provider = "Mininova" - providerurl = fix_url("http://www.mininova.org/rss/" + term + "/5") - - if headphones.CONFIG.PREFERRED_QUALITY == 3 or losslessOnly: - # categories = "7" #music - format = "2" # flac - maxsize = 10000000000 - elif headphones.CONFIG.PREFERRED_QUALITY == 1 or allow_lossless: - # categories = "7" #music - format = "10" # mp3+flac - maxsize = 10000000000 - else: - # categories = "7" #music - format = "8" # mp3 - maxsize = 300000000 - - # Requesting content - logger.info('Parsing results from Mininova') - - data = request.request_feed( - url=providerurl, - timeout=20 - ) - - # Process feed - if data: - if not len(data.entries): - logger.info(u"No results found from %s for %s" % (provider, term)) - else: - for item in data.entries: - try: - rightformat = True - title = item.title - sxstart = item.description.find("Ratio: ") + 7 - seeds = "" - while item.description[sxstart:sxstart + 1] != " ": - seeds = seeds + item.description[sxstart:sxstart + 1] - sxstart = sxstart + 1 - url = item.links[1]['url'] - size = int(item.links[1]['length']) - if format == "2": - torrent = request.request_content(url) - if not torrent or (int(torrent.find(".mp3")) > 0 and int( - torrent.find(".flac")) < 1): - rightformat = False - - if rightformat and size < maxsize and minimumseeders < seeds: - match = True - logger.info('Found %s. Size: %s' % (title, helpers.bytes_to_mb(size))) - else: - match = False - logger.info('%s is larger than the maxsize, the wrong format or has too little seeders' - ' for this category, skipping. (Size: %i bytes, Seeders: %i, Format: %s)' % ( - title, size, int(seeds), rightformat)) - - resultlist.append((title, size, url, provider, 'torrent', match)) - except Exception as e: - logger.exception("Unhandled exception in Mininova Parser") - # attempt to verify that this isn't a substring result # when looking for "Foo - Foo" we don't want "Foobar" # this should be less of an issue when it isn't a self-titled album so we'll only check vs artist diff --git a/headphones/webserve.py b/headphones/webserve.py index e7f607a9..9e2f1979 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -1235,8 +1235,6 @@ class WebInterface(object): "use_oldpiratebay": checked(headphones.CONFIG.OLDPIRATEBAY), "oldpiratebay_url": headphones.CONFIG.OLDPIRATEBAY_URL, "oldpiratebay_ratio": headphones.CONFIG.OLDPIRATEBAY_RATIO, - "use_mininova": checked(headphones.CONFIG.MININOVA), - "mininova_ratio": headphones.CONFIG.MININOVA_RATIO, "use_waffles": checked(headphones.CONFIG.WAFFLES), "waffles_uid": headphones.CONFIG.WAFFLES_UID, "waffles_passkey": headphones.CONFIG.WAFFLES_PASSKEY, @@ -1463,7 +1461,7 @@ class WebInterface(object): "launch_browser", "enable_https", "api_enabled", "use_blackhole", "headphones_indexer", "use_newznab", "newznab_enabled", "use_torznab", "torznab_enabled", "use_nzbsorg", "use_omgwtfnzbs", "use_piratebay", "use_oldpiratebay", - "use_mininova", "use_waffles", "use_rutracker", + "use_waffles", "use_rutracker", "use_orpheus", "use_redacted", "redacted_use_fltoken", "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",