Added Mp3Exporter with (very) partial mapping of DublinCore fields.

diff --git a/telemeta/export/__init__.py b/telemeta/export/__init__.py
index 389987720fa51313a136d47fcb09acfd73eda30e..6ba2ef16d52301d77454e8f079560ee381612c16 100644 (file)
--- a/telemeta/export/__init__.py
+++ b/telemeta/export/__init__.py
@@ -3,3 +3,4 @@ from telemeta.export.core import *
 from telemeta.export.ogg import *
 from telemeta.export.flac import *
 from telemeta.export.wav import *
+from telemeta.export.mp3 import *
\ No newline at end of file

diff --git a/telemeta/export/core.py b/telemeta/export/core.py
index b8b64f3c49522f04a6fe4c7d3f3dbba5df4a1cc1..ef0ddadfcc27288bba34e10e647f3fee6fc4e238 100644 (file)
--- a/telemeta/export/core.py
+++ b/telemeta/export/core.py
@@ -13,6 +13,7 @@
 import os
 import re
 import string
+import mutagen
 
 import telemeta.export
 from telemeta.export import *

diff --git a/telemeta/export/flac.py b/telemeta/export/flac.py
index 68a31f4f7a273c626a68f4d101cabd4a153de67d..5b163b50533530dd14182103d859ac8656a698e1 100644 (file)
--- a/telemeta/export/flac.py
+++ b/telemeta/export/flac.py
@@ -42,7 +42,7 @@ class FlacExporter(ExporterCore):
                return 'application/flac'
 
        def get_description(self):
-               return """S00N"""
+               return 'FIXME'
 
        def get_file_info(self):
                try:
@@ -98,7 +98,7 @@ class FlacExporter(ExporterCore):
                if 'verbose' in self.options and self.options['verbose'] != '0':
                        args = args
                else:
-                       args = args+' -s'
+                       args = args+' -s '
        
                try:
                        # Pre-proccessing (core)

diff --git a/telemeta/export/ogg.py b/telemeta/export/ogg.py
index f81ba08e671f1ce4f0cf3fe03bffc8d231abdf25..207e66393ce984ce773322fe231195b7ec84b219 100644 (file)
--- a/telemeta/export/ogg.py
+++ b/telemeta/export/ogg.py
@@ -42,7 +42,7 @@ class OggExporter(ExporterCore):
                return 'application/ogg'
 
        def get_description(self):
-               return """S00N"""
+               return 'FIXME'
 
        def get_file_info(self):
                try:
@@ -88,7 +88,7 @@ class OggExporter(ExporterCore):
                if 'verbose' in self.options and self.options['verbose'] != '0':
                        args = args
                else:
-                       args = args + ' -Q'
+                       args = args + ' -Q '
                
                if os.path.exists(self.source) and not iswav16(self.source):
                        self.source = self.decode()
@@ -97,11 +97,11 @@ class OggExporter(ExporterCore):
                        # Pre-proccessing (core)
                        self.ext = self.get_file_extension()
                        self.dest = self.pre_process(self.item_id,
-                                                                                self.source,
-                                                                                self.metadata,
-                                                                                self.ext,
-                                                                                self.cache_dir,
-                                                                                self.options)
+                                                       self.source,
+                                                       self.metadata,
+                                                       self.ext,
+                                                       self.cache_dir,
+                                                       self.options)
                        
                        # Encoding
                        os.system('oggenc '+args+' -o "'+self.dest+

diff --git a/telemeta/export/wav.py b/telemeta/export/wav.py
index 52b32b1454bc459702a6b91c2b003fc59dbc9460..5da55895990ee10d2387f4d490e1e6a356d62afc 100644 (file)
--- a/telemeta/export/wav.py
+++ b/telemeta/export/wav.py
@@ -40,7 +40,7 @@ class WavExporter(ExporterCore):
                return 'audio/x-wav'
 
        def get_description(self):
-               return """S00N"""
+               return 'FIXME'
 
        def get_file_info(self):
                try:

diff --git a/tests/export_test.py b/tests/export_test.py
index a7364ff039552b74faf13e66dbcff56cfaafc42b..24b25719f997bdba336ed636352ef15298c61e59 100644 (file)
--- a/tests/export_test.py
+++ b/tests/export_test.py
@@ -19,10 +19,12 @@ from telemeta.core import ComponentManager
 cache_dir = 'cache/'
 source = 'samples/wav/Cellar - Show Me - 02.wav'
 item_id = '1'
-metadata = {'Collection': 'Test',
-                'Title': 'Show Me',
-                'Artist': 'Cellar',
-                'Encoder': 'Telemeta',
+metadata = {'identifier': 'Test',  #collection
+                'title': 'Show Me',
+                'creator': 'Cellar',
+                'type': 'House',
+                'date': '2004',
+                'publisher': 'PArISs0n',
                 }
 options = {'verbose': '1'}
 
@@ -34,7 +36,7 @@ class ExportTest(Component):
                for exporter in self.exporters:
                        format = exporter.get_format()
                        if 'verbose' in options and options['verbose'] != '0':
-                               print "+------------------------------------------"
+                               print "\n+------------------------------------------"
                                print '| Testing exporter format: ' + format
                                print "+------------------------------------------"
                        exporter.set_cache_dir(cache_dir)