add (video source) id management for mountpoint

diff --git a/telecaster/models.py b/telecaster/models.py
index aae147983852353c1da284144739d8bd89e293f7..a09398207b16cdb86ea4e94798d74155141e67a1 100644 (file)
--- a/telecaster/models.py
+++ b/telecaster/models.py
@@ -174,15 +174,18 @@ class Station(Model):
                 self.output_dir = output_dir
                 self.record_dir = output_dir
 
-            station['infos']['short_name'] = self.slug + '.' + station['media']['format']
-            station['infos']['name'] = self.slug
-            station['infos']['description'] = self.slug
+            if 'id' in station['infos']:
+                slug = self.slug + '_' + station['infos']['id']
+            else:
+                slug = self.slug
+            station['infos']['short_name'] = slug + '.' + station['media']['format']
+            station['infos']['name'] = slug
+            station['infos']['description'] = slug
             if self.conference.professor:
                 station['relay']['author'] = unicode(self.conference.professor.user.username)
             else:
                 station['relay']['author'] = 'None'
 
-        #FIXME: only one format in deefuzzer conf file
         self.format = station['media']['format']
         self.deefuzzer_file = 'cache' + os.sep + 'station_' + \
                                         station['media']['format'] + '.yml'