First attempt at dharma version.

[clinton/xbmc-groove.git] / default.py

diff --git a/default.py b/default.py
index cb5aa16..42fad28 100644 (file)
--- a/default.py
+++ b/default.py
@@ -1,13 +1,5 @@
-import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os, time, pprint, shutil
+import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmc, sys, os, time, pprint, shutil, xbmcaddon
 
-# plugin constants
-__plugin__ = "Grooveshark"
-__author__ = "Stephen Denham"
-__url__ = ""
-__svn_url__ = ""
-__version__ = "0.0.1"
-__svn_revision__ = ""
-__XBMC_Revision__ = ""
 
 MODE_SEARCH_SONGS = 1
 MODE_SEARCH_ALBUMS = 2
@@ -35,7 +27,7 @@ baseDir = os.getcwd()
 resDir = xbmc.translatePath(os.path.join(baseDir, 'resources'))
 libDir = xbmc.translatePath(os.path.join(resDir,  'lib'))
 imgDir = xbmc.translatePath(os.path.join(resDir,  'img'))
-thumbDir = os.path.join('special://masterprofile/plugin_data/music', os.path.join(os.path.basename(os.getcwd()), 'thumb'))
+thumbDir = os.path.join('special://masterprofile/addon_data/', os.path.join(os.path.basename(os.getcwd()), 'thumb'))
 
 sys.path.append (libDir)
 from GrooveAPI import *
@@ -68,6 +60,8 @@ class GrovesharkPlayer(xbmc.Player):
         self.function(2)
 
 class Groveshark:
+    
+    settings = xbmcaddon.Addon(id='plugin.audio.groove')
 
     albumImg = xbmc.translatePath(os.path.join(imgDir,  'album.png'))
     artistImg = xbmc.translatePath(os.path.join(imgDir,  'artist.png'))
@@ -78,9 +72,9 @@ class Groveshark:
     defImg = xbmc.translatePath(os.path.join(imgDir,  'default.tbn'))
     fanImg = xbmc.translatePath(os.path.join(baseDir, 'fanart.jpg'))
 
-    songsearchlimit = xbmcplugin.getSetting('songsearchlimit')
-    albumsearchlimit = xbmcplugin.getSetting('albumsearchlimit')
-    artistsearchlimit = xbmcplugin.getSetting('artistsearchlimit')
+    songsearchlimit = settings.getSetting('songsearchlimit')
+    albumsearchlimit = settings.getSetting('albumsearchlimit')
+    artistsearchlimit = settings.getSetting('artistsearchlimit')
 
 
     def __init__( self ):
@@ -107,7 +101,7 @@ class Groveshark:
     def searchSongs(self):
         query = self._get_keyboard(default="", heading="Search songs")
         if (query): 
-            songs = groovesharkApi.searchSongs(query, limit = xbmcplugin.getSetting('songsearchlimit'))
+            songs = groovesharkApi.searchSongs(query, limit = self.settings.getSetting('songsearchlimit'))
             if (len(songs) > 0):
                 self._add_songs_directory(songs)
             else:
@@ -118,7 +112,7 @@ class Groveshark:
     def searchAlbums(self):
         query = self._get_keyboard(default="", heading="Search albums")
         if (query): 
-            albums = groovesharkApi.searchAlbums(query, limit = xbmcplugin.getSetting('albumsearchlimit'))
+            albums = groovesharkApi.searchAlbums(query, limit = self.settings.getSetting('albumsearchlimit'))
             if (len(albums) > 0):
                 self._add_albums_directory(albums)
             else:
@@ -129,7 +123,7 @@ class Groveshark:
     def searchArtists(self):
         query = self._get_keyboard(default="", heading="Search artists")
         if (query): 
-            artists = groovesharkApi.searchArtists(query, limit = xbmcplugin.getSetting('artistsearchlimit'))
+            artists = groovesharkApi.searchArtists(query, limit = self.settings.getSetting('artistsearchlimit'))
             if (len(artists) > 0):
                 self._add_artists_directory(artists)
             else:
@@ -149,7 +143,7 @@ class Groveshark:
                 self.categories()
     
     def popular(self):
-        popular = groovesharkApi.popularGetSongs(limit = xbmcplugin.getSetting('songsearchlimit'))
+        popular = groovesharkApi.popularGetSongs(limit = self.settings.getSetting('songsearchlimit'))
         if (len(popular) > 0):
             self._add_songs_directory(popular)
         else:
@@ -223,17 +217,17 @@ class Groveshark:
             dialog.ok('Grooveshark', 'You must be logged in', 'to update radio artists.')
     
     def album(self,albumid):
-        album = groovesharkApi.albumGetSongs(albumId = albumid, limit = xbmcplugin.getSetting('songsearchlimit'))
+        album = groovesharkApi.albumGetSongs(albumId = albumid, limit = self.settings.getSetting('songsearchlimit'))
         self._add_songs_directory(album)
     
     def artist(self, artistid):
-        albums = groovesharkApi.artistGetAlbums(artistId = artistid, limit = xbmcplugin.getSetting('albumsearchlimit'))
+        albums = groovesharkApi.artistGetAlbums(artistId = artistid, limit = self.settings.getSetting('albumsearchlimit'))
         self._add_albums_directory(albums)
     
     def playlist(self, playlistid):
         userid = self._get_login()
         if (userid != 0):
-            songs = groovesharkApi.playlistGetSongs(playlistId = playlistid, limit = xbmcplugin.getSetting('songsearchlimit'))
+            songs = groovesharkApi.playlistGetSongs(playlistId = playlistid, limit = self.settings.getSetting('songsearchlimit'))
             self._add_songs_directory(songs)
         else:
             dialog = xbmcgui.Dialog()
@@ -242,13 +236,14 @@ class Groveshark:
     def playSong(self, item):
         url = item.getProperty('url')
         xbmc.log("Playing: " + url)
-        xbmc.Player( xbmc.PLAYER_CORE_MPLAYER ).play(url, item)
+        xbmc.Player( xbmc.PLAYER_CORE_PAPLAYER ).play(url, item)
     
     def playNext(self):
         item = self._get_song_item(groovesharkApi.radioNextSong()[0])
         url = item.getProperty('url')
         self.player = GrovesharkPlayer(xbmc.PLAYER_CORE_PAPLAYER, function=self.onPlayBackChanged)
         self.player.play(url, item)
+        self.onPlayBackChanged(2)
 
     def songItem(self, id, name, album, artist, duration, thumb, image):
         url = groovesharkApi.getStreamURL(id)
@@ -275,8 +270,8 @@ class Groveshark:
             return ''
     
     def _get_login(self):
-        username = xbmcplugin.getSetting('username')
-        password = xbmcplugin.getSetting('password')
+        username = self.settings.getSetting('username')
+        password = self.settings.getSetting('password')
         if (username == "" or password == ""):
             dialog = xbmcgui.Dialog()
             dialog.ok('Grooveshark', 'Unable to login.', 'Check username and password in settings.')
@@ -409,16 +404,18 @@ class Groveshark:
         return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True)
 
     def onPlayBackChanged(self, change):
-        print "onPlayBackChanged " + str(change)
+        xbmc.log("onPlayBackChanged " + str(change))
         if change == 0:
             groovesharkApi.radioEnabled = False
-            self.musicplaylist.clear()
         if change == 1 and groovesharkApi.radioTurnedOn() == True:
-            print "playnext"
+            xbmc.log("playnext")
             self.player.playNext()
-        if change == 1 and groovesharkApi.radioTurnedOn() == False:
-            print "clear playlist"
-            self.musicplaylist.clear()
+        if change == 2:
+            xbmc.log("playback started")
+            xbmc.sleep(7500)
+            while self.player.isPlaying() or xbmc.Player(xbmc.PLAYER_CORE_PAPLAYER).isPlaying():
+                xbmc.sleep(1000)
+            xbmc.log("stopped playing")
 
    
 def get_params():