Autowant manually added albums config option

data/interfaces/default/config.html

@@ -1278,6 +1278,11 @@
                                 <div class="row left checkbox">
                                     <input type="checkbox" name="autowant_all" value="1" ${config['autowant_all']} /><label>Automatically mark all albums as wanted</label>
                                 </div>
+                                <div class="row left checkbox">
+                                    <input type="checkbox" title="Automatically mark manually added albums from search results as wanted"
+                                           name="autowant_manually_added" value="1" ${config['autowant_manually_added']} />
+                                    <label>Automatically mark manually added albums as wanted</label>
+                                </div>
                                 <div class="row">
                                     <label>Folder Permissions:</label>
                                     <input type="text" name="folder_permissions" value="${config['folder_permissions']}" size="7">

headphones/__init__.py

@@ -129,6 +129,7 @@ INCLUDE_EXTRAS = False
 EXTRAS = None
 AUTOWANT_UPCOMING = False
 AUTOWANT_ALL = False
+AUTOWANT_MANUALLY_ADDED = True
 KEEP_TORRENT_FILES = False
 PREFER_TORRENTS = None # 0: nzbs, 1: torrents, 2: no preference
 OPEN_MAGNET_LINKS = False
@@ -358,7 +359,7 @@ def initialize():
                 HTTP_PORT, HTTP_HOST, HTTP_USERNAME, HTTP_PASSWORD, HTTP_ROOT, HTTP_PROXY, LAUNCH_BROWSER, API_ENABLED, API_KEY, GIT_PATH, GIT_USER, GIT_BRANCH, DO_NOT_OVERRIDE_GIT_BRANCH, \
                 CURRENT_VERSION, LATEST_VERSION, CHECK_GITHUB, CHECK_GITHUB_ON_STARTUP, CHECK_GITHUB_INTERVAL, MUSIC_DIR, DESTINATION_DIR, \
                 LOSSLESS_DESTINATION_DIR, PREFERRED_QUALITY, PREFERRED_BITRATE, DETECT_BITRATE, ADD_ARTISTS, CORRECT_METADATA, FREEZE_DB, MOVE_FILES, \
-                RENAME_FILES, FOLDER_FORMAT, FILE_FORMAT, FILE_UNDERSCORES, CLEANUP_FILES, KEEP_NFO, INCLUDE_EXTRAS, EXTRAS, AUTOWANT_UPCOMING, AUTOWANT_ALL, KEEP_TORRENT_FILES, PREFER_TORRENTS, OPEN_MAGNET_LINKS, \
+                RENAME_FILES, FOLDER_FORMAT, FILE_FORMAT, FILE_UNDERSCORES, CLEANUP_FILES, KEEP_NFO, INCLUDE_EXTRAS, EXTRAS, AUTOWANT_UPCOMING, AUTOWANT_ALL, AUTOWANT_MANUALLY_ADDED, KEEP_TORRENT_FILES, PREFER_TORRENTS, OPEN_MAGNET_LINKS, \
                 ADD_ALBUM_ART, ALBUM_ART_FORMAT, EMBED_ALBUM_ART, EMBED_LYRICS, REPLACE_EXISTING_FOLDERS, DOWNLOAD_DIR, BLACKHOLE, BLACKHOLE_DIR, USENET_RETENTION, SEARCH_INTERVAL, \
                 TORRENTBLACKHOLE_DIR, NUMBEROFSEEDERS, KAT, KAT_PROXY_URL, KAT_RATIO, PIRATEBAY, PIRATEBAY_PROXY_URL, PIRATEBAY_RATIO, MININOVA, MININOVA_RATIO, WAFFLES, WAFFLES_UID, WAFFLES_PASSKEY, WAFFLES_RATIO, \
                 RUTRACKER, RUTRACKER_USER, RUTRACKER_PASSWORD, RUTRACKER_RATIO, WHATCD, WHATCD_USERNAME, WHATCD_PASSWORD, WHATCD_RATIO, DOWNLOAD_TORRENT_DIR, \
@@ -461,6 +462,7 @@ def initialize():
         EXTRAS = check_setting_str(CFG, 'General', 'extras', '')
         AUTOWANT_UPCOMING = bool(check_setting_int(CFG, 'General', 'autowant_upcoming', 1))
         AUTOWANT_ALL = bool(check_setting_int(CFG, 'General', 'autowant_all', 0))
+        AUTOWANT_MANUALLY_ADDED  = bool(check_setting_int(CFG, 'General', 'autowant_manually_added', 1))
         KEEP_TORRENT_FILES = bool(check_setting_int(CFG, 'General', 'keep_torrent_files', 0))
         PREFER_TORRENTS = check_setting_int(CFG, 'General', 'prefer_torrents', 0)
         OPEN_MAGNET_LINKS = bool(check_setting_int(CFG, 'General', 'open_magnet_links', 0))
@@ -906,6 +908,7 @@ def config_write():
     new_config['General']['extras'] = EXTRAS
     new_config['General']['autowant_upcoming'] = int(AUTOWANT_UPCOMING)
     new_config['General']['autowant_all'] = int(AUTOWANT_ALL)
+    new_config['General']['autowant_manually_added'] = int(AUTOWANT_MANUALLY_ADDED)
     new_config['General']['keep_torrent_files'] = int(KEEP_TORRENT_FILES)
     new_config['General']['prefer_torrents'] = PREFER_TORRENTS
     new_config['General']['open_magnet_links'] = OPEN_MAGNET_LINKS

headphones/importer.py

@@ -664,18 +664,16 @@ def addReleaseById(rid, rgid=None):
             myDB.upsert("tracks", newValueDict, controlValueDict)
 
         # Reset status
-        wanted = True
         if status == 'Loading':
             controlValueDict = {"AlbumID":  rgid}
-            if artistid not in blacklisted_special_artists:
+            if headphones.AUTOWANT_MANUALLY_ADDED:
                 newValueDict = {"Status":   "Wanted"}
             else:
                 newValueDict = {"Status":   "Skipped"}
-                wanted = False
             myDB.upsert("albums", newValueDict, controlValueDict)
 
         # Start a search for the album
-        if wanted:
+        if headphones.AUTOWANT_MANUALLY_ADDED:
             import searcher
             searcher.searchforalbum(rgid, False)
 

headphones/webserve.py

@@ -1065,6 +1065,7 @@ class WebInterface(object):
                     "include_extras" : checked(headphones.INCLUDE_EXTRAS),
                     "autowant_upcoming" : checked(headphones.AUTOWANT_UPCOMING),
                     "autowant_all" : checked(headphones.AUTOWANT_ALL),
+                    "autowant_manually_added" : checked(headphones.AUTOWANT_MANUALLY_ADDED),
                     "keep_torrent_files" : checked(headphones.KEEP_TORRENT_FILES),
                     "prefer_torrents_0" : radio(headphones.PREFER_TORRENTS, 0),
                     "prefer_torrents_1" : radio(headphones.PREFER_TORRENTS, 1),
@@ -1187,7 +1188,7 @@ class WebInterface(object):
         numberofseeders=None, use_piratebay=0, piratebay_proxy_url=None, piratebay_ratio=None, use_kat=0, kat_proxy_url=None, kat_ratio=None, use_mininova=0, mininova_ratio=None, waffles=0, waffles_uid=None, waffles_passkey=None, waffles_ratio=None, whatcd=0, whatcd_username=None, whatcd_password=None, whatcd_ratio=None,
         rutracker=0, rutracker_user=None, rutracker_password=None, rutracker_ratio=None, rename_files=0, correct_metadata=0, cleanup_files=0, keep_nfo=0, add_album_art=0, album_art_format=None, embed_album_art=0, embed_lyrics=0, replace_existing_folders=False,
         destination_dir=None, lossless_destination_dir=None, folder_format=None, file_format=None, file_underscores=0, include_extras=0, single=0, ep=0, compilation=0, soundtrack=0, live=0, remix=0, spokenword=0, audiobook=0, other=0, djmix=0, mixtape_street=0, broadcast=0, interview=0, demo=0,
-        autowant_upcoming=False, autowant_all=False, keep_torrent_files=False, prefer_torrents=0, open_magnet_links=0, interface=None, log_dir=None, cache_dir=None, music_encoder=0, encoder=None, xldprofile=None,
+        autowant_upcoming=False, autowant_all=False, autowant_manually_added=False, keep_torrent_files=False, prefer_torrents=0, open_magnet_links=0, interface=None, log_dir=None, cache_dir=None, music_encoder=0, encoder=None, xldprofile=None,
         bitrate=None, samplingfrequency=None, encoderfolder=None, advancedencoder=None, encoderoutputformat=None, encodervbrcbr=None, encoderquality=None, encoderlossless=0, subsonic_enabled=False, subsonic_host=None, subsonic_username=None, subsonic_password=None,
         delete_lossless_files=0, growl_enabled=0, growl_onsnatch=0, growl_host=None, growl_password=None, prowl_enabled=0, prowl_onsnatch=0, prowl_keys=None, prowl_priority=0, xbmc_enabled=0, xbmc_host=None, xbmc_username=None, xbmc_password=None,
         xbmc_update=0, xbmc_notify=0, nma_enabled=False, nma_apikey=None, nma_priority=0, nma_onsnatch=0, pushalot_enabled=False, pushalot_apikey=None, pushalot_onsnatch=0, synoindex_enabled=False, lms_enabled=0, lms_host=None,
@@ -1298,6 +1299,7 @@ class WebInterface(object):
         headphones.INCLUDE_EXTRAS = include_extras
         headphones.AUTOWANT_UPCOMING = autowant_upcoming
         headphones.AUTOWANT_ALL = autowant_all
+        headphones.AUTOWANT_MANUALLY_ADDED = autowant_manually_added
         headphones.KEEP_TORRENT_FILES = keep_torrent_files
         headphones.PREFER_TORRENTS = int(prefer_torrents)
         headphones.OPEN_MAGNET_LINKS = open_magnet_links