diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 58baf946..29978480 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -184,23 +184,7 @@ - - + +
-
- NZBMatrix -
- -
-
-
- - -
-
- - -
-
-
- + NZBs
Newznab
@@ -254,9 +238,7 @@
- 		+
NZBs.org
@@ -270,21 +252,24 @@
- Newsbin + NZBsRus
- +
- - + +
- - + +
+
Torrents
@@ -1038,9 +1023,8 @@ $( "#tabs" ).tabs(); }); initActions(); - initConfigCheckbox("#usenzbmatrix"); initConfigCheckbox("#usenewznab"); - initConfigCheckbox("#usenewzbin"); + initConfigCheckbox("#usenzbsrus"); initConfigCheckbox("#usenzbsorg"); initConfigCheckbox("#usewaffles"); initConfigCheckbox("#userutracker"); diff --git a/headphones/__init__.py b/headphones/__init__.py index 9286835f..efbfe7e5 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -140,6 +140,10 @@ NEWZBIN = False NEWZBIN_UID = None NEWZBIN_PASSWORD = None +NZBSRUS = False +NZBSRUS_UID = None +NZBSRUS_APIKEY = None + LASTFM_USERNAME = None LOSSY_MEDIA_FORMATS = ["mp3", "aac", "ogg", "ape", "m4a"] @@ -268,7 +272,7 @@ def initialize(): RUTRACKER, RUTRACKER_USER, RUTRACKER_PASSWORD, WHATCD, WHATCD_USERNAME, WHATCD_PASSWORD, DOWNLOAD_TORRENT_DIR, \ LIBRARYSCAN, LIBRARYSCAN_INTERVAL, DOWNLOAD_SCAN_INTERVAL, SAB_HOST, SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, \ NZBMATRIX, NZBMATRIX_USERNAME, NZBMATRIX_APIKEY, NEWZNAB, NEWZNAB_HOST, NEWZNAB_APIKEY, NEWZNAB_ENABLED, EXTRA_NEWZNABS,\ - NZBSORG, NZBSORG_UID, NZBSORG_HASH, NEWZBIN, NEWZBIN_UID, NEWZBIN_PASSWORD, LASTFM_USERNAME, INTERFACE, FOLDER_PERMISSIONS, \ + NZBSORG, NZBSORG_UID, NZBSORG_HASH, NEWZBIN, NEWZBIN_UID, NEWZBIN_PASSWORD, NZBSRUS, NZBSRUS_UID, NZBSRUS_APIKEY, LASTFM_USERNAME, INTERFACE, FOLDER_PERMISSIONS, \ ENCODERFOLDER, ENCODER_PATH, ENCODER, XLDPROFILE, BITRATE, SAMPLINGFREQUENCY, MUSIC_ENCODER, ADVANCEDENCODER, ENCODEROUTPUTFORMAT, ENCODERQUALITY, \ ENCODERVBRCBR, ENCODERLOSSLESS, DELETE_LOSSLESS_FILES, PROWL_ENABLED, PROWL_PRIORITY, PROWL_KEYS, PROWL_ONSNATCH, \ PUSHOVER_ENABLED, PUSHOVER_PRIORITY, PUSHOVER_KEYS, PUSHOVER_ONSNATCH, MIRRORLIST, \ @@ -285,6 +289,7 @@ def initialize(): CheckSection('NZBMatrix') CheckSection('Newznab') CheckSection('NZBsorg') + CheckSection('NZBsRus') CheckSection('Newzbin') CheckSection('Waffles') CheckSection('Rutracker') @@ -400,6 +405,10 @@ def initialize(): NEWZBIN = bool(check_setting_int(CFG, 'Newzbin', 'newzbin', 0)) NEWZBIN_UID = check_setting_str(CFG, 'Newzbin', 'newzbin_uid', '') NEWZBIN_PASSWORD = check_setting_str(CFG, 'Newzbin', 'newzbin_password', '') + + NZBSRUS = bool(check_setting_int(CFG, 'NZBsRus', 'nzbsrus', 0)) + NZBSRUS_UID = check_setting_str(CFG, 'NZBsRus', 'nzbsrus_uid', '') + NZBSRUS_APIKEY = check_setting_str(CFG, 'NZBsRus', 'nzbsrus_apikey', '') LASTFM_USERNAME = check_setting_str(CFG, 'General', 'lastfm_username', '') @@ -725,6 +734,11 @@ def config_write(): new_config['Newzbin']['newzbin_uid'] = NEWZBIN_UID new_config['Newzbin']['newzbin_password'] = NEWZBIN_PASSWORD + new_config['NZBsRus'] = {} + new_config['NZBsRus']['nzbsrus'] = int(NZBSRUS) + new_config['NZBsRus']['nzbsrus_uid'] = NZBSRUS_UID + new_config['NZBsRus']['nzbsrus_apikey'] = NZBSRUS_APIKEY + new_config['Prowl'] = {} new_config['Prowl']['prowl_enabled'] = int(PROWL_ENABLED) new_config['Prowl']['prowl_keys'] = PROWL_KEYS diff --git a/headphones/webserve.py b/headphones/webserve.py index f7b52f01..926e379a 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -568,9 +568,9 @@ class WebInterface(object): "use_blackhole" : checked(headphones.BLACKHOLE), "blackhole_dir" : headphones.BLACKHOLE_DIR, "usenet_retention" : headphones.USENET_RETENTION, - "use_nzbmatrix" : checked(headphones.NZBMATRIX), - "nzbmatrix_user" : headphones.NZBMATRIX_USERNAME, - "nzbmatrix_api" : headphones.NZBMATRIX_APIKEY, +# "use_nzbmatrix" : checked(headphones.NZBMATRIX), +# "nzbmatrix_user" : headphones.NZBMATRIX_USERNAME, +# "nzbmatrix_api" : headphones.NZBMATRIX_APIKEY, "use_newznab" : checked(headphones.NEWZNAB), "newznab_host" : headphones.NEWZNAB_HOST, "newznab_api" : headphones.NEWZNAB_APIKEY, @@ -579,9 +579,12 @@ class WebInterface(object): "use_nzbsorg" : checked(headphones.NZBSORG), "nzbsorg_uid" : headphones.NZBSORG_UID, "nzbsorg_hash" : headphones.NZBSORG_HASH, - "use_newzbin" : checked(headphones.NEWZBIN), - "newzbin_uid" : headphones.NEWZBIN_UID, - "newzbin_pass" : headphones.NEWZBIN_PASSWORD, +# "use_newzbin" : checked(headphones.NEWZBIN), +# "newzbin_uid" : headphones.NEWZBIN_UID, +# "newzbin_pass" : headphones.NEWZBIN_PASSWORD, + "use_nzbsrus" : checked(headphones.NZBSRUS), + "nzbsrus_uid" : headphones.NZBSRUS_UID, + "nzbsrus_apikey" : headphones.NZBSRUS_APIKEY, "torrentblackhole_dir" : headphones.TORRENTBLACKHOLE_DIR, "download_torrent_dir" : headphones.DOWNLOAD_TORRENT_DIR, "numberofseeders" : headphones.NUMBEROFSEEDERS, @@ -683,9 +686,9 @@ class WebInterface(object): def configUpdate(self, http_host='0.0.0.0', http_username=None, http_port=8181, http_password=None, launch_browser=0, api_enabled=0, api_key=None, download_scan_interval=None, nzb_search_interval=None, libraryscan_interval=None, sab_host=None, sab_username=None, sab_apikey=None, sab_password=None, - sab_category=None, download_dir=None, blackhole=0, blackhole_dir=None, usenet_retention=None, nzbmatrix=0, nzbmatrix_username=None, nzbmatrix_apikey=None, - newznab=0, newznab_host=None, newznab_apikey=None, newznab_enabled=0, nzbsorg=0, nzbsorg_uid=None, nzbsorg_hash=None, newzbin=0, newzbin_uid=None, - newzbin_password=None, preferred_quality=0, preferred_bitrate=None, detect_bitrate=0, move_files=0, torrentblackhole_dir=None, download_torrent_dir=None, + sab_category=None, download_dir=None, blackhole=0, blackhole_dir=None, usenet_retention=None, newznab=0, newznab_host=None, newznab_apikey=None, + newznab_enabled=0, nzbsorg=0, nzbsorg_uid=None, nzbsorg_hash=None, nzbsrus=0, nzbsrus_uid=None, nzbsrus_apikey=None, preferred_quality=0, preferred_bitrate=None, + detect_bitrate=0, move_files=0, torrentblackhole_dir=None, download_torrent_dir=None, numberofseeders=10, use_isohunt=0, use_kat=0, use_mininova=0, waffles=0, waffles_uid=None, waffles_passkey=None, whatcd=0, whatcd_username=None, whatcd_password=None, rutracker=0, rutracker_user=None, rutracker_password=None, rename_files=0, correct_metadata=0, cleanup_files=0, add_album_art=0, embed_album_art=0, embed_lyrics=0, destination_dir=None, lossless_destination_dir=None, folder_format=None, file_format=None, include_extras=0, single=0, ep=0, compilation=0, soundtrack=0, live=0, @@ -715,9 +718,9 @@ class WebInterface(object): headphones.BLACKHOLE = blackhole headphones.BLACKHOLE_DIR = blackhole_dir headphones.USENET_RETENTION = usenet_retention - headphones.NZBMATRIX = nzbmatrix - headphones.NZBMATRIX_USERNAME = nzbmatrix_username - headphones.NZBMATRIX_APIKEY = nzbmatrix_apikey +# headphones.NZBMATRIX = nzbmatrix +# headphones.NZBMATRIX_USERNAME = nzbmatrix_username +# headphones.NZBMATRIX_APIKEY = nzbmatrix_apikey headphones.NEWZNAB = newznab headphones.NEWZNAB_HOST = newznab_host headphones.NEWZNAB_APIKEY = newznab_apikey @@ -725,9 +728,12 @@ class WebInterface(object): headphones.NZBSORG = nzbsorg headphones.NZBSORG_UID = nzbsorg_uid headphones.NZBSORG_HASH = nzbsorg_hash - headphones.NEWZBIN = newzbin - headphones.NEWZBIN_UID = newzbin_uid - headphones.NEWZBIN_PASSWORD = newzbin_password +# headphones.NEWZBIN = newzbin +# headphones.NEWZBIN_UID = newzbin_uid +# headphones.NEWZBIN_PASSWORD = newzbin_password + headphones.NZBSRUS = nzbsrus + headphones.NZBSRUS_UID = nzbsrus_uid + headphones.NZBSRUS_APIKEY = nzbsrus_apikey headphones.TORRENTBLACKHOLE_DIR = torrentblackhole_dir headphones.NUMBEROFSEEDERS = numberofseeders headphones.DOWNLOAD_TORRENT_DIR = download_torrent_dir