addon.xml changes

pieh · Apr 4, 2011 · 411386b · 411386b
1 parent 76ef5c5
commit 411386b
Show file tree

Hide file tree

Showing 13 changed files with 122 additions and 35 deletions.
diff --git a/addons.xml b/addons.xml
@@ -23,7 +23,7 @@
        provider-name="pieh">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
-    <import addon="xbmcgui" />
+    <import addon="xbmcgui" version="2.11"/>
   </requires>
   <extension point="xbmc.python.library"
              library="default.py" />
@@ -35,7 +35,7 @@
 </addon>
 
 <addon id="script.module.rssengine" name="RSS Engine Addon"
-       version="1.0.2"
+       version="1.0.3"
        provider-name="pieh">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
@@ -52,9 +52,9 @@
        provider-name="pieh">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
-    <import addon="xbmcgui" />
-    <import addon="script.rss.editor" />
-    <import addon="plugin.video.youtube" />
+    <import addon="xbmcgui" version="2.11"/>
+    <import addon="script.rss.editor" version="1.6.1"/>
+    <import addon="plugin.video.youtube" version="2.0.3"/>
     <import addon="script.module.rssengine" version="1.0.1" />
   </requires>
   <extension point="xbmc.python.library"
@@ -68,13 +68,13 @@
 
 <addon id="script.rssclient-standalone"
        name="RSS Client"
-       version="1.0.3"
+       version="1.0.4"
        provider-name="pieh">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
-    <import addon="xbmcgui" />
-    <import addon="script.rss.editor" />
-    <import addon="plugin.video.youtube" />
+    <import addon="xbmcgui" version="2.11"/>
+    <import addon="script.rss.editor" version="1.6.1"/>
+    <import addon="plugin.video.youtube" version="2.0.3"/>
     <import addon="script.module.rssengine" version="1.0.2" />
   </requires>
   <extension point="xbmc.python.script"

diff --git a/addons.xml.md5 b/addons.xml.md5
@@ -1 +1 @@
-97a498e5a4c068911b8f154d7a403436
+b77d5edc94c0dda900cfc995f3948037
diff --git a/script.ExtraMusicInfo/BandsInTown.py b/script.ExtraMusicInfo/BandsInTown.py
@@ -1,13 +1,11 @@
+import xbmcaddon
 import simplejson as json
 from Utils import log, GetStringFromUrl
+import urllib
 
 bandsintown_apikey = 'xbmc_test'
 
-def GetEvents(id):
-    url = 'http://api.bandsintown.com/artists/mbid_%s/events?format=json&app_id=%s' % (id, bandsintown_apikey)
-    response = GetStringFromUrl(url)
-    results = json.loads(response)
-
+def HandleResult(results):
     events = []
 
     for event in results:
@@ -18,7 +16,57 @@ def GetEvents(id):
         region = venue['region']
         country = venue['country']
 
-        event = {'date': date, 'city': city, 'name':name, 'region':region, 'country':country  }
+        artists = event['artists']
+        my_arts = []
+        for art in artists:
+            art_tmp = {}
+            art_tmp['name'] = art['name']
+            art_tmp['mbid'] = art['mbid']
+            my_arts.append(art_tmp)
+
+        event = {'date': date, 'city': city, 'name':name, 'region':region, 'country':country, 'artists':my_arts  }
         events.append(event)
 
-    return events
+    return events
+
+
+def GetEvents(id):
+    url = 'http://api.bandsintown.com/artists/mbid_%s/events?format=json&app_id=%s' % (id, bandsintown_apikey)
+    response = GetStringFromUrl(url)
+    results = json.loads(response)
+
+    return HandleResult(results)
+
+def GetNearEvents():
+    settings = xbmcaddon.Addon(id='script.ExtraMusicInfo')
+    country = 'Poland' #settings.getSetting('country')
+    city = 'Wroclaw' #settings.getSetting('city')
+    url = 'http://api.bandsintown.com/events/search?format=json&location=use_geoip&app_id=%s' % (bandsintown_apikey)
+
+    log('request: %s' % url)
+
+    response = GetStringFromUrl(url)
+    results = json.loads(response)
+
+    return HandleResult(results)
+
+def GetNearEvents(Artists):
+    settings = xbmcaddon.Addon(id='script.ExtraMusicInfo')
+
+    ArtistStr = ''
+    for art in Artists:
+        if len(ArtistStr) > 0:
+             ArtistStr = ArtistStr + '&'
+
+        ArtistStr = ArtistStr + 'artists[]=' + urllib.quote(art['name'])     
+
+    Artists
+
+    url = 'http://api.bandsintown.com/events/search?%sformat=json&location=use_geoip&app_id=%s' % (ArtistStr, bandsintown_apikey)
+
+    log('request: %s' % url)
+
+    response = GetStringFromUrl(url)
+    results = json.loads(response)
+
+    return HandleResult(results)
diff --git a/script.ExtraMusicInfo/Utils.py b/script.ExtraMusicInfo/Utils.py
@@ -4,7 +4,8 @@ def log(msg):
     print ' >> script.ExtraMusicInfo: %s' % str(msg)
 
 def GetStringFromUrl(encurl):
-    f = urllib.urlopen(  encurl  )
+
+    f = urllib.urlopen(  encurl)
     doc = f.read()
     f.close()
 

diff --git a/script.ExtraMusicInfo/default.py b/script.ExtraMusicInfo/default.py
@@ -8,12 +8,13 @@
 import os
 
 from MusicBrainz import GetMusicBrainzId, SetMusicBrainzIDsForAllArtists
-from BandsInTown import GetEvents
+from BandsInTown import GetEvents, GetNearEvents
 from Lastfm import GetSimiliarById
 from Utils import log, GetStringFromUrl, GetValue, GetAttribute, Notify
+import xbmcaddon
 
 def GetXBMCArtists():
-    sqlQuery = "SELECT DISTINCT artist.strArtist, song.idArtist, song.strMusicBrainzArtistID FROM song JOIN artist ON artist.idArtist=song.idArtist"
+    sqlQuery = "SELECT DISTINCT artist.strArtist, song.idArtist, song.strMusicBrainzArtistID FROM song JOIN artist ON artist.idArtist=song.idArtist ORDER BY COUNT(song.idSong) DESC"
     results = xbmc.executehttpapi( "QueryMusicDatabase(%s)" % urllib.quote_plus( sqlQuery ) )
     records = re.findall( "<record>(.+?)</record>", results, re.DOTALL )
 
@@ -42,12 +43,13 @@ def GetThumbForArtistName(ArtistName):
 
     return thumb
 
+'''
 def GetArtists():
     retval = xbmc.executeJSONRPC('{ "jsonrpc": "2.0", "method": "AudioLibrary.GetArtists", "id": 1 }')
     results = json.loads(retval)
 
     return results['result']['artists']
-
+'''
 def GetSimiliarInLibrary(id):
     simi_artists = GetSimiliarById(id)
     if simi_artists == None:
@@ -90,7 +92,9 @@ def passDataToSkin(prefix, data):
 
     if data != None:
         wnd.setProperty('%s.Count' % prefix, str(len(data)))
+        log( "%s.Count = %s" % (prefix, str(len(data)) ) )
         for (count, result) in enumerate(data):
+            log( "%s.%i = %s" % (prefix, count + 1, str(result) ) )
             for (key,value) in result.iteritems():
                 wnd.setProperty('%s.%i.%s' % (prefix, count + 1, str(key)), unicode(value))
     else:
@@ -125,21 +129,55 @@ def passDataToSkin(prefix, data):
     elif param.startswith('window='):
         Window = int(arg[7:])
 
+    elif param.startswith('settuplocation'):
+        settings = xbmcaddon.Addon(id='script.ExtraMusicInfo')
+        country = settings.getSetting('country')
+        city = settings.getSetting('city')
+
+        log('stored country/city: %s/%s' % (country, city) )  
+
+        kb = xbmc.Keyboard('', 'Country:')
+        kb.doModal()
+        country = kb.getText()
+
+        kb = xbmc.Keyboard('', 'City:')
+        kb.doModal()
+        city = kb.getText()
+
+        log('country/city: %s/%s' % (country, city) )         
+
+        settings.setSetting('location_method', 'country_city')
+        settings.setSetting('country',country)
+        settings.setSetting('city',city)
+
+        log('done with settings')
+
     else:
         AdditionalParams.append(param)
-
+
+passDataToSkin('SimiliarArtists', None)
+passDataToSkin('MusicEvents', None)
+
 for info in infos:
     if info == 'similiarartistsinlibrary':
-        passDataToSkin('SimiliarArtists', None)
         artists = GetSimiliarInLibrary(Artist_mbid)
-        passDataToSkin('SimiliarArtists', artists)
+        passDataToSkin('SimiliarArtistsInLibrary', artists)
 
-    elif info == 'artistsevents':
-        passDataToSkin('MusicEvents', None)
+    elif info == 'artistevents':
         events = GetEvents(Artist_mbid)
-        passDataToSkin('MusicEvents', events)
+        passDataToSkin('ArtistEvents', events)
+
+    elif info == 'nearevents':
+        events = GetNearEvents()
+        passDataToSkin('NearEvents', events)        
+
+    elif info == 'topartistsnearevents':
+        artists = GetXBMCArtists()
+
+        events = GetNearEvents(artists[0:15])
+        passDataToSkin('TopArtistsNearEvents', events)
 
     elif info == 'updatexbmcdatabasewithartistmbidbg':
         SetMusicBrainzIDsForAllArtists(False, 'forceupdate' in AdditionalParams)
     elif info == 'updatexbmcdatabasewithartistmbid':
-        SetMusicBrainzIDsForAllArtists(True, 'forceupdate' in AdditionalParams)
+        SetMusicBrainzIDsForAllArtists(True, 'forceupdate' in AdditionalParams)
diff --git a/script.ExtraMusicInfo/script.ExtraMusicInfo-0.0.2.zip b/script.ExtraMusicInfo/script.ExtraMusicInfo-0.0.2.zip
diff --git a/script.ImageCacher/addon.xml b/script.ImageCacher/addon.xml
@@ -5,7 +5,7 @@
        provider-name="pieh">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
-    <import addon="xbmcgui" />
+    <import addon="xbmcgui" version="2.11"/>
   </requires>
   <extension point="xbmc.python.library"
              library="default.py" />

diff --git a/script.ImageCacher/script.ImageCacher-0.0.1.zip b/script.ImageCacher/script.ImageCacher-0.0.1.zip
diff --git a/script.module.rssengine/script.module.rssengine-1.0.3.zip b/script.module.rssengine/script.module.rssengine-1.0.3.zip
diff --git a/script.rssclient-standalone/addon.xml b/script.rssclient-standalone/addon.xml
@@ -5,9 +5,9 @@
        provider-name="pieh">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
-    <import addon="xbmcgui" />
-    <import addon="script.rss.editor" />
-    <import addon="plugin.video.youtube" />
+    <import addon="xbmcgui" version="2.11"/>
+    <import addon="script.rss.editor" version="1.6.1"/>
+    <import addon="plugin.video.youtube" version="2.0.3"/>
     <import addon="script.module.rssengine" version="1.0.2" />
   </requires>
   <extension point="xbmc.python.script"

diff --git a/script.rssclient-standalone/script.rssclient-standalone-1.0.4.zip b/script.rssclient-standalone/script.rssclient-standalone-1.0.4.zip
diff --git a/script.rssclient/addon.xml b/script.rssclient/addon.xml
@@ -5,9 +5,9 @@
        provider-name="pieh">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
-    <import addon="xbmcgui" />
-    <import addon="script.rss.editor" />
-    <import addon="plugin.video.youtube" />
+    <import addon="xbmcgui" version="2.11"/>
+    <import addon="script.rss.editor" version="1.6.1"/>
+    <import addon="plugin.video.youtube" version="2.0.3"/>
     <import addon="script.module.rssengine" version="1.0.1" />
   </requires>
   <extension point="xbmc.python.library"

diff --git a/script.rssclient/script.rssclient-1.0.3.zip b/script.rssclient/script.rssclient-1.0.3.zip