Changeset 3624

Timestamp:

16/10/08 22:09:04 (3 months ago)

Author:

dmeyer

Message:

fix delete_media and improve list_media

Location:

trunk/beacon

Files:

• bin/beacon-search (modified) (2 diffs)
• src/__init__.py (modified) (2 diffs)
• src/client.py (modified) (2 diffs)

trunk/beacon/bin/beacon-search

@@ -221 +221 @@
 
     if mode == 'list-media':
-        for m in (yield kaa.beacon.query(type='media', media='ignore')):
-            print '%4d %s' % (m['id'], m['name'])
+        for m in (yield kaa.beacon.list_media()):
+            available = ''
+            if m['object']:
+                available = '(available)'
+            print '%4d %s %s' % (m['id'], m['name'], available)
         sys.exit(0)
      
@@ -235 +238 @@
             print 'media 0 can\'t be deleted'
             sys.exit(1)
-        kaa.beacon.delete_media(media)
-        sys.exit(0)
-      
+        yield kaa.beacon.delete_media(media)
+        sys.exit(0)      
 
     query   = {}

trunk/beacon/src/__init__.py

@@ -180 +180 @@
     if not _client:
         connect()
-    while not _client.is_connected():
-        kaa.main.step()
-    return _client._db.medialist
+    return _client.list_media()
 
 def delete_media(id):
@@ -192 +190 @@
     if not _client:
         connect()
-    while not _client.is_connected():
-        kaa.main.step()
     return _client.delete_media(id)
 

trunk/beacon/src/client.py

@@ -194 +194 @@
             self.rpc('db.register_track_type_attrs', type_name, indexes, **attrs)
 
+    @kaa.coroutine()
+    def list_media(self):
+        if self.status == DISCONNECTED:
+            yield None
+        result = []
+        media = yield self.query(type='media', media='ignore')
+        for pos, m in enumerate(media):
+            m = dict(m)
+            m['object'] = self._db.medialist.get_by_beacon_id(('media', m['id']))
+            result.append(m)
+        yield result
 
     def delete_media(self, id):
@@ -200 +211 @@
         """
         if self.status != DISCONNECTED:
-            self.rpc('db.media.delete', id)
+            return self.rpc('db.media.delete', id)