Changeset 18

Timestamp:

07/03/07 19:25:58 (5 years ago)

Author:

dlefevre

Message:

Added:
- add song to playlist
- now playins view to control the player

Updated:
- audio queries
- opcode updated
- language dictionary

Location:

mymrc/trunk/mymrc/src

Files:

• db/audioqueries.py (modified) (3 diffs)
• db/dbdriver.py (modified) (1 diff)
• lang.conf (modified) (1 diff)
• mobileclient/appuifw.py (modified) (2 diffs)
• mobileclient/clientengine.py (modified) (24 diffs)
• mobileclient/opcode.py (modified) (2 diffs)
• mymrc.conf (modified) (1 diff)
• mymrc.db (deleted)

mymrc/trunk/mymrc/src/db/audioqueries.py

@@ -115 +115 @@
     
     ## Get all available playlists.
-    def playlists(self):
-        query="""SELECT name FROM audio_playlist ORDER BY name;"""
+    def playlists(self, raw=False):
+        if raw:
+            query="""SELECT * FROM audio_playlist ORDER BY name;"""
+        else:
+            query="""SELECT name FROM audio_playlist ORDER BY name;"""
         return self._iDB.execute(query)
     
@@ -122 +125 @@
     #  ID, determined after the playlist was selected).
     #  NOTE: this is not tested, just a guess.
-    def playlistSongs(self):
+    def playlistSongs(self, aPlaylist):
         query="""SELECT audio_song.id AS id,
        audio_song.path AS path,
@@ -136 +139 @@
       audio_song.genre_id = audio_genre.id AND
       audio_song.id = audio_playlist_data.song_id AND
-      audio_playlist_data.playlist_id = <ID of the selected playlist>
+      audio_playlist_data.playlist_id = (SELECT id FROM audio_playlist WHERE name='%s')
 ORDER BY audio_artist.name, audio_album.title, audio_song.title;"""
-        return self._iDB.execute(query)
+        return self._iDB.execute(query%(aPlaylist))
     
     def songById(self, aId):
         query = """ SELECT path FROM audio_song WHERE id=%s""" %(aId)
         return self._iDB.execute(query).fetchall()
+    
+    
+    def addSongToPlaylist(self, aPlaylistId, aSongId):
+        query = """ INSERT INTO audio_playlist_data(playlist_id, song_id) 
+values('%s', '%s')"""
+        return self._iDB.execute(query%(aPlaylistId, aSongId))
+
 
     

mymrc/trunk/mymrc/src/db/dbdriver.py

@@ -181 +181 @@
 INSERT INTO audio_genre(id, name) VALUES(124, 'Euro-House');
 INSERT INTO audio_genre(id, name) VALUES(125, 'Dance Hall');
+
+INSERT INTO audio_playlist(name) values ('Favourites')
 """
 

mymrc/trunk/mymrc/src/lang.conf

@@ -28 +28 @@
 AllVideos = All videos
 AllPlaylists = All playlists
-Play = Play        
+PlayingNow = Playing Now
+Play = Play     
+PlayPause = Play/Pause
+Stop = Stop  
+Forward = Forward 
+Backward = Backward
+Next = Next
+Previous = Previous
+VolumeUp = Volume up
+VolumeDown = Volume down
+FullScreen = Full screen
+ToogleControls = Toogle controls
+Close = Close
         
-        

mymrc/trunk/mymrc/src/mobileclient/appuifw.py

@@ -26 +26 @@
     
     
-    def addString(self, aLabel, aText):
+    def addString(self, aLabel=None, aText=None):
         self._iForm += """    <string label="%s" text="%s"/>\n""" % (aLabel, aText)
     
@@ -44 +44 @@
         
     
-    def addCommand(self):
-        self._iForm += """    <command label="text" opcode="opcode"/>\n"""
+    def addCommand(self, aType, aLabel, aOpcode):
+        self._iForm += """    <command type="%s" label="%s" opcode="%s"/>\n"""\
+            % (aType, aLabel, aOpcode)
     
     
     def getForm(self):
-        self._iForm += """</form>"""
-        return self._iForm
+        #self._iForm += """</form>"""
+        return self._iForm + """</form>"""
     
         

mymrc/trunk/mymrc/src/mobileclient/clientengine.py

@@ -8 +8 @@
 from db.audioqueries import AudioQueries
 from controllers.audiocontroller import AudioController
+from mobileclient.opcode import OPCode
+from mobileclient.opcode import OPCode
 
 
@@ -68 +70 @@
         lb.addLabel(Lang().label('AllSongs'))
         actions.append( self.allSongs )
+        id_list.append(0)
 
         lb.addLabel(Lang().label('Playlists'))
         actions.append( self.playlists )
+        id_list.append(1)
 
         lb.addLabel(Lang().label('Artists'))
         actions.append( self.artists )
+        id_list.append(2)
         
         lb.addLabel(Lang().label('Albums'))
         actions.append( self.albums )
+        id_list.append(3)
         
         lb.addLabel(Lang().label('Genres'))
         actions.append( self.genres )
+        id_list.append(4)
         
         # Feed options menu
@@ -110 +117 @@
         # Feed options menu
         lb.addCommand('options', Lang().label('Play'), OPCode()['PLAY'])
-        lb.addCommand('options', Lang().label('AddToPlaylist'), OPCode()['DISCONNECT'])
+        lb.addCommand('options', Lang().label('AddToPlaylist'), OPCode()['PLADDSONG'])
         lb.addCommand('options', Lang().label('NowPlaying'), OPCode()['NOWPLAYING'])
         lb.addCommand('options', Lang().label('Back'), OPCode()['BACK'])
@@ -134 +141 @@
             lb.addLabel(artist)
             actions.append(lambda:self.artistAlbums(artist))
+            id_list.append(artist)
         
         # Feed options menu
@@ -166 +174 @@
             lb.addLabel(album)
             actions.append(lambda:self.artistAlbumSongs(album))
+            id_list.append(album)
                         
         # Feed options menu
@@ -192 +201 @@
         for song in resultset.fetchall():
             lb.addLabel(song[3])
+            id_list.append(song[0])
             
         # Feed options menu
@@ -218 +228 @@
         for song in resultset.fetchall():
             lb.addLabel(song[3])
+            id_list.append(song[0])
             
         # Feed options menu
@@ -245 +256 @@
             lb.addLabel(album)
             actions.append(lambda:self.albumSongs(album))
+            id_list.append(album)
             
         # Feed options menu
@@ -272 +284 @@
             lb.addLabel(song[3])
             actions.append(lambda:None)
+            id_list.append(song[0])
             
         # Feed options menu
@@ -283 +296 @@
         self._iActionStack.append(actions)
         self._iViewStack.append(lb.getList())
+        self._iListStack.append(id_list)
         
     
@@ -298 +312 @@
             lb.addLabel(genre)
             actions.append(lambda:self.genreSongs(genre))
+            id_list.append(genre)
         
         # Feed options menu
@@ -324 +339 @@
         for song in resultset.fetchall():
             lb.addLabel(song[3])
+            id_list.append(song[0])
             
         # Feed options menu
@@ -350 +366 @@
         for playlist in resultset.fetchall():
             lb.addLabel(playlist)
+            id_list.append(playlist)
+            actions.append(lambda:self.playlistSongs(playlist))
         
         # Feed options menu
@@ -363 +381 @@
     
     
-    def playlistSongs(self):
+    def playlistSongs(self, aPlaylist):
         print "Audio playlist"
-        playlistName=""
-        lb = ListBox(playlistName)
-        actions = []
-        id_list = []
-        
-        db = AudioQueries()
-        resultset = db.genreSongs( playlistName )
+        lb = ListBox(aPlaylist)
+        actions = []
+        id_list = []
+        
+        db = AudioQueries()
+        resultset = db.playlistSongs(aPlaylist)
         
         # feed list
         for song in resultset.fetchall():
             lb.addLabel(song[3])
+            id_list.append(song[0])
             
         # Feed options menu
@@ -438 +456 @@
         lb.addCommand('options', Lang().label('Select'), OPCode()['SELECT'])
         lb.addCommand('options', Lang().label('Disconnect'), OPCode()['DISCONNECT'])
-        lb.addCommand('options', Lang().label('Settings'), OPCode()['SETTINGS'])
+        # lb.addCommand('options', Lang().label('Settings'), OPCode()['SETTINGS'])
         lb.addCommand('options', Lang().label('About'), OPCode()['ABOUT'])
         lb.addCommand('options', Lang().label('Exit'), OPCode()['EXIT'])
@@ -445 +463 @@
         self._iViewStack.append(lb.getList())
         self._iActionStack.append(action)
+   
+    
+    def nowPlaying(self):
+        lb = ListBox(Lang().label('NowPlaying'))
+        actions = []
+        id_list = []
+        lb.addLabel(Lang().label('PlayPause'))
+        actions.append(lambda:AudioController().pause())
+        
+        lb.addLabel(Lang().label('Stop'))
+        actions.append(lambda:AudioController().stop())
+        
+        lb.addLabel(Lang().label('Forward'))
+        actions.append(lambda:AudioController().forward())
+        
+        lb.addLabel(Lang().label('Backward'))
+        actions.append(lambda:AudioController().backward())
+        
+        lb.addLabel(Lang().label('Next'))
+        actions.append(lambda:AudioController().next())
+        
+        lb.addLabel(Lang().label('Previous'))
+        actions.append(lambda:AudioController().previous())
+        
+        lb.addLabel(Lang().label('VolumeUp'))
+        actions.append(lambda:AudioController().volume_up())
+        
+        lb.addLabel(Lang().label('VolumeDown'))
+        actions.append(lambda:AudioController().volume_down())
+        
+        lb.addLabel(Lang().label('FullScreen'))
+        actions.append(lambda:AudioController().fullscreen())
+        
+        lb.addLabel(Lang().label('ToogleControls'))
+        actions.append(lambda:AudioController().hide_show_controls())
+
+        lb.addLabel(Lang().label('Close'))
+        actions.append(lambda:AudioController().close())
+        
+        lb.addCommand('options', Lang().label('Select'), OPCode()['PLAYER']) 
+        lb.addCommand('options', Lang().label('Back'), OPCode()['BACK'])
+        lb.addCommand('back', Lang().label('Back'), OPCode()['BACK'])
+        lb.addCommand('select', Lang().label('Select'), OPCode()['PLAYER']) 
+        self._iViewStack.append(lb.getList())
+        self._iActionStack.append(actions)
+        self._iListStack.append(id_list)
+        
+    def chosePlaylist(self):
+        print "Choose playlist" 
+        lb = ListBox(Lang().label('Playlists'))
+        actions = []
+        id_list = []
+        
+        db = AudioQueries()
+        rs = db.playlists(True)
+        
+        for playlist in rs.fetchall():
+            print "playlist: ", playlist[1]
+            lb.addLabel(playlist[1])
+            actions.append(lambda:None)
+            id_list.append(playlist[0])
+            
+        lb.addCommand('options', Lang().label('Select'), OPCode()['PLID'])
+        lb.addCommand('options', Lang().label('Back'), OPCode()['BACK'])
+        lb.addCommand('back', Lang().label('Cancel'), OPCode()['BACK'])
+        lb.addCommand('select', Lang().label('Select'), OPCode()['PLID'])
+        
+        print lb.getList()
+        
+        self._iViewStack.append(lb.getList())
+        self._iActionStack.append(actions)
+        self._iListStack.append(id_list)
+        
+        
     
     def _audio(self):
@@ -461 +553 @@
     def _TV(self):
         print "TV"
+        
+    
         
     def getResultset(self):
@@ -478 +572 @@
             self._iViewStack.pop()
             self._iActionStack.pop()
+            self._iListStack.pop()
         print len(self._iViewStack)
         return self._iViewStack[-1]
@@ -486 +581 @@
         self.send = aSendCb
         DBDriver( '/home/dlefevre/workspace/mymrc/src' )
+        self._iSongId = None
         #self.handle_event(PacketBuilder().build('0000', ''))
     
-    def handle_event(self, aEvent):
-        print "Event received: ", aEvent
-        opcode, length, value = PacketParser().parse(aEvent)
+    def handle_event(self, opcode):
+        print "Event received: ", opcode
+        opcode, length, value = PacketParser().parse(opcode)
         
         ## UI
@@ -499 +595 @@
         elif opcode == OPCode()['SELECT']:
             actions = self._iViewEngine.getActions()
+            print 'value: ', value
             actions[int(value)]()
             retVal = self._iViewEngine.getView()
@@ -506 +603 @@
             retVal = self._iViewEngine.back()
             self.send(PacketBuilder().build(OPCode()['PARSELS'], retVal))
-        
-        
+            
+        elif opcode == OPCode()['NOWPLAYING']:
+            self._iViewEngine.nowPlaying()
+            retVal = self._iViewEngine.getView()
+            self.send(PacketBuilder().build(OPCode()['PARSELS'], retVal))
+
+        elif opcode == OPCode()['PLAYER']:
+            action = self._iViewEngine.getActions()
+            action[int(value)]()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+            
+        ## Playlist
+        elif opcode == OPCode()['PLADDSONG']:
+            self._iSongId = int(self._iViewEngine.getStack()[int(value)])
+            self._iViewEngine.chosePlaylist()
+            retVal = self._iViewEngine.getView()
+            self.send(PacketBuilder().build(OPCode()['PARSELS'], retVal))
+            
+        elif opcode == OPCode()['PLID']:
+            db = AudioQueries()
+            id = self._iViewEngine.getStack()
+            rs = db.addSongToPlaylist(id[int(value)], self._iSongId)
+            retVal = self._iViewEngine.back()
+            self.send(PacketBuilder().build(OPCode()['PARSELS'], retVal))
+
+            
+            
+            
+            
+        
+        ## audio player controls
         # controller
         elif opcode == OPCode()['PLAY']:
@@ -518 +644 @@
             except:
                 pass
+        elif opcode ==  OPCode()["STOP"]:
+            AudioController().stop()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["PAUSE"]:
+            AudioController().pause()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["NEXT"]:
+            AudioController().next()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["CLOSE"]:
+            AudioController().close()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+                    
+        elif opcode ==  OPCode()["PREVIOUS"]:
+            AudioController().previous()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["FORWARD"]:
+            AudioController().forward()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["BACKWARD"]:
+            AudioController().backward()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["VINC"]:
+            AudioController().volume_up()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["VDEC"]:
+            AudioController().volume_down()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["FULL"]:
+            AudioController().fullscreen()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+        
+        elif opcode ==  OPCode()["TOGG"]:
+            AudioController().hide_show_controls()
+            self.send(PacketBuilder().build(OPCode()['DUMMY'], ''))
+            
+        
+        
+
         
         
@@ -563 +736 @@
     #print AudioView().playlistSongs()
     
-    query = """ INSERT INTO song (title, path) values ('Gin Blossoms - Allison Road', '/home/storage/Music/Gin Blossoms - Allison Road.mp3')"""
-    query = """SELECT * FROM song"""
+    query = """SELECT * FROM audio_playlist_data"""
     rs = DBDriver().execute(query)
     print rs.fetchall()
-
-    
+    
+    query = """SELECT * FROM audio_playlist"""
+    rs = DBDriver().execute(query)
+    print rs.fetchall()
+
+    query = """SELECT * FROM audio_song"""
+    rs = DBDriver().execute(query)
+    print rs.fetchall()
+
+
+    db = AudioQueries()
+    rs = db.playlists()
+    print rs.fetchall()
+    
+   
     def send(aData):
         print aData
@@ -576 +761 @@
     while True:
         entry = raw_input('>>>').strip()
-        if entry == 'hello':
+        if entry == 'h':
             engine.handle_event(PacketBuilder().build(OPCode()['HELLO'],''))
-        elif entry == 'select':
+        elif entry == 's':
             entry = raw_input('Index >>>').strip()
             engine.handle_event(PacketBuilder().build(OPCode()['SELECT'], entry) )
-        elif entry == 'back':
+        elif entry == 'o':
+            entry = raw_input('Index >>>').strip()
+            engine.handle_event(PacketBuilder().build(OPCode()['NOWPLAYING'], '')) 
+        elif entry == 'b':
             engine.handle_event(OPCode()['BACK'])
+        
+        
+        
+        
         elif entry == 'q':
             break

mymrc/trunk/mymrc/src/mobileclient/opcode.py

@@ -18 +18 @@
         self['PAUSE']='0103'
         self['NEXT']='0104'
-        self['LAST']='0105'
-        self['FORW']='0106'
-        self['BACKW']='0107'
+        self['PREVIOUS']='0105'
+        self['FORWARD']='0106'
+        self['BACKWARD']='0107'
         self['VINC']='0108'
-        self['VDEV']='0109'
+        self['VDEC']='0109'
         self['MUTE']='0110'
         self['FULL']='0111'
         self['TOGG']='0112'
-        self['ADDPL']='0113'
+        self['CLOSE'] = '0113'
+        self['PLAYER'] = '0114'
         
         # internal client event'
@@ -37 +38 @@
         # Playlist events
         self['PLNEW']='0200'
-        self['PLADDSONG']='0201'
-        self['PLADDARTIST'] = '0202'
-        self['PLADDGENRE'] = '0203'
-        self['PLADDALBUM'] = '0204'
+        self['PLID'] = '0201'
+        self['PLADDSONG']='0202'
+        self['PLADDARTIST'] = '0203'
+        self['PLADDGENRE'] = '0204'
+        self['PLADDALBUM'] = '0205'
         
-        self['PLREMOVESONG'] = '0205'
+        self['PLREMOVESONG'] = '020'
+        
+        self['DUMMY'] = '9999'

mymrc/trunk/mymrc/src/mymrc.conf

@@ -1 +1 @@
 [inet]
 #interface=eth0
-port=1234
+port=1235
 host=11.2.1.4
 maxclient=5