diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html index d57233d1..33c27a6c 100644 --- a/data/interfaces/default/artist.html +++ b/data/interfaces/default/artist.html @@ -169,6 +169,23 @@ } + <% + if headphones.SONGKICK_FILTER_ENABLED: + songkick_filter_enabled = "true" + else: + songkick_filter_enabled = "false" + + if not headphones.SONGKICK_LOCATION: + songkick_location = "none" + else: + songkick_location = headphones.SONGKICK_LOCATION + + if headphones.SONGKICK_ENABLED: + songkick_enabled = "true" + else: + songkick_enabled = "false" + + %> function getArtistsCalendar() { var template, calendarDomNode; @@ -178,7 +195,14 @@ $.getJSON("http://api.songkick.com/api/3.0/artists/mbid:${artist['ArtistID']}/calendar.json?apikey=${headphones.SONGKICK_APIKEY}&jsoncallback=?", function(data){ - if (data['resultsPage'].totalEntries >= 1) { + if (data['resultsPage'].totalEntries >= 1) { + + if( ${songkick_filter_enabled} ) { + data.resultsPage.results.event = $.grep(data.resultsPage.results.event, function(element,index){ + return element.venue.metroArea.id == ${songkick_location}; + }); + } + var tourDate; calendarDomNode.show(); @@ -262,7 +286,9 @@ initActions(); initThisPage(); getArtistBio(); - getArtistsCalendar(); + if( ${songkick_enabled} ){ + getArtistsCalendar(); + } }); diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 7417aab3..486f79f7 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -508,11 +508,6 @@ -
- - - Set this to where your download client puts its completed downloads in -
@@ -970,9 +965,23 @@
Songkick -
- - +
+ +
+
+
+ + +
+
+ +
+
+
+ + +
+
@@ -1327,6 +1336,46 @@ $("#twitteroptions").slideUp(); } }); + + if ($("#songkick").is(":checked")) + { + $("#songkickoptions").show(); + } + else + { + $("#songkickoptions").hide(); + } + + $("#songkick").click(function(){ + if ($("#songkick").is(":checked")) + { + $("#songkickoptions").slideDown(); + } + else + { + $("#songkickoptions").slideUp(); + } + }); + + if ($("#songkick_filter").is(":checked")) + { + $("#songkick_filteroptions").show(); + } + else + { + $("#songkick_filteroptions").hide(); + } + + $("#songkick_filter").click(function(){ + if ($("#songkick_filter").is(":checked")) + { + $("#songkick_filteroptions").slideDown(); + } + else + { + $("#songkick_filteroptions").slideUp(); + } + }); if ($("#preferred_bitrate").is(":checked")) { diff --git a/headphones/__init__.py b/headphones/__init__.py index 45301577..0ec325b6 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -92,7 +92,6 @@ CHECK_GITHUB = False CHECK_GITHUB_ON_STARTUP = False CHECK_GITHUB_INTERVAL = None -POST_PROCESSING_DIR = None MUSIC_DIR = None DESTINATION_DIR = None LOSSLESS_DESTINATION_DIR = None @@ -265,7 +264,10 @@ CUSTOMPORT = None CUSTOMSLEEP = None HPUSER = None HPPASS = None -SONGKICK_APIKEY = "nd1We7dFW2RqxPw8" +SONGKICK_ENABLED = False +SONGKICK_APIKEY = None +SONGKICK_LOCATION = None +SONGKICK_FILTER_ENABLED = False CACHE_SIZEMB = 32 JOURNAL_MODE = None @@ -342,8 +344,8 @@ def initialize(): MIRROR, CUSTOMHOST, CUSTOMPORT, CUSTOMSLEEP, HPUSER, HPPASS, XBMC_ENABLED, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, XBMC_UPDATE, \ XBMC_NOTIFY, NMA_ENABLED, NMA_APIKEY, NMA_PRIORITY, NMA_ONSNATCH, SYNOINDEX_ENABLED, ALBUM_COMPLETION_PCT, PREFERRED_BITRATE_HIGH_BUFFER, \ PREFERRED_BITRATE_LOW_BUFFER, PREFERRED_BITRATE_ALLOW_LOSSLESS, CACHE_SIZEMB, JOURNAL_MODE, UMASK, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \ - PLEX_ENABLED, PLEX_SERVER_HOST, PLEX_CLIENT_HOST, PLEX_USERNAME, PLEX_PASSWORD, PLEX_UPDATE, PLEX_NOTIFY, PUSHALOT_ENABLED, PUSHALOT_APIKEY, PUSHALOT_ONSNATCH, \ - POST_PROCESSING_DIR + PLEX_ENABLED, PLEX_SERVER_HOST, PLEX_CLIENT_HOST, PLEX_USERNAME, PLEX_PASSWORD, PLEX_UPDATE, PLEX_NOTIFY, PUSHALOT_ENABLED, PUSHALOT_APIKEY, \ + PUSHALOT_ONSNATCH, SONGKICK_ENABLED, SONGKICK_APIKEY, SONGKICK_LOCATION, SONGKICK_FILTER_ENABLED if __INITIALIZED__: @@ -372,6 +374,7 @@ def initialize(): CheckSection('Pushalot') CheckSection('Synoindex') CheckSection('Twitter') + CheckSection('Songkick') CheckSection('Advanced') # Set global variables based on config file or use defaults @@ -406,7 +409,6 @@ def initialize(): CHECK_GITHUB_ON_STARTUP = bool(check_setting_int(CFG, 'General', 'check_github_on_startup', 1)) CHECK_GITHUB_INTERVAL = check_setting_int(CFG, 'General', 'check_github_interval', 360) - POST_PROCESSING_DIR = check_setting_str(CFG, 'General', 'post_processing_dir', '') MUSIC_DIR = check_setting_str(CFG, 'General', 'music_dir', '') DESTINATION_DIR = check_setting_str(CFG, 'General', 'destination_dir', '') LOSSLESS_DESTINATION_DIR = check_setting_str(CFG, 'General', 'lossless_destination_dir', '') @@ -580,6 +582,11 @@ def initialize(): TWITTER_USERNAME = check_setting_str(CFG, 'Twitter', 'twitter_username', '') TWITTER_PASSWORD = check_setting_str(CFG, 'Twitter', 'twitter_password', '') TWITTER_PREFIX = check_setting_str(CFG, 'Twitter', 'twitter_prefix', 'Headphones') + + SONGKICK_ENABLED = bool(check_setting_int(CFG, 'Songkick', 'songkick_enabled', 0)) + SONGKICK_APIKEY = check_setting_str(CFG, 'Songkick', 'songkick_apikey', 'nd1We7dFW2RqxPw8') + SONGKICK_LOCATION = check_setting_str(CFG, 'Songkick', 'songkick_location', '') + SONGKICK_FILTER_ENABLED = bool(check_setting_int(CFG, 'Songkick', 'songkick_filter_enabled', 0)) MIRROR = check_setting_str(CFG, 'General', 'mirror', 'musicbrainz.org') CUSTOMHOST = check_setting_str(CFG, 'General', 'customhost', 'localhost') @@ -800,7 +807,6 @@ def config_write(): new_config['General']['check_github_on_startup'] = int(CHECK_GITHUB_ON_STARTUP) new_config['General']['check_github_interval'] = CHECK_GITHUB_INTERVAL - new_config['General']['post_processing_dir'] = POST_PROCESSING_DIR new_config['General']['music_dir'] = MUSIC_DIR new_config['General']['destination_dir'] = DESTINATION_DIR new_config['General']['lossless_destination_dir'] = LOSSLESS_DESTINATION_DIR @@ -975,6 +981,12 @@ def config_write(): new_config['Twitter']['twitter_password'] = TWITTER_PASSWORD new_config['Twitter']['twitter_prefix'] = TWITTER_PREFIX + new_config['Songkick'] = {} + new_config['Songkick']['songkick_enabled'] = int(SONGKICK_ENABLED) + new_config['Songkick']['songkick_apikey'] = SONGKICK_APIKEY + new_config['Songkick']['songkick_location'] = SONGKICK_LOCATION + new_config['Songkick']['songkick_filter_enabled'] = int(SONGKICK_FILTER_ENABLED) + new_config['Synoindex'] = {} new_config['Synoindex']['synoindex_enabled'] = int(SYNOINDEX_ENABLED) diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index d2fcc8cc..492b69c0 100644 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -55,7 +55,7 @@ def checkFolder(): for nzb_folder_name in nzb_album_possibilities: - nzb_album_path = os.path.join(headphones.POST_PROCESSING_DIR, nzb_folder_name).encode(headphones.SYS_ENCODING, 'replace') + nzb_album_path = os.path.join(headphones.DOWNLOAD_DIR, nzb_folder_name).encode(headphones.SYS_ENCODING, 'replace') if os.path.exists(nzb_album_path): logger.debug('Found %s in NZB download folder. Verifying....' % album['FolderName']) @@ -63,7 +63,7 @@ def checkFolder(): if album['Kind'] == 'torrent': - torrent_album_path = os.path.join(headphones.POST_PROCESSING_DIR, album['FolderName']).encode(headphones.SYS_ENCODING,'replace') + torrent_album_path = os.path.join(headphones.DOWNLOAD_TORRENT_DIR, album['FolderName']).encode(headphones.SYS_ENCODING,'replace') if os.path.exists(torrent_album_path): logger.debug('Found %s in torrent download folder. Verifying....' % album['FolderName']) @@ -921,10 +921,15 @@ def renameUnprocessedFolder(albumpath): def forcePostProcess(): download_dirs = [] - if headphones.POST_PROCESSING_DIR: - download_dirs.append(headphones.POST_PROCESSING_DIR.encode(headphones.SYS_ENCODING, 'replace')) - - logger.info('Checking to see if there are any folders to process in: %s' % str(download_dirs).decode(headphones.SYS_ENCODING, 'replace')) + if headphones.DOWNLOAD_DIR: + download_dirs.append(headphones.DOWNLOAD_DIR.encode(headphones.SYS_ENCODING, 'replace')) + if headphones.DOWNLOAD_TORRENT_DIR: + download_dirs.append(headphones.DOWNLOAD_TORRENT_DIR.encode(headphones.SYS_ENCODING, 'replace')) + + # If DOWNLOAD_DIR and DOWNLOAD_TORRENT_DIR are the same, remove the duplicate to prevent us from trying to process the same folder twice. + download_dirs = list(set(download_dirs)) + + logger.info('Checking to see if there are any folders to process in download_dir(s): %s' % str(download_dirs).decode(headphones.SYS_ENCODING, 'replace')) # Get a list of folders in the download_dir folders = [] for download_dir in download_dirs: diff --git a/headphones/webserve.py b/headphones/webserve.py index fa53d183..ca8ad578 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -973,11 +973,13 @@ class WebInterface(object): "customsleep": headphones.CUSTOMSLEEP, "hpuser": headphones.HPUSER, "hppass": headphones.HPPASS, + "songkick_enabled": checked(headphones.SONGKICK_ENABLED), "songkick_apikey": headphones.SONGKICK_APIKEY, + "songkick_location": headphones.SONGKICK_LOCATION, + "songkick_filter_enabled": checked(headphones.SONGKICK_FILTER_ENABLED), "cache_sizemb": headphones.CACHE_SIZEMB, "file_permissions": headphones.FILE_PERMISSIONS, - "folder_permissions": headphones.FOLDER_PERMISSIONS, - "post_processing_dir" : headphones.POST_PROCESSING_DIR + "folder_permissions": headphones.FOLDER_PERMISSIONS } # Need to convert EXTRAS to a dictionary we can pass to the config: it'll come in as a string like 2,5,6,8 @@ -1013,7 +1015,7 @@ class WebInterface(object): pushover_enabled=0, pushover_onsnatch=0, pushover_keys=None, pushover_priority=0, pushbullet_enabled=0, pushbullet_onsnatch=0, pushbullet_apikey=None, pushbullet_deviceid=None, twitter_enabled=0, twitter_onsnatch=0, mirror=None, customhost=None, customport=None, customsleep=None, hpuser=None, hppass=None, preferred_bitrate_high_buffer=None, preferred_bitrate_low_buffer=None, preferred_bitrate_allow_lossless=0, cache_sizemb=None, enable_https=0, https_cert=None, https_key=None, file_permissions=None, folder_permissions=None, plex_enabled=0, plex_server_host=None, plex_client_host=None, plex_username=None, - plex_password=None, plex_update=0, plex_notify=0, post_processing_dir=None, songkick_apikey=None, **kwargs): + plex_password=None, plex_update=0, plex_notify=0, songkick_enabled=0, songkick_apikey=None, songkick_location=None, songkick_filter_enabled=0, **kwargs): headphones.HTTP_HOST = http_host headphones.HTTP_PORT = http_port @@ -1155,6 +1157,10 @@ class WebInterface(object): headphones.PUSHBULLET_ONSNATCH = pushbullet_onsnatch headphones.PUSHBULLET_APIKEY = pushbullet_apikey headphones.PUSHBULLET_DEVICEID = pushbullet_deviceid + headphones.SONGKICK_ENABLED = songkick_enabled + headphones.SONGKICK_APIKEY = songkick_apikey + headphones.SONGKICK_LOCATION = songkick_location + headphones.SONGKICK_FILTER_ENABLED = songkick_filter_enabled headphones.TWITTER_ENABLED = twitter_enabled headphones.TWITTER_ONSNATCH = twitter_onsnatch headphones.MIRROR = mirror @@ -1163,11 +1169,9 @@ class WebInterface(object): headphones.CUSTOMSLEEP = customsleep headphones.HPUSER = hpuser headphones.HPPASS = hppass - headphones.SONGKICK_APIKEY = songkick_apikey headphones.CACHE_SIZEMB = int(cache_sizemb) headphones.FILE_PERMISSIONS = file_permissions headphones.FOLDER_PERMISSIONS = folder_permissions - headphones.POST_PROCESSING_DIR = post_processing_dir # Handle the variable config options. Note - keys with False values aren't getting passed