Changeset 523

Timestamp:

12/17/06 22:59:53 (2 years ago)

Author:

nicfit

Message:

CDDB lookups

Files:

• trunk/src/cdrom_control.py (modified) (4 diffs)
• trunk/src/playlist_control.py (modified) (1 diff)

trunk/src/cdrom_control.py

@@ -21 +21 @@
-from fcntl import ioctl
-import dbus, gobject, gtk, gnomevfs
-import DiscID, CDDB
-
-from mesk import MeskException
@@ -124 +123 @@
-
-    def _read_cdinfo(self):
+        import DiscID
-        pl = mesk.playlist.Playlist()
-        disc = DiscID.open(self.block_device)
@@ -154 +154 @@
-            total += length
-
+        # Fetch metadata from CDDB
+        self.cddb_fetcher = CDDBThread(disc_info, self._update_metadata_cddb)
+        self.cddb_fetcher.start()
+
-        return pl
-
@@ -176 +180 @@
-        mesk.log.debug("Ejecting %s" % self.block_device)
-        devices.cdrom_eject(self.block_device)
+
+    def _update_metadata_cddb(self, disc_id, cddb_info):
+        num_tracks = disc_id[1]
+        artist, album = cddb_info['DTITLE'].split(' / ')
+        year = cddb_info['DYEAR']
+        for i in range(num_tracks):
+            # FIXME: Turn into unicode, cddb protocol v6 uses utf-8 instead of
+            #        iso-8859-1
+            src = self._playlist[i]
+            src.meta_data.artist = artist
+            src.meta_data.album = album
+            if year:
+                src.meta_data.year = int(year)
+            src.meta_data.title = cddb_info['TTITLE%d' % i]
+            self._update_source_row(src)
+
+import threading, CDDB
+class CDDBThread(threading.Thread):
+    def __init__(self, disc_id, cb):
+        threading.Thread.__init__(self)
+        self._disc_id = disc_id
+        self._cb = cb
+
+    def run(self):
+        (status, info) = CDDB.query(self._disc_id,
+                                    client_name=mesk.info.APP_NAME,
+                                    client_version=mesk.info.APP_VERSION)
+        if status in [200, 210, 211]:
+            if status in [210, 211]:
+                info = info[0]
+        else:
+            mesk.log.verbose('Unable to fetch CDDB info, status=%d' % status)
+
+        (status, info) = CDDB.read(info['category'], info['disc_id'])
+        if status != 210:
+            mesk.log.verbose('Unable to fetch CDDB info, status=%d' % status)
+            return
+
+        gobject.idle_add(self._cb, self._disc_id, info)

trunk/src/playlist_control.py

@@ -600 +600 @@
-        if not self._is_active:
-            return
-
+
+
+
-        # Update model data with tag update
-        row = self._playlist.index(audio_src)