fix filename length

diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
index 635a190130d8baf0293604e818135bcae35ac031..b2b171644f9bcd9a20b6f3db4c232b3cbec486c1 100644 (file)
--- a/etc/telecaster_mp3.xml
+++ b/etc/telecaster_mp3.xml
@@ -19,8 +19,8 @@
     </server>
     <media>
         <record>true</record>
-        <dir>/tmp/media</dir>
-        <raw_dir>/tmp/backup</raw_dir>
+        <dir>/home/prebarreau/media</dir>
+        <raw_dir>/home/prebarreau/backup</raw_dir>
         <format>mp3</format>
         <bitrate>96</bitrate>
         <ogg_quality>3</ogg_quality>

diff --git a/station.py b/station.py
index 81d1e81434b3f43ff6d853aa511fa931826f7ec0..a97fdf123175b3de4440475b2928aff3ab7c478a 100644 (file)
--- a/station.py
+++ b/station.py
@@ -77,7 +77,7 @@ class Station(Conference):
                                  clean_string(self.department) + '_-_' + \
                                  clean_string(self.conference)+'.'+self.format
         self.lock_file = self.root_dir + os.sep + self.conf['server']['lock_file']
-        self.filename = self.ServerDescription + '_-_' + self.time + '.' + self.format
+        self.filename = clean_string('_-_'.join(self.description[1:])) + '_-_' + self.time + '.' + self.format
         self.output_dir = self.media_dir + os.sep + self.department + os.sep + self.date
         self.file_dir = self.output_dir + os.sep + self.ServerName
         self.uid = os.getuid()
@@ -162,7 +162,7 @@ class Station(Conference):
         time.sleep(1)
         date = datetime.datetime.now().strftime("%Y")
         if os.path.exists(self.file_dir) and os.path.exists(self.file_dir + os.sep + 'incomplete'):
-            shutil.copy(self.file_dir+os.sep+'incomplete'+os.sep+' - .'+self.format, self.file_dir+os.sep)
+            shutil.move(self.file_dir+os.sep+'incomplete'+os.sep+' - .'+self.format, self.file_dir+os.sep)
             os.rename(self.file_dir+os.sep+' - .'+self.format, self.file_dir+os.sep+self.filename)
             shutil.rmtree(self.file_dir+os.sep+'incomplete'+os.sep)