Fixed merge conflicts from gotson songkick pull request

data/interfaces/default/artist.html

@@ -178,7 +178,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( ${headphones.SONGKICK_FILTER_ENABLED} ) {
+            data.resultsPage.results.event = $.grep(data.resultsPage.results.event, function(element,index){
+              return element.venue.metroArea.id == ${headphones.SONGKICK_LOCATION};
+            });
+          }
+          
 					var tourDate;
 
 					calendarDomNode.show();
@@ -262,7 +269,9 @@
 		initActions();
 		initThisPage();
 		getArtistBio();
-		getArtistsCalendar();
+		if( ${headphones.SONGKICK_ENABLED} ){
+      getArtistsCalendar();
+    }
 	});
 
 	</script>

data/interfaces/default/config.html

@@ -965,9 +965,23 @@
 
                             <fieldset>
                                 <legend>Songkick</legend>
-                                <div class="row">
+                                <div class="row checkbox">
-                                    <label>API Key:</label>
+                                    <input type="checkbox" name="songkick_enabled" id="songkick" value="1" ${config['songkick_enabled']} /><label>Display concerts by Songkick</label>
-                                    <input type="text" name="songkick_apikey" value="${config['songkick_apikey']}" size="50">
+                                </div>
+                                <div id="songkickoptions">
+                                  <div class="row">
+                                      <label>API Key:</label>
+                                      <input type="text" name="songkick_apikey" value="${config['songkick_apikey']}" size="50">
+                                  </div>
+                                  <div class="row checkbox">
+                                      <input type="checkbox" name="songkick_filter_enabled" id="songkick_filter" value="1" ${config['songkick_filter_enabled']} /><label>Enable Songkick filter per area</label>
+                                  </div>
+                                  <div id="songkick_filteroptions">
+                                    <div class="row">
+                                      <label>Location:</label>
+                                      <input type="text" name="songkick_location" value="${config['songkick_location']}" size="50">
+                                    </div>
+                                  </div>
                                 </div>
                             </fieldset>
                             
@@ -1322,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"))
                         {

headphones/__init__.py

@@ -264,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
@@ -341,7 +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
+                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__:
@@ -370,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
@@ -577,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_str(CFG, 'Songkick', 'songkick_enabled', 0))
+        SONGKICK_APIKEY = check_setting_str(CFG, 'Songkick', 'songkick_apikey', '')
+        SONGKICK_LOCATION = check_setting_str(CFG, 'Songkick', 'songkick_location', '')
+        SONGKICK_FILTER_ENABLED = bool(check_setting_str(CFG, 'Songkick', 'songkick_filter_enabled', 0))
 
         MIRROR = check_setting_str(CFG, 'General', 'mirror', 'musicbrainz.org')
         CUSTOMHOST = check_setting_str(CFG, 'General', 'customhost', 'localhost')
@@ -971,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'] = SONGKICK_ENABLED
+    new_config['Songkick']['songkick_apikey'] = SONGKICK_APIKEY
+    new_config['Songkick']['songkick_location'] = SONGKICK_LOCATION
+    new_config['Songkick']['songkick_filter_enabled'] = SONGKICK_FILTER_ENABLED
+
     new_config['Synoindex'] = {}
     new_config['Synoindex']['synoindex_enabled'] = int(SYNOINDEX_ENABLED)
 

headphones/webserve.py

@@ -973,7 +973,10 @@ 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
@@ -1012,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, 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
@@ -1154,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
@@ -1162,7 +1169,6 @@ 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