Author: dmeyer
Date: Fri Dec 15 19:36:59 2006
New Revision: 2243
Added:
trunk/metadata/src/core.py
- copied, changed from r2239, /trunk/metadata/src/mediainfo.py
Removed:
trunk/metadata/src/mediainfo.py
Modified:
trunk/metadata/src/__init__.py
trunk/metadata/src/audio/core.py
trunk/metadata/src/disc/core.py
trunk/metadata/src/factory.py
trunk/metadata/src/games/core.py
trunk/metadata/src/image/core.py
trunk/metadata/src/misc/directory.py
trunk/metadata/src/misc/xml.py
trunk/metadata/src/video/core.py
Log:
rename mediainfo to core
Modified: trunk/metadata/src/__init__.py
==============================================================================
--- trunk/metadata/src/__init__.py (original)
+++ trunk/metadata/src/__init__.py Fri Dec 15 19:36:59 2006
@@ -39,7 +39,7 @@
# import factory code for kaa.metadata access
from factory import *
from disc.cdrom import get_id as get_discid
-from mediainfo import Media, MEDIA_AUDIO, MEDIA_VIDEO, MEDIA_IMAGE, \
+from core import Media, MEDIA_AUDIO, MEDIA_VIDEO, MEDIA_IMAGE, \
MEDIA_AV, MEDIA_SUBTITLE, MEDIA_CONTAINER, MEDIA_DIRECTORY, MEDIA_DISC, \
MEDIA_GAME
Modified: trunk/metadata/src/audio/core.py
==============================================================================
--- trunk/metadata/src/audio/core.py (original)
+++ trunk/metadata/src/audio/core.py Fri Dec 15 19:36:59 2006
@@ -29,7 +29,8 @@
#
# -----------------------------------------------------------------------------
-from kaa.metadata import mediainfo
+from kaa.metadata.core import ParseError, Media, MEDIA_AUDIO, \
+ EXTENSION_STREAM
from kaa.metadata.factory import register
# fourcc list
@@ -42,19 +43,15 @@
MUSICCORE = ['trackof', 'album', 'genre', 'discs', 'thumbnail' ]
-ParseError = mediainfo.ParseError
-EXTENSION_STREAM = mediainfo.EXTENSION_STREAM
-
-
-class Audio(mediainfo.Media):
+class Audio(Media):
"""
Audio Tracks in a Multiplexed Container.
"""
- _keys = mediainfo.Media._keys + AUDIOCORE
- media = mediainfo.MEDIA_AUDIO
+ _keys = Media._keys + AUDIOCORE
+ media = MEDIA_AUDIO
def _finalize(self):
- mediainfo.Media._finalize(self)
+ Media._finalize(self)
if self.codec is not None:
self.fourcc, self.codec = fourcc.resolve(self.codec)
Copied: trunk/metadata/src/core.py (from r2239,
/trunk/metadata/src/mediainfo.py)
==============================================================================
--- /trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/core.py Fri Dec 15 19:36:59 2006
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------------
-# mediainfo.py
+# core.py
# -----------------------------------------------------------------------------
# $Id$
#
@@ -83,7 +83,7 @@
def __init__(self, hash=None):
if hash is not None:
- # create mediainfo based on dict
+ # create Media based on dict
for key, value in hash.items():
if isinstance(value, list) and value and isinstance(value[0],
dict):
value = [ Media(x) for x in value ]
@@ -256,7 +256,7 @@
def convert(self):
"""
- Convert mediainfo to dict.
+ Convert Media to dict.
"""
result = {}
for k in self._keys:
Modified: trunk/metadata/src/disc/core.py
==============================================================================
--- trunk/metadata/src/disc/core.py (original)
+++ trunk/metadata/src/disc/core.py Fri Dec 15 19:36:59 2006
@@ -34,26 +34,23 @@
import logging
# kaa imports
-from kaa.metadata import mediainfo
+from kaa.metadata.core import ParseError, Collection, EXTENSION_DEVICE, \
+ EXTENSION_DIRECTORY, MEDIA_DISC
from kaa.metadata.factory import register
from kaa.metadata.video.core import VideoStream
# extra cdrom parser
import cdrom
-EXTENSION_DEVICE = mediainfo.EXTENSION_DEVICE
-EXTENSION_DIRECTORY = mediainfo.EXTENSION_DIRECTORY
-ParseError = mediainfo.ParseError
-
# get logging object
log = logging.getLogger('metadata')
CREATE_MD5_ID = 0
-class Disc(mediainfo.Collection):
+class Disc(Collection):
- _keys = mediainfo.Collection._keys + [ 'mixed', 'label' ]
- media = mediainfo.MEDIA_DISC
+ _keys = Collection._keys + [ 'mixed', 'label' ]
+ media = MEDIA_DISC
def is_disc(self, device):
(type, self.id) = cdrom.get_id(device, handle_mix=1)
Modified: trunk/metadata/src/factory.py
==============================================================================
--- trunk/metadata/src/factory.py (original)
+++ trunk/metadata/src/factory.py Fri Dec 15 19:36:59 2006
@@ -40,8 +40,8 @@
import urllib
import logging
-# kaa imports
-import mediainfo as core
+# kaa.metadata imports
+import core
# get logging object
log = logging.getLogger('metadata')
Modified: trunk/metadata/src/games/core.py
==============================================================================
--- trunk/metadata/src/games/core.py (original)
+++ trunk/metadata/src/games/core.py Fri Dec 15 19:36:59 2006
@@ -29,10 +29,8 @@
#
# -----------------------------------------------------------------------------
-from kaa.metadata import mediainfo
+from kaa.metadata.core import ParseError, Media, MEDIA_GAME
from kaa.metadata.factory import register
-ParseError = mediainfo.ParseError
-
-class Game(mediainfo.Media):
- media = mediainfo.MEDIA_GAME
+class Game(Media):
+ media = MEDIA_GAME
Modified: trunk/metadata/src/image/core.py
==============================================================================
--- trunk/metadata/src/image/core.py (original)
+++ trunk/metadata/src/image/core.py Fri Dec 15 19:36:59 2006
@@ -40,9 +40,7 @@
# kaa.metadata imports
from kaa.metadata.factory import register
-from kaa.metadata import mediainfo
-
-ParseError = mediainfo.ParseError
+from kaa.metadata.core import ParseError, Media, MEDIA_IMAGE
# get logging object
log = logging.getLogger('metadata')
@@ -52,13 +50,13 @@
'thumbnail','software','hardware', 'dpi', 'city', 'rotation' ]
-class Image(mediainfo.Media):
+class Image(Media):
"""
Digital Images, Photos, Pictures.
"""
- _keys = mediainfo.Media._keys + ATTRIBUTES
- media = mediainfo.MEDIA_IMAGE
+ _keys = Media._keys + ATTRIBUTES
+ media = MEDIA_IMAGE
def _finalize(self):
"""
@@ -67,7 +65,7 @@
"""
if self.url and self.url.startswith('file://'):
self.parse_external_files(self.url[7:])
- mediainfo.Media._finalize(self)
+ Media._finalize(self)
def parse_external_files(self, filename):
Modified: trunk/metadata/src/misc/directory.py
==============================================================================
--- trunk/metadata/src/misc/directory.py (original)
+++ trunk/metadata/src/misc/directory.py Fri Dec 15 19:36:59 2006
@@ -39,8 +39,8 @@
from kaa import xml
# kaa.metadata imports
-import kaa.metadata.mediainfo as core
-from kaa.metadata.factory import register
+import kaa.metadata.core as core
+import kaa.metadata.factory as factory
# get logging object
log = logging.getLogger('metadata')
@@ -106,4 +106,4 @@
self._set(key, child.content)
# register to kaa.metadata core
-register('directory', core.EXTENSION_DIRECTORY, Directory)
+factory.register('directory', core.EXTENSION_DIRECTORY, Directory)
Modified: trunk/metadata/src/misc/xml.py
==============================================================================
--- trunk/metadata/src/misc/xml.py (original)
+++ trunk/metadata/src/misc/xml.py Fri Dec 15 19:36:59 2006
@@ -35,7 +35,7 @@
import libxml2
# kaa.metadata imports
-import kaa.metadata.mediainfo as core
+import kaa.metadata.core as core
import kaa.metadata.factory as factory
# get logging object
Modified: trunk/metadata/src/video/core.py
==============================================================================
--- trunk/metadata/src/video/core.py (original)
+++ trunk/metadata/src/video/core.py Fri Dec 15 19:36:59 2006
@@ -29,15 +29,15 @@
#
# -----------------------------------------------------------------------------
-from kaa.metadata import mediainfo
+from kaa.metadata.core import ParseError, Media, MEDIA_VIDEO, \
+ MEDIA_SUBTITLE, MEDIA_AV, MEDIA_AUDIO, MEDIA_AV, Collection
+
from kaa.metadata.factory import register
from kaa.metadata.audio.core import Audio as AudioStream
# fourcc list
import kaa.metadata.fourcc as fourcc
-ParseError = mediainfo.ParseError
-
VIDEOCORE = ['length', 'encoder', 'bitrate', 'samplerate', 'codec', 'format',
'samplebits', 'width', 'height', 'fps', 'aspect', 'trackno',
'fourcc' ]
@@ -45,54 +45,54 @@
'genre', 'writer', 'producer', 'studio', 'rating', 'starring',
'delay', 'image', 'video', 'audio', 'subtitles', 'chapters',
'software' ]
-class VideoStream(mediainfo.Media):
+class VideoStream(Media):
"""
Video Tracks in a Multiplexed Container.
"""
- _keys = mediainfo.Media._keys + VIDEOCORE
- media = mediainfo.MEDIA_VIDEO
+ _keys = Media._keys + VIDEOCORE
+ media = MEDIA_VIDEO
def _finalize(self):
- mediainfo.Media._finalize(self)
+ Media._finalize(self)
if self.codec is not None:
self.fourcc, self.codec = fourcc.resolve(self.codec)
-class Chapter(mediainfo.Media):
+class Chapter(Media):
"""
Chapter in a Multiplexed Container.
"""
_keys = ['name', 'pos', 'enabled']
def __init__(self, name=None, pos=0):
- mediainfo.Media.__init__(self)
+ Media.__init__(self)
self.name = name
self.pos = pos
self.enabled = True
-class Subtitle(mediainfo.Media):
+class Subtitle(Media):
"""
Subtitle Tracks in a Multiplexed Container.
"""
_keys = ['language', 'trackno', 'title']
- media = mediainfo.MEDIA_SUBTITLE
+ media = MEDIA_SUBTITLE
def __init__(self, language=None):
- mediainfo.Media.__init__(self)
+ Media.__init__(self)
self.language = language
-class AVContainer(mediainfo.Media):
+class AVContainer(Media):
"""
Container for Audio and Video streams. This is the Container Type for
all media, that contain more than one stream.
"""
- _keys = mediainfo.Media._keys + AVCORE
- media = mediainfo.MEDIA_AV
+ _keys = Media._keys + AVCORE
+ media = MEDIA_AV
def __init__(self):
- mediainfo.Media.__init__(self)
+ Media.__init__(self)
self.audio = []
self.video = []
self.subtitles = []
@@ -103,16 +103,9 @@
"""
Correct same data based on specific rules
"""
- mediainfo.Media._finalize(self)
+ Media._finalize(self)
if not self.length and len(self.video) and self.video[0].length:
self.length = self.video[0].length
for container in [ self ] + self.video + self.audio:
if container.length:
container.length = int(container.length)
-
-
-# TODO: copy stuff to this file
-
-MEDIA_AUDIO = mediainfo.MEDIA_AUDIO
-MEDIA_AV = mediainfo.MEDIA_AV
-Collection = mediainfo.Collection
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
