immsview: comparison immsview

equal deleted inserted replaced

-:9aa8b1c884e7
+:412e93decb7c
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
-_immsview_version = "$Id: immsview 1690 2004-02-02 06:54:09Z fabien $"
+_immsview_version = "$Id: immsview 1691 2004-02-02 15:42:43Z fabien $"
 # $Log$
+# Revision 1.10  2004/02/02 15:42:43  fabien
+# OK, reset current after changing song manually... however, I most sleep for almost a second to be sure to catch it.
+#
 # Revision 1.9  2004/02/02 06:54:09  fabien
 # Add cvs log since I don't maintain a changelog currently.
 #
 # Revision 1.8  2004/02/02 06:44:10  fabien
 # All functions are now implemented (with a somewhat "cleaner" interface.
 # Revision 1.3  2004/02/01 15:59:04  fabien
 # Adding xmms selection and last display.
 # Revision 1.2  2004/02/01 04:40:41  fabien
 # add versioning.
 # Revision 1.1  2004/02/01 03:05:25  fabien
-# Première version de immsview.
+# Premiere version de immsview.
 # The aim of immsview is to become a better playlist editor than the
 # normal
 # TODO:
 class IMMSDb:
 _dbname = os.environ['HOME'] + '/.imms/imms.db'
 # _dbname = os.environ['HOME'] + '/.imms/imms.backup.db'
 def __init__(self):
-self.cx = sqlite.connect(IMMSDb._dbname,
+self.cx = sqlite.connect(IMMSDb._dbname, autocommit = 1,
-encoding = ('utf-8', 'replace'))
+timeout = 2, encoding = ('utf-8', 'replace'))
 def commit(self):
-self.cx.commit()
+# self.cx.commit()
+pass
 def _get_ratings(self, min = 0, max = 250):
 cu = self.cx.cursor()
 cu.execute('''SELECT Rating.uid, Rating.rating
 FROM Rating
 WHERE Rating.rating >= %d
 self.commit()
 results = []
 for tune in res:
 try:
 tmp = {'rating' : int(tune[1]),
-'path' : tune[2].decode('utf8', 'replace'),
+'path' : tune[2].decode('utf-8', 'replace'),
 'last' : int(tune[3])}
 results.append(tmp)
 except UnicodeDecodeError:
 print tune[2]
 return results
 if giter:
 return model.get_value(giter, IMMSStore.COL_PATH)
 return None
 class IMMSToolbar(gtk.Toolbar):
-	def __init__(self, iview, xmms):
+# _IMMSPLOT_COMMAND = 'immsplot &'
-gtk.Toolbar.__init__(self)
+_IMMSPLOT_COMMAND = '/home/fabien/bin/immsplot &'
-self.iview = iview
+_SLEEP_TIME = 1
-self.xmms = xmms
+def __init__(self, iview, xmms):
-self.create_widgets()
+gtk.Toolbar.__init__(self)
-	def create_widgets(self):
+self.iview = iview
-		self.append_item(_('Refresh'), _('Refresh list'),
+self.xmms = xmms
-None, None, self.do_refresh)
+self.create_widgets()
-self.append_item(_('Plot'), _('Show graph of rates'),
+def create_widgets(self):
-None, None, self.plot)
+self.append_item(_('Refresh'), _('Refresh list'),
-self.append_item(_('Current'), _('Get current song'),
+None, None, self.do_refresh)
-None, None, self.do_get_current)
+self.append_item(_('Plot'), _('Show graph of rates'),
-self.append_item(_('Play'), _('Play selection'),
+None, None, self.plot)
-None, None, self.do_play)
+self.append_item(_('Current'), _('Get current song'),
-	def plot(self, data):
+None, None, self.do_get_current)
-os.system('/home/fabien/bin/immsplot &')
+self.append_item(_('Previous'), _('Play previous song'),
-	def do_refresh(self, data):
+None, None, self.do_play_prev)
+self.append_item(_('Play'), _('Play selection'),
+None, None, self.do_play)
+self.append_item(_('Next'), _('Play next song'),
+None, None, self.do_play_next)
+def plot(self, dummy):
+os.system(self._IMMSPLOT_COMMAND)
+def do_refresh(self, dummy):
 self.iview.get_model().refresh()
-def do_get_current(self, data):
+def do_get_current(self, dummy):
 song = self.xmms.get_current_file()
 self.iview.set_current_song(song)
-def do_play(self, data):
+def do_play(self, dummy):
 fn = self.iview.get_file_selected()
 if fn:
 self.xmms.play_file(fn)
+time.sleep(self._SLEEP_TIME)
+self.do_get_current(dummy)
+def do_play_prev(self, dummy):
+self.xmms.playlist_prev()
+time.sleep(self._SLEEP_TIME)
+self.do_get_current(dummy)
+def do_play_next(self, dummy):
+self.xmms.playlist_next()
+time.sleep(self._SLEEP_TIME)
+self.do_get_current(dummy)
 root = gtk.Window()
-root.set_name(_("IMMSview"))
+root.set_title(_("IMMSView"))
 root.connect('destroy', gtk.mainquit)
 vbox = gtk.VBox(spacing = 3)
 root.add(vbox)
 vbox.show()
 model = IMMSStore(IMMSDb())

branch	immsview
changeset 9	412e93decb7c
parent 8	9aa8b1c884e7
child 10	bc1c7546502a