Changeset 3628

Timestamp:

17/10/08 18:57:08 (3 months ago)

Author:

dmeyer

Message:

use fake media object for queries on media not available

Location:

trunk/beacon/src

Files:

• db.py (modified) (2 diffs)
• media.py (modified) (1 diff)

trunk/beacon/src/db.py

@@ -46 +46 @@
 # beacon imports
 from item import Item
-from media import MediaList
+from media import MediaList, FakeMedia
 
 # get logging object
@@ -395 +395 @@
             m = self.medialist.get_by_beacon_id(i['parent'])
             if not m:
-                raise AttributeError('bad media %s' % str(i['parent']))
+                # media not mounted, make it an Item, not a File
+                result = self._db.query(type="media", id=i['parent'][1])
+                if not result:
+                    raise AttributeError('bad media %s' % str(i['parent']))
+                return create_item(i, FakeMedia(result[0]['name']))
             return create_directory(i, m)
 

trunk/beacon/src/media.py

@@ -45 +45 @@
 log = logging.getLogger('beacon')
 
+
+class FakeMedia(object):
+    """
+    Media object for a media that is not available
+    """
+    def __init__(self, name):
+        self.url = 'media://%s' % name
+
+    @property
+    def _beacon_media(self):
+        """
+        Get _beacon_media which is this object itself. To avoid circular
+        references, use a property here.
+        """
+        return self
 
 class Media(object):