From 7a6fbb7850a1dac411233036960b3ee543e2cb4f Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 30 Jan 2013 12:28:03 +0100 Subject: [PATCH] fix author & pid --- telecaster/models.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/telecaster/models.py b/telecaster/models.py index 2a606cc..67c4db7 100644 --- 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): -- 2.39.5