From: yomguy <yomguy@parisson.com>
Date: Fri, 12 Feb 2010 18:04:32 +0000 (+0000)
Subject: remove prof lists, fix metadata again
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8553b03b4e8f636d199d48055d85308f3a34d696;p=telecaster-cgi.git

remove prof lists, fix metadata again
---

diff --git a/etc/telecaster_edcast_mp3.cfg b/etc/telecaster_edcast_mp3.cfg
index 84b5df8..59e352e 100644
--- a/etc/telecaster_edcast_mp3.cfg
+++ b/etc/telecaster_edcast_mp3.cfg
@@ -23,6 +23,11 @@ BitrateMin=32
 BitrateMax=128
 NumberChannels=2
 Samplerate=44100
+#
+SaveDirectoryFlag=1
+SaveDirectory=/home/pre-barreau/backup
+SaveAsWAV=0
+#
 # Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
 OggQuality=3
 OggBitrateQualityFlag=Quality
@@ -43,4 +48,5 @@ AACCutoff=
 # Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
 LogLevel=1
 # Log File
-LogFile=/tmp/telecaster
+LogFile=/tmp/streamTranscoder_1
+
diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
index 4a9fe16..3952278 100644
--- a/etc/telecaster_mp3.xml
+++ b/etc/telecaster_mp3.xml
@@ -21,8 +21,8 @@
     </server>
     <media>
         <record>true</record>
-        <dir>/home/prebarreau/media</dir>
-        <raw_dir>/home/prebarreau/backup</raw_dir>
+        <dir>/home/pre-barreau/media</dir>
+        <raw_dir>/home/pre-barreau/backup</raw_dir>
         <format>mp3</format>
         <bitrate>96</bitrate>
         <channels>2</channels>
diff --git a/station.py b/station.py
index 8d9a05f..f028723 100644
--- a/station.py
+++ b/station.py
@@ -60,6 +60,8 @@ class Conference:
         self.conference = dict['conference']
         self.session = dict['session']
         self.professor = dict['professor']
+        if '....' in self.professor or self.professor == '':
+            self.professor = 'Inconnu'
         self.comment = dict['comment']
 
     def get_info(self):
diff --git a/webview.py b/webview.py
index 6b3d7e6..511c55e 100644
--- a/webview.py
+++ b/webview.py
@@ -198,7 +198,7 @@ class WebView(FieldStorage):
         if jackd_pid == []:
             jackd_info = '<span style=\"color: red\">&eacute;teint</span>'
         else:
-            jackd_info = '<span style=\"color: green\">d&eacute;marr&eacute;</span>'
+            jackd_info = '<span style=\"color: green\">d&eacute;marr&eacute; (jack)</span>'
 
         print "<div class=\"hardware\">"
         print "<div class=\"title\">Informations mat&eacute;rielles</div>"
@@ -212,16 +212,16 @@ class WebView(FieldStorage):
         #print "<tr><td>Estimation dur&eacute;e batterie :</td>"
         #print "<td>%s</td></tr>" % self.acpi.estimated_lifetime()
         try:
-            print "<tr><td>Temp Core 1 :</td><td>%s</td></tr>" % self.acpi.temperature(0)
+            print "<tr><td>Temp core 1 :</td><td>%s</td></tr>" % self.acpi.temperature(0)
         except:
             pass
         try:
-            print "<tr><td>Temp Core 2 :</td><td>%s</td></tr>" % self.acpi.temperature(1)
+            print "<tr><td>Temp core 2 :</td><td>%s</td></tr>" % self.acpi.temperature(1)
         except:
             pass
-        print "<tr><td>Address IP :</td>"
+        print "<tr><td>Addresse IP :</td>"
         print "<td>%s</td></tr>" % ip_info
-        print "<tr><td>Serveur JACK :</td>"
+        print "<tr><td>Serveur audio :</td>"
         print "<td>%s</td></tr>" % jackd_info
         print "<td><div class=\"buttons\">"
         if self.writing:
@@ -265,11 +265,7 @@ class WebView(FieldStorage):
             print "<option value=\""+str(i)+"\">"+str(i)+"</option>"
         print "</select></TD></TR>"
         print "<TR><TH align=\"left\">Professeur:</TH>"
-        print "<TD><select name=\"professor\">"
-        print "<option selected>...........Choisissez un professeur...........</option>"
-        for professor in self.professors:
-            print "<option value=\""+professor['name']+"\">"+professor['name']+"</option>"
-        print "</select></TD></TR>"
+        print "<TD><INPUT type = text name = \"professor\"></TD></TR>"
         print "<TR><TH align=\"left\">Commentaire:</TH>"
         print "<TD><INPUT type = text name = \"comment\"></TD></TR>"