fix author & pid

diff --git a/telecaster/models.py b/telecaster/models.py
index 2a606cc7cddbb7aca6b4333b5e4e00cbbe0ad72f..67c4db71d42f5e72e8cda1650011805befbfb005 100644 (file)
--- a/telecaster/models.py
+++ b/telecaster/models.py
@@ -53,11 +53,13 @@ from django.utils.translation import ugettext_lazy as _
 
 from south.modelsinspector import add_introspection_rules
 
-from teleforma.models import *
+from teleforma.models import Conference
+
 
 app_label = 'telecaster'
 spacer = '_-_'
 
+
 class ShortTextField(models.TextField):
 
     def formfield(self, **kwargs):
@@ -162,7 +164,10 @@ class Station(Model):
             station['infos']['short_name'] = self.mount_point
             station['infos']['name'] = self.slug
             station['infos']['description'] = self.slug
-            station['relay']['author'] = unicode(self.conference.professor.user.username)
+            if self.conference.professor:
+                station['relay']['author'] = unicode(self.conference.professor.user.username)
+            else:
+                station['relay']['author'] = ''
 
         #FIXME: only one format in deefuzzer conf file
         self.format = station['media']['format']
@@ -180,7 +185,9 @@ class Station(Model):
         command = 'deefuzzer ' + self.deefuzzer_file.path + ' > /dev/null &'
         os.system(command)
         time.sleep(0.5)
-        self.pid = get_pid('deefuzzer', args=self.deefuzzer_file.path)
+        pid = get_pid('deefuzzer', args=self.deefuzzer_file.path)
+        if pid:
+            self.pid = pid
         self.save()
 
     def deefuzzer_stop(self):