gronod/headphones
1
0
Fork 0
mirror of https://github.com/rembo10/headphones.git synced 2026-07-20 16:03:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Couple fixes for the songkick pull request from gitson

Browse Source
This commit is contained in:
rembo10
2014-03-28 11:12:59 -07:00
parent aa4bb6b598
commit 84aa80c93e
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/interfaces/default/artist.html
+17 -2
View File
@@ -169,6 +169,21 @@
} }
<%
if headphones.SONGKICK_FILTER_ENABLED:
songkick_filter_enabled = "true"
else:
songkick_filter_enabled = "false"
if not headphones.SONGKICK_LOCATION:
headphones.SONGKICK_LOCATION = "none"
if headphones.SONGKICK_ENABLED:
songkick_enabled = "true"
else:
songkick_enabled = "false"
%>
function getArtistsCalendar() { function getArtistsCalendar() {
var template, calendarDomNode; var template, calendarDomNode;
@@ -180,7 +195,7 @@
function(data){ function(data){
if (data['resultsPage'].totalEntries >= 1) { if (data['resultsPage'].totalEntries >= 1) {
if( ${headphones.SONGKICK_FILTER_ENABLED} ) { if( ${songkick_filter_enabled} ) {
data.resultsPage.results.event = $.grep(data.resultsPage.results.event, function(element,index){ data.resultsPage.results.event = $.grep(data.resultsPage.results.event, function(element,index){
return element.venue.metroArea.id == ${headphones.SONGKICK_LOCATION}; return element.venue.metroArea.id == ${headphones.SONGKICK_LOCATION};
}); });
@@ -269,7 +284,7 @@
initActions(); initActions();
initThisPage(); initThisPage();
getArtistBio(); getArtistBio();
if( ${headphones.SONGKICK_ENABLED} ){ if( ${songkick_enabled} ){
getArtistsCalendar(); getArtistsCalendar();
} }
}); });
headphones/__init__.py
+5 -5
View File
@@ -314,7 +314,7 @@ def check_setting_str(config, cfg_name, item_name, def_val, log=True):
config[cfg_name][item_name] = my_val config[cfg_name][item_name] = my_val
if log: if log:
logger.debug(item_name + " -> " + str(my_val)) logger.debug(item_name + " -> " + my_val)
else: else:
logger.debug(item_name + " -> ******") logger.debug(item_name + " -> ******")
return my_val return my_val
@@ -583,10 +583,10 @@ def initialize():
TWITTER_PASSWORD = check_setting_str(CFG, 'Twitter', 'twitter_password', '') TWITTER_PASSWORD = check_setting_str(CFG, 'Twitter', 'twitter_password', '')
TWITTER_PREFIX = check_setting_str(CFG, 'Twitter', 'twitter_prefix', 'Headphones') TWITTER_PREFIX = check_setting_str(CFG, 'Twitter', 'twitter_prefix', 'Headphones')
SONGKICK_ENABLED = bool(check_setting_str(CFG, 'Songkick', 'songkick_enabled', 0)) SONGKICK_ENABLED = bool(check_setting_int(CFG, 'Songkick', 'songkick_enabled', 0))
SONGKICK_APIKEY = check_setting_str(CFG, 'Songkick', 'songkick_apikey', 'nd1We7dFW2RqxPw8') SONGKICK_APIKEY = check_setting_str(CFG, 'Songkick', 'songkick_apikey', 'nd1We7dFW2RqxPw8')
SONGKICK_LOCATION = check_setting_str(CFG, 'Songkick', 'songkick_location', '') SONGKICK_LOCATION = check_setting_str(CFG, 'Songkick', 'songkick_location', '')
SONGKICK_FILTER_ENABLED = bool(check_setting_str(CFG, 'Songkick', 'songkick_filter_enabled', 0)) SONGKICK_FILTER_ENABLED = bool(check_setting_int(CFG, 'Songkick', 'songkick_filter_enabled', 0))
MIRROR = check_setting_str(CFG, 'General', 'mirror', 'musicbrainz.org') MIRROR = check_setting_str(CFG, 'General', 'mirror', 'musicbrainz.org')
CUSTOMHOST = check_setting_str(CFG, 'General', 'customhost', 'localhost') CUSTOMHOST = check_setting_str(CFG, 'General', 'customhost', 'localhost')
@@ -982,10 +982,10 @@ def config_write():
new_config['Twitter']['twitter_prefix'] = TWITTER_PREFIX new_config['Twitter']['twitter_prefix'] = TWITTER_PREFIX
new_config['Songkick'] = {} new_config['Songkick'] = {}
new_config['Songkick']['songkick_enabled'] = SONGKICK_ENABLED new_config['Songkick']['songkick_enabled'] = int(SONGKICK_ENABLED)
new_config['Songkick']['songkick_apikey'] = SONGKICK_APIKEY new_config['Songkick']['songkick_apikey'] = SONGKICK_APIKEY
new_config['Songkick']['songkick_location'] = SONGKICK_LOCATION new_config['Songkick']['songkick_location'] = SONGKICK_LOCATION
new_config['Songkick']['songkick_filter_enabled'] = SONGKICK_FILTER_ENABLED new_config['Songkick']['songkick_filter_enabled'] = int(SONGKICK_FILTER_ENABLED)
new_config['Synoindex'] = {} new_config['Synoindex'] = {}
new_config['Synoindex']['synoindex_enabled'] = int(SYNOINDEX_ENABLED) new_config['Synoindex']['synoindex_enabled'] = int(SYNOINDEX_ENABLED)