set dest_dir

git-svn-id: http://svn.parisson.org/svn/telemaster/trunk@11 353fd7da-fb10-4236-9bec-1a49139083f2

diff --git a/flac2mp3mix.py b/flac2mp3mix.py
index f85dc1fc3cd6997d7377cfaef6843587d18b64ec..4b8276652bad5502ce408e406bf1260e7f85fbe2 100644 (file)
--- a/flac2mp3mix.py
+++ b/flac2mp3mix.py
@@ -50,10 +50,10 @@ class SubProcessPipe:
         """Read media and stream data through a generator.
         Taken from Telemeta (see http://telemeta.org)"""
 
+        self.buffer_size = 32768
         if not stdin:
             stdin =  subprocess.PIPE
 
-        self.buffer_size = 32768
         self.proc = subprocess.Popen(command.encode('utf-8'),
                     shell = True,
                     bufsize = self.buffer_size,
@@ -68,13 +68,7 @@ class Flac2Mp3Mix:
 
     def __init__(self, argv):
         self.root_dir = argv[1]
-        self.buffer_size = 32768
-
-    def mix_player(self, media_list, stdin):
-        command = 'cat '
-        for media in media_list:
-            command += '"' + media + '" '
-        return SubProcessPipe(command, stdin)
+        self.dest_dir = argv[2]
 
     def flac_player(self, media_list, stdin):
         files = ''
@@ -105,14 +99,14 @@ class Flac2Mp3Mix:
         for media_list in media_lists:
             if media_list:
                 media_list.sort()
-                root_dir = os.sep.join(media_list[0].split(os.sep)[:-1])
+                #root_dir = os.sep.join(media_list[0].split(os.sep)[:-1])
                 media_0 = media_list[0]
                 print 'Mixing : '
                 print media_list
                 flac = Flac(media_0)
                 metadata = flac.get_tags()
                 album_name = metadata['album']
-                mp3_file = root_dir + os.sep + album_name + '.mp3'
+                mp3_file = self.dest_dir + os.sep + album_name + '.mp3'
                 #if not os.path.exists(mp3_file):
                 f = self.flac_player(media_list, None)
                 m = self.mp3_encode(f.stdout, mp3_file)
@@ -128,6 +122,9 @@ class Flac2Mp3Mix:
 
 
 if __name__ == '__main__':
-    f = Flac2Mp3Mix(sys.argv)
-    f.main()
+    if len(sys.argv) <= 2:
+        print "Usage : flac2mp3mix.py  FLAC_DIR  MIX_DIR"
+    else:
+        f = Flac2Mp3Mix(sys.argv)
+        f.main()