Changeset 3654

Timestamp:

26/10/08 21:05:40 (2 months ago)

Author:

dmeyer

Message:

cosmetic updates

Location:

trunk/metadata/src

Files:

• __init__.py (modified) (1 diff)
• core.py (modified) (10 diffs)
• image/jpg.py (modified) (1 diff)
• video/core.py (modified) (2 diffs)
• video/vcd.py (modified) (1 diff)

trunk/metadata/src/__init__.py

@@ -35 +35 @@
 import disc.cdrom as cdrom
 
-from core import Media, MEDIA_AUDIO, MEDIA_VIDEO, MEDIA_IMAGE, \
-     MEDIA_AV, MEDIA_SUBTITLE, MEDIA_CONTAINER, MEDIA_DIRECTORY, MEDIA_DISC, \
-     MEDIA_GAME, EXTENSION_STREAM, EXTENSION_DEVICE, EXTENSION_DIRECTORY
+from core import Media, MEDIA_AUDIO, MEDIA_VIDEO, MEDIA_IMAGE, MEDIA_AV, \
+     MEDIA_SUBTITLE, MEDIA_CHAPTER, MEDIA_DIRECTORY, MEDIA_DISC, MEDIA_GAME, \
+     EXTENSION_STREAM, EXTENSION_DEVICE, EXTENSION_DIRECTORY
 
 # use network functions

trunk/metadata/src/core.py

@@ -48 +48 @@
 MEDIA_AV        = 'MEDIA_AV'
 MEDIA_SUBTITLE  = 'MEDIA_SUBTITLE'
-MEDIA_CONTAINER = 'MEDIA_CONTAINER'
+MEDIA_CHAPTER   = 'MEDIA_CHAPTER'
 MEDIA_DIRECTORY = 'MEDIA_DIRECTORY'
 MEDIA_DISC      = 'MEDIA_DISC'
@@ -55 +55 @@
 
 MEDIACORE = ['title', 'caption', 'comment', 'size', 'type', 'subtype', 'timestamp',
-             'keywords', 'country', 'language', 'langcode', 'url', 'media', 'artist', 'mime']
+             'keywords', 'country', 'language', 'langcode', 'url', 'media', 'artist',
+             'mime']
 
 EXTENSION_DEVICE    = 'device'
@@ -92 +93 @@
 
         self._keys = self._keys[:]
-        self._tables = {}
+        self.tables = {}
         for key in self._keys:
             if not key == 'media':
@@ -130 +131 @@
         # print tables
         if log.level >= 10:
-            for name, table in self._tables.items():
+            for name, table in self.tables.items():
                 result += '+-- Table %s\n' % str(name)
                 for key, value in table.items():
@@ -164 +165 @@
         added to the existing one.
         """
-        if not self._tables.has_key(name):
-            self._tables[name] = hashmap
+        if not self.tables.has_key(name):
+            self.tables[name] = hashmap
         else:
             # Append to the already existing table
             for k in hashmap.keys():
-                self._tables[name][k] = hashmap[k]
+                self.tables[name][k] = hashmap[k]
 
 
@@ -210 +211 @@
 
         # copy needed tags from tables
-        for name, table in self._tables.items():
+        for name, table in self.tables.items():
             mapping = self.table_mapping.get(name, {})
             for tag, attr in mapping.items():
@@ -243 +244 @@
 
 
-    def get(self, key, default = None):
-        """
-        Returns key in dict, otherwise defaults to 'default' if key doesn't
-        exist.
-        """
-        return getattr(self, key, default)
-
-
-    def __getitem__(self, key):
-        """
-        get the value of 'key'
-        """
-        return getattr(self, key, None)
+    def get(self, attr, default = None):
+        """
+        Returns the given attribute. If the attribute is not set by
+        the parser return 'default'.
+        """
+        return getattr(self, attr, default)
+
+
+    def __getitem__(self, attr):
+        """
+        Get the value of the given attribute
+        """
+        return getattr(self, attr, None)
 
 
     def __setitem__(self, key, value):
         """
-        set the value of 'key' to 'value'
+        Set the value of 'key' to 'value'
         """
         setattr(self, key, value)
@@ -267 +268 @@
     def has_key(self, key):
         """
-        check if the object has a key 'key'
+        Check if the object has an attribute 'key'
         """
         return hasattr(self, key)
@@ -287 +288 @@
     def keys(self):
         """
-        Return all keys.
+        Return all keys for the attributes set by the parser.
         """
         return self._keys
@@ -297 +298 @@
     """
     _keys = Media._keys + [ 'id', 'tracks' ]
-    media = MEDIA_CONTAINER
 
     def __init__(self):

trunk/metadata/src/image/jpg.py

@@ -75 +75 @@
     JPEG parser supporting EXIf and IPTC tables. The important
     information is mapped to match the kaa.metadata key naming, the
-    complete table can be accessed with the _tables variable.
+    complete table can be accessed with self.tables.
     """
     table_mapping = { 'EXIF': EXIFMap, 'IPTC': IPTC.mapping }

trunk/metadata/src/video/core.py

@@ -30 +30 @@
 # -----------------------------------------------------------------------------
 
-from kaa.metadata.core import ParseError, Media, MEDIA_VIDEO, \
-     MEDIA_SUBTITLE, MEDIA_AV, MEDIA_AUDIO, Collection
+from kaa.metadata.core import ParseError, Media, MEDIA_VIDEO, MEDIA_SUBTITLE, \
+     MEDIA_CHAPTER, MEDIA_AV, MEDIA_AUDIO, MEDIA_DISC, Collection
 
 from kaa.metadata.audio.core import Audio as AudioStream
@@ -56 +56 @@
     """
     _keys = ['name', 'pos', 'enabled', 'id']
+    media = MEDIA_CHAPTER
 
     def __init__(self, name=None, pos=0):

trunk/metadata/src/video/vcd.py

@@ -42 +42 @@
     Parser for VCD files on hard-disc. It parses cue/bin file combinations.
     """
+    media = core.MEDIA_DISC
+
     def __init__(self, file):
         core.Collection.__init__(self)