Merge lp:~sil/lolocopter/save-in-couch into lp:lolocopter

[Stuart Langridge]

[Stuart Langridge (sil)]

Make the lolocopter part of the mighty desktopcouch empire

[Jono Bacon (jonobacon)]

Looks great.

review: Approve

=== modified file 'bin/lolocopter'
--- bin/lolocopter	2009-11-14 18:50:55 +0000
+++ bin/lolocopter	2009-11-15 21:55:18 +0000
@@ -19,6 +19,7 @@
 import os
 import gtk
 import gst
+import xdg.BaseDirectory
 
 # Check if we are working in the source tree or from the installed 
 # package and mangle the python path accordingly
@@ -35,6 +36,8 @@
 from lolocopter.lolocopterconfig import getdatapath
 from lolocopter.lolocopter_server import CopterDiscoverer, LolocopterServer
 
+from desktopcouch.records.server import CouchDatabase
+
 gtk.gdk.threads_init()
 
 class LolocopterWindow(gtk.Window):
@@ -68,19 +71,60 @@
 
         #code for other initialization actions should be added here
         self.pipeline = gst.Pipeline("mypipeline")
-        self.builder.get_object("play_trombone").connect("clicked",self.playFile,"/home/jono/Desktop/sadtrombone.mp3")
-        self.builder.get_object("play_keyboardcat").connect("clicked",self.playFile,"/home/jono/Desktop/keyboardcat.mp3")
         
         # Start the CopterDiscoverer
         disc = CopterDiscoverer(self.newLolocopterAppears, None)
         disc.start()
 
-        # Start a background server (remove this later)
-        srv = LolocopterServer(1, "foo", "bar", None)
-        srv.start_server()
+        self.mylol_vbox = self.builder.get_object("mylols")
+        self.otherlol_vbox = self.builder.get_object("otherlols")
+        
+        self.loadMyLOLs()
+    
+    def loadMyLOLs(self):
+        # query couch
+        db = CouchDatabase("lolocopter", create=True)
+        for record in db.get_records(create_view=True,
+            record_type="http://launchpad.net/lolocopter/saved_sound"):
+            self.loadOneMyLOL(record.value["filename"], record.value["label"])
+    
+    def loadOneMyLOL(self, filename, name):
+        print "loading", filename, name
+        hbox = gtk.HBox()
+        lbl = gtk.Label(name)
+        playbtn = gtk.Button(stock=gtk.STOCK_MEDIA_PLAY)
+        playbtn.connect("clicked", self.playFile, 
+            os.path.join(
+                xdg.BaseDirectory.save_data_path('lolocopter'), 
+                "sounds", 
+                filename))
+        sharebtn = gtk.ToggleButton(label="Share")
+        sharebtn.connect("toggled", self.shareTheLOL, filename, name)
+        hbox.pack_start(lbl)
+        hbox.pack_start(playbtn)
+        hbox.pack_start(sharebtn)
+        self.mylol_vbox.pack_end(hbox)
+        hbox.show_all()
     
     def newLolocopterAppears(self, lolname, personname, host, port):
         print "As if by magic, a lolocopter appears!", lolname, personname, host, port
+        description = "%s, provided by %s" % (lolname, personname)
+        hbox = gtk.HBox()
+        lbl = gtk.Label("<big>%s</big> by %s" % (lolname, personname))
+        joinbtn = gtk.Button(label="Join the Denial of LOL")
+        joinbtn.connect("clicked", self.joinTheLOL, host, port)
+        hbox.pack_start(lbl)
+        hbox.pack_start(joinbtn)
+        self.otherlol_vbox.pack_end(hbox)
+        hbox.show_all()
+        
+    def joinTheLOL(self, host, port):
+        print "joining lol on host/port", host, port
+    
+    def shareTheLOL(self, widget, filename, name):
+        srv = LolocopterServer(10000, name, "Someone's Computer", None)
+        srv.start_server()
+        
 
     def about(self, widget, data=None):
         """about - display the about box for lolocopter """
@@ -90,7 +134,6 @@
 
     def addSounds(self, widget, data=None):
         """add sounds to the lolocopter"""
-        print "Add Sounds dialog box"
         addsound = AddSoundLolocopterDialog.NewAddSoundLolocopterDialog()
         response = addsound.run()
         if response == gtk.RESPONSE_OK:

=== modified file 'data/ui/LolocopterWindow.ui'
--- data/ui/LolocopterWindow.ui	2009-11-14 17:18:08 +0000
+++ data/ui/LolocopterWindow.ui	2009-11-15 21:55:18 +0000
@@ -75,26 +75,68 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="play_trombone">
-            <property name="label" translatable="yes">Trombone</property>
+          <object class="GtkExpander" id="expander1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="expanded">True</property>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkVBox" id="mylols">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">My LOLs</property>
+              </object>
+            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="play_keyboardcat">
-            <property name="label" translatable="yes">Keyboard Cat</property>
+          <object class="GtkExpander" id="expander2">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="expanded">True</property>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkVBox" id="otherlols">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">LOLs from around the network</property>
+              </object>
+            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="position">2</property>
           </packing>
         </child>

=== modified file 'lolocopter/AddSoundLolocopterDialog.py'
--- lolocopter/AddSoundLolocopterDialog.py	2009-11-14 19:22:56 +0000
+++ lolocopter/AddSoundLolocopterDialog.py	2009-11-15 21:55:18 +0000
@@ -21,6 +21,8 @@
 import shutil
 
 from lolocopter.lolocopterconfig import getdatapath
+from desktopcouch.records.server import CouchDatabase
+from desktopcouch.records.record import Record
 
 class AddSoundLolocopterDialog(gtk.Dialog):
     __gtype_name__ = "AddSoundLolocopterDialog"
@@ -63,6 +65,7 @@
         """ok - The user has elected to save the changes.
         Called before the dialog returns gtk.RESONSE_OK from run().
         Copies the sound over to the 'lolocopter/sounds' folder
+        and adds it to the database
         """
 
         # copy the file to the sounds folder
@@ -71,7 +74,13 @@
         # this is the label of the sound
         self.lol_name = self.lolname.get_text()
         
-        
+        # Add sound to the database
+        db = CouchDatabase("lolocopter", create=True)
+        record = Record({
+            "label": self.lol_name,
+            "filename": os.path.split(self.lolfile.get_filename())[1]
+        }, record_type="http://launchpad.net/lolocopter/saved_sound") # FIXME
+        rid = db.put_record(record)
 
     def cancel(self, widget, data=None):
         """cancel - The user has elected cancel changes.