diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 73f2066a..46a96592 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -32,7 +32,7 @@ from threading import Lock from sickbeard import providers, metadata, config from providers import ezrss, tvtorrents, btn, newznab, womble, thepiratebay, torrentleech, kat, publichd, iptorrents, \ omgwtfnzbs, scc, hdtorrents, torrentday, hdbits, nextgen, speedcd -from sickbeard.config import CheckSection, check_setting_int, check_setting_str, ConfigMigrator, naming_ep_type +from sickbeard.config import CheckSection, check_setting_int, check_setting_str, check_setting_float, ConfigMigrator, naming_ep_type from sickbeard import searchBacklog, showUpdater, versionChecker, properFinder, autoPostProcesser, \ subtitles, traktWatchListChecker from sickbeard import helpers, db, exceptions, show_queue, search_queue, scheduler, show_name_helpers @@ -699,21 +699,21 @@ def initialize(consoleLogging=True): EZRSS = bool(check_setting_int(CFG, 'General', 'use_torrent', 0)) if not EZRSS: EZRSS = bool(check_setting_int(CFG, 'EZRSS', 'ezrss', 0)) - EZRSS_RATIO = check_setting_int(CFG, 'EZRSS', 'ezrss_ratio', 0) + EZRSS_RATIO = check_setting_float(CFG, 'EZRSS', 'ezrss_ratio', 0) TVTORRENTS = bool(check_setting_int(CFG, 'TVTORRENTS', 'tvtorrents', 0)) TVTORRENTS_DIGEST = check_setting_str(CFG, 'TVTORRENTS', 'tvtorrents_digest', '') TVTORRENTS_HASH = check_setting_str(CFG, 'TVTORRENTS', 'tvtorrents_hash', '') - TVTORRENTS_RATIO = check_setting_int(CFG, 'TVTORRENTS', 'tvtorrents_ratio', 0) + TVTORRENTS_RATIO = check_setting_float(CFG, 'TVTORRENTS', 'tvtorrents_ratio', 0) TVTORRENTS_OPTIONS = check_setting_str(CFG, 'TVTORRENTS', 'tvtorrents_options', '') BTN = bool(check_setting_int(CFG, 'BTN', 'btn', 0)) BTN_API_KEY = check_setting_str(CFG, 'BTN', 'btn_api_key', '') - BTN_RATIO = check_setting_int(CFG, 'BTN', 'btn_ratio', 0) + BTN_RATIO = check_setting_float(CFG, 'BTN', 'btn_ratio', 0) BTN_OPTIONS = check_setting_str(CFG, 'BTN', 'btn_options', '') THEPIRATEBAY = bool(check_setting_int(CFG, 'THEPIRATEBAY', 'thepiratebay', 1)) - THEPIRATEBAY_RATIO = check_setting_int(CFG, 'THEPIRATEBAY', 'thepiratebay_ratio', 0) + THEPIRATEBAY_RATIO = check_setting_float(CFG, 'THEPIRATEBAY', 'thepiratebay_ratio', 0) THEPIRATEBAY_TRUSTED = bool(check_setting_int(CFG, 'THEPIRATEBAY', 'thepiratebay_trusted', 1)) THEPIRATEBAY_PROXY = bool(check_setting_int(CFG, 'THEPIRATEBAY', 'thepiratebay_proxy', 0)) THEPIRATEBAY_PROXY_URL = check_setting_str(CFG, 'THEPIRATEBAY', 'thepiratebay_proxy_url', '') @@ -723,60 +723,60 @@ def initialize(consoleLogging=True): TORRENTLEECH = bool(check_setting_int(CFG, 'TORRENTLEECH', 'torrentleech', 0)) TORRENTLEECH_USERNAME = check_setting_str(CFG, 'TORRENTLEECH', 'torrentleech_username', '') TORRENTLEECH_PASSWORD = check_setting_str(CFG, 'TORRENTLEECH', 'torrentleech_password', '') - TORRENTLEECH_RATIO = check_setting_int(CFG, 'TORRENTLEECH', 'torrentleech_ratio', 0) + TORRENTLEECH_RATIO = check_setting_float(CFG, 'TORRENTLEECH', 'torrentleech_ratio', 0) TORRENTLEECH_OPTIONS = check_setting_str(CFG, 'TORRENTLEECH', 'torrentleech_options', '') IPTORRENTS = bool(check_setting_int(CFG, 'IPTORRENTS', 'iptorrents', 0)) IPTORRENTS_USERNAME = check_setting_str(CFG, 'IPTORRENTS', 'iptorrents_username', '') IPTORRENTS_PASSWORD = check_setting_str(CFG, 'IPTORRENTS', 'iptorrents_password', '') - IPTORRENTS_RATIO = check_setting_int(CFG, 'IPTORRENTS', 'iptorrents_ratio', 0) + IPTORRENTS_RATIO = check_setting_float(CFG, 'IPTORRENTS', 'iptorrents_ratio', 0) IPTORRENTS_FREELEECH = bool(check_setting_int(CFG, 'IPTORRENTS', 'iptorrents_freeleech', 0)) IPTORRENTS_OPTIONS = check_setting_str(CFG, 'IPTORRENTS', 'iptorrents_options', '') NEXTGEN = bool(check_setting_int(CFG, 'NEXTGEN', 'nextgen', 0)) NEXTGEN_USERNAME = check_setting_str(CFG, 'NEXTGEN', 'nextgen_username', '') NEXTGEN_PASSWORD = check_setting_str(CFG, 'NEXTGEN', 'nextgen_password', '') - NEXTGEN_RATIO = check_setting_int(CFG, 'NEXTGEN', 'nextgen_ratio', 0) + NEXTGEN_RATIO = check_setting_float(CFG, 'NEXTGEN', 'nextgen_ratio', 0) NEXTGEN_OPTIONS = check_setting_str(CFG, 'NEXTGEN', 'nextgen_options', '') KAT = bool(check_setting_int(CFG, 'KAT', 'kat', 0)) - KAT_RATIO = check_setting_int(CFG, 'KAT', 'kat_ratio', 0) + KAT_RATIO = check_setting_float(CFG, 'KAT', 'kat_ratio', 0) KAT_VERIFIED = bool(check_setting_int(CFG, 'KAT', 'kat_verified', 1)) KAT_OPTIONS = check_setting_str(CFG, 'KAT', 'kat_options', '') PUBLICHD = bool(check_setting_int(CFG, 'PUBLICHD', 'publichd', 0)) - PUBLICHD_RATIO = check_setting_int(CFG, 'PUBLICHD', 'publichd_ratio', 0) + PUBLICHD_RATIO = check_setting_float(CFG, 'PUBLICHD', 'publichd_ratio', 0) PUBLICHD_OPTIONS = check_setting_str(CFG, 'PUBLICHD', 'publichd_options', '') SCC = bool(check_setting_int(CFG, 'SCC', 'scc', 0)) SCC_USERNAME = check_setting_str(CFG, 'SCC', 'scc_username', '') SCC_PASSWORD = check_setting_str(CFG, 'SCC', 'scc_password', '') - SCC_RATIO = check_setting_int(CFG, 'SCC', 'scc_ratio', 0) + SCC_RATIO = check_setting_float(CFG, 'SCC', 'scc_ratio', 0) SCC_OPTIONS = check_setting_str(CFG, 'SCC', 'scc_options', '') HDTORRENTS = bool(check_setting_int(CFG, 'HDTORRENTS', 'hdtorrents', 0)) HDTORRENTS_USERNAME = check_setting_str(CFG, 'HDTORRENTS', 'hdtorrents_username', '') HDTORRENTS_PASSWORD = check_setting_str(CFG, 'HDTORRENTS', 'hdtorrents_password', '') - HDTORRENTS_RATIO = check_setting_int(CFG, 'HDTORRENTS', 'hdtorrents_ratio', 0) + HDTORRENTS_RATIO = check_setting_float(CFG, 'HDTORRENTS', 'hdtorrents_ratio', 0) HDTORRENTS_OPTIONS = check_setting_str(CFG, 'HDTORRENTS', 'hdtorrents_options', '') TORRENTDAY = bool(check_setting_int(CFG, 'TORRENTDAY', 'torrentday', 0)) TORRENTDAY_USERNAME = check_setting_str(CFG, 'TORRENTDAY', 'torrentday_username', '') TORRENTDAY_PASSWORD = check_setting_str(CFG, 'TORRENTDAY', 'torrentday_password', '') - TORRENTDAY_RATIO = check_setting_int(CFG, 'TORRENTDAY', 'torrentday_ratio', 0) + TORRENTDAY_RATIO = check_setting_float(CFG, 'TORRENTDAY', 'torrentday_ratio', 0) TORRENTDAY_FREELEECH = bool(check_setting_int(CFG, 'TORRENTDAY', 'torrentday_freeleech', 0)) TORRENTDAY_OPTIONS = check_setting_str(CFG, 'TORRENTDAY', 'torrentday_options', '') HDBITS = bool(check_setting_int(CFG, 'HDBITS', 'hdbits', 0)) HDBITS_USERNAME = check_setting_str(CFG, 'HDBITS', 'hdbits_username', '') HDBITS_PASSKEY = check_setting_str(CFG, 'HDBITS', 'hdbits_passkey', '') - HDBITS_RATIO = check_setting_int(CFG, 'HDBITS', 'hdbits_ratio', 0) + HDBITS_RATIO = check_setting_float(CFG, 'HDBITS', 'hdbits_ratio', 0) HDBITS_OPTIONS = check_setting_str(CFG, 'HDBITS', 'hdbits_options', '') SPEEDCD = bool(check_setting_int(CFG, 'SPEEDCD', 'speedcd', 0)) SPEEDCD_USERNAME = check_setting_str(CFG, 'SPEEDCD', 'speedcd_username', '') SPEEDCD_PASSWORD = check_setting_str(CFG, 'SPEEDCD', 'speedcd_password', '') - SPEEDCD_RATIO = check_setting_int(CFG, 'SPEEDCD', 'speedcd_ratio', 0) + SPEEDCD_RATIO = check_setting_float(CFG, 'SPEEDCD', 'speedcd_ratio', 0) SPEEDCD_FREELEECH = bool(check_setting_int(CFG, 'SPEEDCD', 'speedcd_freeleech', 0)) NZBS = bool(check_setting_int(CFG, 'NZBs', 'nzbs', 0)) @@ -809,7 +809,7 @@ def initialize(consoleLogging=True): TORRENT_PASSWORD = check_setting_str(CFG, 'TORRENT', 'torrent_password', '') TORRENT_HOST = check_setting_str(CFG, 'TORRENT', 'torrent_host', '') TORRENT_PATH = check_setting_str(CFG, 'TORRENT', 'torrent_path', '') - TORRENT_RATIO = check_setting_int(CFG, 'TORRENT', 'torrent_ratio', 0) + TORRENT_RATIO = check_setting_float(CFG, 'TORRENT', 'torrent_ratio', 0) TORRENT_SEED_TIME = check_setting_int(CFG, 'TORRENT', 'torrent_seed_time', 0) TORRENT_PAUSED = bool(check_setting_int(CFG, 'TORRENT', 'torrent_paused', 0)) TORRENT_HIGH_BANDWIDTH = bool(check_setting_int(CFG, 'TORRENT', 'torrent_high_bandwidth', 0)) @@ -1464,24 +1464,24 @@ def save_config(): new_config['EZRSS'] = {} new_config['EZRSS']['ezrss'] = int(EZRSS) - new_config['EZRSS']['ezrss_ratio'] = int(EZRSS_RATIO) + new_config['EZRSS']['ezrss_ratio'] = float(EZRSS_RATIO) new_config['TVTORRENTS'] = {} new_config['TVTORRENTS']['tvtorrents'] = int(TVTORRENTS) new_config['TVTORRENTS']['tvtorrents_digest'] = TVTORRENTS_DIGEST new_config['TVTORRENTS']['tvtorrents_hash'] = TVTORRENTS_HASH - new_config['TVTORRENTS']['tvtorrents_ratio'] = int(TVTORRENTS_RATIO) + new_config['TVTORRENTS']['tvtorrents_ratio'] = float(TVTORRENTS_RATIO) new_config['TVTORRENTS']['tvtorrents_options'] = TVTORRENTS_OPTIONS new_config['BTN'] = {} new_config['BTN']['btn'] = int(BTN) new_config['BTN']['btn_api_key'] = BTN_API_KEY - new_config['BTN']['btn_ratio'] = int(BTN_RATIO) + new_config['BTN']['btn_ratio'] = float(BTN_RATIO) new_config['BTN']['btn_options'] = BTN_OPTIONS new_config['THEPIRATEBAY'] = {} new_config['THEPIRATEBAY']['thepiratebay'] = int(THEPIRATEBAY) - new_config['THEPIRATEBAY']['thepiratebay_ratio'] = int(THEPIRATEBAY_RATIO) + new_config['THEPIRATEBAY']['thepiratebay_ratio'] = float(THEPIRATEBAY_RATIO) new_config['THEPIRATEBAY']['thepiratebay_trusted'] = int(THEPIRATEBAY_TRUSTED) new_config['THEPIRATEBAY']['thepiratebay_proxy'] = int(THEPIRATEBAY_PROXY) new_config['THEPIRATEBAY']['thepiratebay_proxy_url'] = THEPIRATEBAY_PROXY_URL @@ -1492,14 +1492,14 @@ def save_config(): new_config['TORRENTLEECH']['torrentleech'] = int(TORRENTLEECH) new_config['TORRENTLEECH']['torrentleech_username'] = TORRENTLEECH_USERNAME new_config['TORRENTLEECH']['torrentleech_password'] = helpers.encrypt(TORRENTLEECH_PASSWORD, ENCRYPTION_VERSION) - new_config['TORRENTLEECH']['torrentleech_ratio'] = int(TORRENTLEECH_RATIO) + new_config['TORRENTLEECH']['torrentleech_ratio'] = float(TORRENTLEECH_RATIO) new_config['TORRENTLEECH']['torrentleech_options'] = TORRENTLEECH_OPTIONS new_config['IPTORRENTS'] = {} new_config['IPTORRENTS']['iptorrents'] = int(IPTORRENTS) new_config['IPTORRENTS']['iptorrents_username'] = IPTORRENTS_USERNAME new_config['IPTORRENTS']['iptorrents_password'] = helpers.encrypt(IPTORRENTS_PASSWORD, ENCRYPTION_VERSION) - new_config['IPTORRENTS']['iptorrents_ratio'] = int(IPTORRENTS_RATIO) + new_config['IPTORRENTS']['iptorrents_ratio'] = float(IPTORRENTS_RATIO) new_config['IPTORRENTS']['iptorrents_freeleech'] = int(IPTORRENTS_FREELEECH) new_config['IPTORRENTS']['iptorrents_options'] = IPTORRENTS_OPTIONS @@ -1507,39 +1507,39 @@ def save_config(): new_config['NEXTGEN']['nextgen'] = int(NEXTGEN) new_config['NEXTGEN']['nextgen_username'] = NEXTGEN_USERNAME new_config['NEXTGEN']['nextgen_password'] = helpers.encrypt(NEXTGEN_PASSWORD, ENCRYPTION_VERSION) - new_config['NEXTGEN']['nextgen_ratio'] = int(NEXTGEN_RATIO) + new_config['NEXTGEN']['nextgen_ratio'] = float(NEXTGEN_RATIO) new_config['NEXTGEN']['nextgen_options'] = NEXTGEN_OPTIONS new_config['KAT'] = {} new_config['KAT']['kat'] = int(KAT) - new_config['KAT']['kat_ratio'] = int(KAT_RATIO) + new_config['KAT']['kat_ratio'] = float(KAT_RATIO) new_config['KAT']['kat_verified'] = int(KAT_VERIFIED) new_config['KAT']['kat_options'] = KAT_OPTIONS new_config['PUBLICHD'] = {} new_config['PUBLICHD']['publichd'] = int(PUBLICHD) - new_config['PUBLICHD']['publichd_ratio'] = int(PUBLICHD_RATIO) + new_config['PUBLICHD']['publichd_ratio'] = float(PUBLICHD_RATIO) new_config['PUBLICHD']['publichd_options'] = PUBLICHD_OPTIONS new_config['SCC'] = {} new_config['SCC']['scc'] = int(SCC) new_config['SCC']['scc_username'] = SCC_USERNAME new_config['SCC']['scc_password'] = helpers.encrypt(SCC_PASSWORD, ENCRYPTION_VERSION) - new_config['SCC']['scc_ratio'] = int(SCC_RATIO) + new_config['SCC']['scc_ratio'] = float(SCC_RATIO) new_config['SCC']['scc_options'] = SCC_OPTIONS new_config['HDTORRENTS'] = {} new_config['HDTORRENTS']['hdtorrents'] = int(HDTORRENTS) new_config['HDTORRENTS']['hdtorrents_username'] = HDTORRENTS_USERNAME new_config['HDTORRENTS']['hdtorrents_password'] = helpers.encrypt(HDTORRENTS_PASSWORD, ENCRYPTION_VERSION) - new_config['HDTORRENTS']['hdtorrents_ratio'] = int(HDTORRENTS_RATIO) + new_config['HDTORRENTS']['hdtorrents_ratio'] = float(HDTORRENTS_RATIO) new_config['HDTORRENTS']['hdtorrents_options'] = HDTORRENTS_OPTIONS new_config['TORRENTDAY'] = {} new_config['TORRENTDAY']['torrentday'] = int(TORRENTDAY) new_config['TORRENTDAY']['torrentday_username'] = TORRENTDAY_USERNAME new_config['TORRENTDAY']['torrentday_password'] = helpers.encrypt(TORRENTDAY_PASSWORD, ENCRYPTION_VERSION) - new_config['TORRENTDAY']['torrentday_ratio'] = int(TORRENTDAY_RATIO) + new_config['TORRENTDAY']['torrentday_ratio'] = float(TORRENTDAY_RATIO) new_config['TORRENTDAY']['torrentday_freeleech'] = int(TORRENTDAY_FREELEECH) new_config['TORRENTDAY']['torrentday_options'] = TORRENTDAY_OPTIONS @@ -1547,14 +1547,14 @@ def save_config(): new_config['HDBITS']['hdbits'] = int(HDBITS) new_config['HDBITS']['hdbits_username'] = HDBITS_USERNAME new_config['HDBITS']['hdbits_passkey'] = HDBITS_PASSKEY - new_config['HDBITS']['hdbits_ratio'] = int(HDBITS_RATIO) + new_config['HDBITS']['hdbits_ratio'] = float(HDBITS_RATIO) new_config['HDBITS']['hdbits_options'] = HDBITS_OPTIONS new_config['SPEEDCD'] = {} new_config['SPEEDCD']['speedcd'] = int(SPEEDCD) new_config['SPEEDCD']['speedcd_username'] = SPEEDCD_USERNAME new_config['SPEEDCD']['speedcd_password'] = helpers.encrypt(SPEEDCD_PASSWORD, ENCRYPTION_VERSION) - new_config['SPEEDCD']['speedcd_ratio'] = int(SPEEDCD_RATIO) + new_config['SPEEDCD']['speedcd_ratio'] = float(SPEEDCD_RATIO) new_config['SPEEDCD']['speedcd_freeleech'] = int(SPEEDCD_FREELEECH) new_config['NZBs'] = {} @@ -1595,7 +1595,7 @@ def save_config(): new_config['TORRENT']['torrent_password'] = helpers.encrypt(TORRENT_PASSWORD, ENCRYPTION_VERSION) new_config['TORRENT']['torrent_host'] = TORRENT_HOST new_config['TORRENT']['torrent_path'] = TORRENT_PATH - new_config['TORRENT']['torrent_ratio'] = int(TORRENT_RATIO) + new_config['TORRENT']['torrent_ratio'] = float(TORRENT_RATIO) new_config['TORRENT']['torrent_seed_time'] = int(TORRENT_SEED_TIME) new_config['TORRENT']['torrent_paused'] = int(TORRENT_PAUSED) new_config['TORRENT']['torrent_high_bandwidth'] = int(TORRENT_HIGH_BANDWIDTH) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 4ca85c3a..a20520a3 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -1563,16 +1563,16 @@ class ConfigProviders: else: logger.log(u"don't know what " + curProvider + " is, skipping") - sickbeard.EZRSS_RATIO = config.to_int(ezrss_ratio) + sickbeard.EZRSS_RATIO = ezrss_ratio sickbeard.TVTORRENTS_DIGEST = tvtorrents_digest.strip() sickbeard.TVTORRENTS_HASH = tvtorrents_hash.strip() sickbeard.TVTORRENTS_RATIO = config.to_int(tvtorrents_ratio) sickbeard.BTN_API_KEY = btn_api_key.strip() - sickbeard.BTN_RATIO = config.to_int(btn_ratio) + sickbeard.BTN_RATIO = btn_ratio - sickbeard.THEPIRATEBAY_RATIO = config.to_int(thepiratebay_ratio) + sickbeard.THEPIRATEBAY_RATIO = thepiratebay_ratio sickbeard.THEPIRATEBAY_TRUSTED = config.checkbox_to_value(thepiratebay_trusted) thepiratebay_proxy = config.checkbox_to_value(thepiratebay_proxy) @@ -1585,48 +1585,48 @@ class ConfigProviders: sickbeard.TORRENTLEECH_USERNAME = torrentleech_username sickbeard.TORRENTLEECH_PASSWORD = torrentleech_password - sickbeard.TORRENTLEECH_RATIO = config.to_int(torrentleech_ratio) + sickbeard.TORRENTLEECH_RATIO = torrentleech_ratio sickbeard.IPTORRENTS_USERNAME = iptorrents_username.strip() sickbeard.IPTORRENTS_PASSWORD = iptorrents_password.strip() - sickbeard.IPTORRENTS_RATIO = config.to_int(iptorrents_ratio) + sickbeard.IPTORRENTS_RATIO = iptorrents_ratio sickbeard.IPTORRENTS_FREELEECH = config.checkbox_to_value(iptorrents_freeleech) sickbeard.KAT_TRUSTED = config.checkbox_to_value(kat_trusted) - sickbeard.KAT_RATIO = config.to_int(kat_ratio) + sickbeard.KAT_RATIO = kat_ratio sickbeard.KAT_VERIFIED = config.checkbox_to_value(kat_verified) sickbeard.PUBLICHD_RATIO = publichd_ratio sickbeard.TORRENTDAY_USERNAME = torrentday_username.strip() sickbeard.TORRENTDAY_PASSWORD = torrentday_password.strip() - sickbeard.TORRENTDAY_RATIO = config.to_int(torrentday_ratio) + sickbeard.TORRENTDAY_RATIO = torrentday_ratio sickbeard.TORRENTDAY_FREELEECH = config.checkbox_to_value(torrentday_freeleech) sickbeard.SCC_USERNAME = scc_username.strip() sickbeard.SCC_PASSWORD = scc_password.strip() - sickbeard.SCC_RATIO = config.to_int(scc_ratio) + sickbeard.SCC_RATIO = scc_ratio sickbeard.HDTORRENTS_USERNAME = hdtorrents_username.strip() sickbeard.HDTORRENTS_PASSWORD = hdtorrents_password.strip() - sickbeard.HDTORRENTS_RATIO = config.to_int(hdtorrents_ratio) + sickbeard.HDTORRENTS_RATIO = hdtorrents_ratio sickbeard.HDBITS_USERNAME = hdbits_username.strip() sickbeard.HDBITS_PASSKEY = hdbits_passkey.strip() - sickbeard.HDBITS_RATIO = config.to_int(hdbits_ratio) + sickbeard.HDBITS_RATIO = hdbits_ratio sickbeard.OMGWTFNZBS_USERNAME = omgwtfnzbs_username.strip() sickbeard.OMGWTFNZBS_APIKEY = omgwtfnzbs_apikey.strip() sickbeard.NEXTGEN_USERNAME = nextgen_username.strip() sickbeard.NEXTGEN_PASSWORD = nextgen_password.strip() - sickbeard.NEXTGEN_RATIO = config.to_int(nextgen_ratio) + sickbeard.NEXTGEN_RATIO = nextgen_ratio sickbeard.SPEEDCD_USERNAME = speedcd_username.strip() sickbeard.SPEEDCD_PASSWORD = speedcd_password.strip() - sickbeard.SPEEDCD_RATIO = config.to_int(speedcd_ratio) + sickbeard.SPEEDCD_RATIO = speedcd_ratio sickbeard.SPEEDCD_FREELEECH = config.checkbox_to_value(speedcd_freeleech) sickbeard.NEWZNAB_DATA = '!!!'.join([x.configStr() for x in sickbeard.newznabProviderList])