From 58c0275005ad3bd1d24e7c44b4ab3326b3ef0734 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 9 Jan 2012 15:15:36 +0100 Subject: [PATCH] update, fix pm script --- install.py | 3 +++ telecaster.py | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/install.py b/install.py index 515ee3f..3c144e8 100755 --- a/install.py +++ b/install.py @@ -116,6 +116,9 @@ class Install(object): os.system('a2ensite telecaster.conf') os.system('/etc/init.d/apache2 reload') + dir = '/etc/pm/' + os.system('cp -r conf' + dir + '* ' + dir) + def install_init(self): os.chdir(self.app_dir) diff --git a/telecaster.py b/telecaster.py index ff66ccd..123663b 100755 --- a/telecaster.py +++ b/telecaster.py @@ -35,7 +35,7 @@ # Author: Guillaume Pellerin """ -version = '0.5.5' +version = '0.5.6' import os import re @@ -73,7 +73,7 @@ class TeleCaster: self.deefuzzer_path = '/usr/local/bin/deefuzzer' elif os.path.exists('/usr/bin/deefuzzer'): self.deefuzzer_path = '/usr/bin/deefuzzer' - + def transition_head(self): html_file = open('telecaster_starting_head.html', 'r') html = html_file.read() @@ -88,7 +88,7 @@ class TeleCaster: def main(self): edcast_pid = get_pid('edcast_jack', self.uid) - + deefuzzer_pid = get_pid(self.deefuzzer_path+' '+self.user_dir+os.sep+'deefuzzer.xml', self.uid) writing = edcast_pid != [] casting = deefuzzer_pid != [] @@ -104,7 +104,7 @@ class TeleCaster: 'session': '', 'professor': '', 'comment': ''} - + for data in self.conference_dict: if not form.has_key(data): self.conference_dict[data] = 'Inconnu' @@ -113,7 +113,7 @@ class TeleCaster: if '....' in value: self.conference_dict[data] = 'Inconnu' else: - value = re.sub(r'\W+', '_', value) + value = re.sub(r'\W+', '_', value) self.conference_dict[data] = value.decode('utf-8') self.conference_dict['title'] = self.title -- 2.39.5