use directories and allow filetypes other than FLAC

[audio.git] / apps / archive / tasks.py

diff --git a/apps/archive/tasks.py b/apps/archive/tasks.py
index e8ce4fb..941bbc6 100755 (executable)
--- a/apps/archive/tasks.py
+++ b/apps/archive/tasks.py
@@ -162,6 +162,7 @@ class Mp3Task(AudioFormatTask):
             '-ab', '64k',
             '-ac', '1',
             '-y',
+            '-acodec', 'libmp3lame',
             out_path
             ])
 
@@ -188,11 +189,12 @@ class OggTask(AudioFormatTask):
     @staticmethod
     def encode(in_path, out_path):
         # 44.1kHz 64kbps mono Ogg Vorbis
-        subprocess.check_call(['oggenc', 
-            in_path,
-            '--discard-comments',
-            '--resample', '44100',
-            '--downmix',
-            '-b', '64',
-            '-o', out_path
+        subprocess.check_call(['ffmpeg', 
+            '-i', in_path,
+            '-ar', '44100',
+            '-ab', '64k',
+            '-ac', '1',
+            '-y',
+            '-acodec', 'libvorbis',
+            out_path
             ])