diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 539dec23..e4083eec 100755 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -122,14 +122,15 @@

set
 	                        <label>SABnzbd Category:</label>
 	                        <input type= +
+ + + + + + +
-
- Downloads -
- - Full path where SAB downloads your comics. e.g. /Users/name/Downloads/comics -
-
diff --git a/mylar/__init__.py b/mylar/__init__.py index 4bf7e153..a9982c98 100755 --- a/mylar/__init__.py +++ b/mylar/__init__.py @@ -109,6 +109,7 @@ SAB_PASSWORD = None SAB_APIKEY = None SAB_CATEGORY = None +SAB_PRIORITY = None NZBSU = False NZBSU_APIKEY = None @@ -185,7 +186,7 @@ def initialize(): HTTP_PORT, HTTP_HOST, HTTP_USERNAME, HTTP_PASSWORD, HTTP_ROOT, LAUNCH_BROWSER, GIT_PATH, \ CURRENT_VERSION, LATEST_VERSION, CHECK_GITHUB, CHECK_GITHUB_ON_STARTUP, CHECK_GITHUB_INTERVAL, MUSIC_DIR, DESTINATION_DIR, \ DOWNLOAD_DIR, USENET_RETENTION, SEARCH_INTERVAL, INTERFACE, AUTOWANT_ALL, AUTOWANT_UPCOMING, \ - LIBRARYSCAN_INTERVAL, DOWNLOAD_SCAN_INTERVAL, SAB_HOST, SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, BLACKHOLE, BLACKHOLE_DIR, \ + LIBRARYSCAN_INTERVAL, DOWNLOAD_SCAN_INTERVAL, SAB_HOST, SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_PRIORITY, BLACKHOLE, BLACKHOLE_DIR, \ NZBSU, NZBSU_APIKEY, DOGNZB, DOGNZB_APIKEY, \ RAW, RAW_PROVIDER, RAW_USERNAME, RAW_PASSWORD, RAW_GROUPS, EXPERIMENTAL, \ PREFERRED_QUALITY, MOVE_FILES, RENAME_FILES, CORRECT_METADATA, FOLDER_FORMAT, FILE_FORMAT, REPLACE_CHAR, REPLACE_SPACES, \ @@ -247,6 +248,7 @@ def initialize(): SAB_PASSWORD = check_setting_str(CFG, 'SABnzbd', 'sab_password', '') SAB_APIKEY = check_setting_str(CFG, 'SABnzbd', 'sab_apikey', '') SAB_CATEGORY = check_setting_str(CFG, 'SABnzbd', 'sab_category', '') + SAB_PRIORITY = check_setting_int(CFG, 'SABnzbd', 'sab_priority', 0) NZBSU = bool(check_setting_int(CFG, 'NZBsu', 'nzbsu', 0)) NZBSU_APIKEY = check_setting_str(CFG, 'NZBsu', 'nzbsu_apikey', '') @@ -456,6 +458,7 @@ def config_write(): new_config['SABnzbd']['sab_password'] = SAB_PASSWORD new_config['SABnzbd']['sab_apikey'] = SAB_APIKEY new_config['SABnzbd']['sab_category'] = SAB_CATEGORY + new_config['SABnzbd']['sab_priority'] = SAB_PRIORITY new_config['NZBsu'] = {} new_config['NZBsu']['nzbsu'] = int(NZBSU) diff --git a/mylar/search.py b/mylar/search.py index 21163320..d96240e0 100644 --- a/mylar/search.py +++ b/mylar/search.py @@ -168,6 +168,11 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr): elif mylar.PREFERRED_QUALITY == 1: filetype = ".cbr" elif mylar.PREFERRED_QUALITY == 2: filetype = ".cbz" + if mylar.SAB_PRIORITY == 1: sabpriority = "-100" + elif mylar.SAB_PRIORITY == 2: sabpriority = "-1" + elif mylar.SAB_PRIORITY == 3: sabpriority = "0" + elif mylar.SAB_PRIORITY == 4: sabpriority = "1" + elif mylar.SAB_PRIORITY == 5: sabpriority = "-2" # figure out what was missed via rss feeds and do a manual search via api #tsc = int(tot-1) findcomic = [] @@ -479,6 +484,8 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr): renameit = str(ComicNM) + " " + str(IssueNumber) + " (" + str(SeriesYear) + ")" + " " + "(" + str(comyear) + ")" renameit = renameit.replace(' ', repchar) renamer = renameit.replace(' ', repurlchar) + nzo_prio = str(mylar.SAB_HOST) + "/api?mode=queue&name=priority&apikey=" + str(mylar.SAB_APIKEY) + "&value=" + str(slot_nzoid) + "&value2=" + str(sabpriority) + urllib2.urlopen(nzo_prio); nzo_ren = str(mylar.SAB_HOST) + "/api?mode=queue&name=rename&apikey=" + str(mylar.SAB_APIKEY) + "&value=" + str(slot_nzoid) + "&value2=" + str(renamer) urllib2.urlopen(nzo_ren); logger.info(u"Renamed nzb file in SABnzbd queue to : " + str(renameit))