ffmpeg options more backwards compatible

codec:a -> acodec
-to -> -t (which has a different meaning, anyway)

FIX filename

server/forge.py

@@ -74,12 +74,12 @@ def mp3_join(named_intervals, target):
         assert '|' not in filename
         files.append(filename)
 
-    cmdline = [ffmpeg, '-i', 'concat:%s' % '|'.join(files), '-codec:a',
+    cmdline = [ffmpeg, '-i', 'concat:%s' % '|'.join(files), '-acodec',
                'copy']
     if startskip is not None:
         cmdline += ['-ss', str(startskip)]
     if endskip is not None:
-        cmdline += ['-to', str(len(files)*3600 - endskip)]
+        cmdline += ['-t', str(len(files)*3600 - (startskip + endskip))]
     cmdline += [target]
     cmdline += ['-loglevel', 'warning']
     return cmdline

server/server.py

@@ -142,8 +142,8 @@ class RecServer:
             newrec['endtime'] = now
         else:
             newrec['endtime'] = date_read(req['endtime'])
-
-        newrec["name"] = req["name"] if 'name' in req else ''
+        if 'name' in req:
+            newrec["name"] = req["name"]
 
         try:
             logger.info("prima di update")
@@ -158,16 +158,14 @@ class RecServer:
         # prendiamo la rec in causa
         recid = dict(request.POST.allitems())['recid']
         rec = self.db._search(recid=recid)[0]
-        #TODO: manca il prefisso!
         if rec.filename is not None and os.path.filename.exists(rec.filename):
             return {'status': 'ready',
                     'message': 'The file has already been generated at %s' %
                     rec.filename,
                     'rec': rec
                     }
-        rec.filename = 'ror-%s-%s' % (rec.recid, rec.name)
+        rec.filename = 'ror-%s-%s.mp3' % (rec.recid, rec.name)
         self.db.update(rec.recid, rec.serialize())
-        # TODO: real ffmpeg job!
         job_id = get_process_queue().submit(
             create_mp3,
             start=rec.starttime,