* Cleanup

diff --git a/etc/default_conferences.xml b/etc/default_conferences.xml
index c450d20cdba7cff28f23eea9d9734c3984151532..fdc552aa0f6bb4b2e3929a16a48bd91019ced5a7 100644 (file)
--- a/etc/default_conferences.xml
+++ b/etc/default_conferences.xml
@@ -1,15 +1,15 @@
 <teleoddcast>
     <url>http://localhost</url>
-    <title>School Example</title>
+    <title>Example University</title>
     <port>8000</port>
     <department>
         <name>Audio</name>
         <conferences>
             <conference>
-                <name>Conference 1</name>
+                <name>Recording</name>
             </conference>
             <conference>
-                <name>Conference 2</name>
+                <name>Broadcasting</name>
             </conference>
         </conferences>
     </department>
@@ -17,10 +17,10 @@
         <name>Computer</name>
         <conferences>
             <conference>
-                <name>Conference 1</name>
+                <name>Languages</name>
             </conference>
             <conference>
-                <name>Conference 2</name>
+                <name>Open source systems</name>
             </conference>
         </conferences>
     </department>
@@ -28,21 +28,21 @@
         <name>Physics</name>
         <conferences>
             <conference>
-                <name>Conference 1</name>
+                <name>Mechanics</name>
             </conference>
             <conference>
-                <name>Conference 2</name>
+                <name>Acoustics</name>
             </conference>
         </conferences>
     </department>
     <department>
-        <name>Sociology</name>
+        <name>Ethnology</name>
         <conferences>
             <conference>
-                <name>Conference 1</name>
+                <name>Ethomusicology</name>
             </conference>
             <conference>
-                <name>Conference 1</name>
+                <name>Documentation</name>
             </conference>
         </conferences>
     </department>

diff --git a/etc/default_courses.xml b/etc/default_courses.xml
deleted file mode 100644 (file)
index c450d20..0000000
--- a/etc/default_courses.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<teleoddcast>
-    <url>http://localhost</url>
-    <title>School Example</title>
-    <port>8000</port>
-    <department>
-        <name>Audio</name>
-        <conferences>
-            <conference>
-                <name>Conference 1</name>
-            </conference>
-            <conference>
-                <name>Conference 2</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Computer</name>
-        <conferences>
-            <conference>
-                <name>Conference 1</name>
-            </conference>
-            <conference>
-                <name>Conference 2</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Physics</name>
-        <conferences>
-            <conference>
-                <name>Conference 1</name>
-            </conference>
-            <conference>
-                <name>Conference 2</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Sociology</name>
-        <conferences>
-            <conference>
-                <name>Conference 1</name>
-            </conference>
-            <conference>
-                <name>Conference 1</name>
-            </conference>
-        </conferences>
-    </department>
-</teleoddcast>

diff --git a/etc/pre-barreau_courses.xml b/etc/pre-barreau_courses.xml
deleted file mode 100644 (file)
index f0b17ac..0000000
--- a/etc/pre-barreau_courses.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<teleoddcast>
-    <url>http://augustins.pre-barreau.com</url>
-    <title>Augustins - Pré-Barreau</title>
-    <port>8000</port>
-    
-    <department>
-        <name>CRFPA</name>
-        <conferences>
-            <conference>
-                <name>Liberté publiques - Cours</name>
-            </conference>
-            <conference>
-                <name>Note de synthèse - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédure administrative et contentieuse - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédure administrative et contentieuse - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédure civile - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédure civile - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédure pénale - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédure pénale - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit commercial des affaires - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit commercial des affaires - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit communautaire et européen - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit communautaire et européen - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit fiscal - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit fiscal - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit pénal - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit pénal - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit de la famille et des personnes - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit de la famille et des personnes - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit patrimonial - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit patrimonial - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit du travail - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit du travail - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit administratif - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit administratif - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit public des activités économiques - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit public des activités économiques - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit international privé - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit international privé - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédures collectives et sûretés - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédures collectives et sûretés - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédure communautaire - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédures civile d'exécution - Cours</name>
-            </conference>
-            <conference>
-                <name>Comptabilité privée - Cours</name>
-            </conference>
-            <conference>
-                <name>Finances publiques - Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>AE</name>
-        <conferences>
-            <conference>
-                <name>Administratif_Cours</name>
-            </conference>
-            <conference>
-                <name>Adm_Correction</name>
-            </conference>
-            <conference>
-                <name>Civil_Correction</name>
-            </conference>
-            <conference>
-                <name>Commercial_Correctio</name>
-            </conference>
-            <conference>
-                <name>Commercial_Cours</name>
-            </conference>
-            <conference>
-                <name>Deontologie_Cours</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Cours</name>
-            </conference>
-            <conference>
-                <name>Methodo_Oraux</name>
-            </conference>
-            <conference>
-                <name>Penal_Correction</name>
-            </conference>
-            <conference>
-                <name>Penal_Cours</name>
-            </conference>
-            <conference>
-                <name>Procedures_Cours</name>
-            </conference>
-            <conference>
-                <name>Reunion_info</name>
-            </conference>
-            <conference>
-                <name>Social_Corrections</name>
-            </conference>
-            <conference>
-                <name>Social_Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>ENM</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-                
-
-    <department>
-        <name>FJP</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-
-</teleoddcast>

diff --git a/etc/teleoddcast.cfg b/etc/teleoddcast.cfg
index e5695ab1ab1d06e35843e3a08b7581f06aae3bd1..2da2913cd1b944004204e617c4bb57cc3a4a9ce7 100644 (file)
--- a/etc/teleoddcast.cfg
+++ b/etc/teleoddcast.cfg
@@ -1,7 +1,7 @@
 Server=localhost
 Port=8000
 ServerPassword=source2parisson
-ServerMountpoint=/Default_School_-_Computer_-_Conference_1.ogg
+ServerMountpoint=/Default_School_-_Computer_-_Conference_2.ogg
 ServerPublic=0
 AutomaticReconnectSecs=10
 Encode=OggVorbis
@@ -10,11 +10,11 @@ NumberChannels=1
 OggQuality=1
 Samplerate=44100
 ServerType=Icecast2
-ExternalFile=/home/pre-barreau/augustins/audio/
+ExternalFile=/tmp
 #YP Settings
 ServerStreamURL=http://www.pre-barreau.com
-ServerName=Default_School_-_Computer_-_Conference_1
-ServerDescription=Default_School_-_Computer_-_Conference_1_-_1_-_azefdoj_-_azef
+ServerName=Default_School_-_Computer_-_Conference_2
+ServerDescription=Default_School_-_Computer_-_Conference_2_-_2_-_azfpoh_-_opij
 ServerGenre=Teaching
 #Advanced Settings
 LogLevel=1

diff --git a/teleoddcast.py b/teleoddcast.py
index 230cb8d64bed533c7f32223962433c062c8995d8..65071062a35406efeb34ada174723ae306093652 100755 (executable)
--- a/teleoddcast.py
+++ b/teleoddcast.py
@@ -188,11 +188,8 @@ class Station(Conference):
         args = ' '.join(args)
         command = 'sox "%s" -q -w -r 44100 -t wav -c2 - | lame %s -' \
                        % (source, args)
-        
         # Processing (streaming + cache writing)
-        e = ExporterCore()
-        stream = e.core_process(self.command,self.buffer_size,self.dest)
-
+        stream = self.core_process(self.command,self.buffer_size,self.dest)
         for chunk in stream:
             yield chunk
     
@@ -209,7 +206,6 @@ class Station(Conference):
                     close_fds = True)
         except:
             raise ExportProcessError('Command failure:', command, proc)
-            
         # Core processing
         while True:
             __chunk = proc.stdout.read(buffer_size)
@@ -221,7 +217,8 @@ class Station(Conference):
             yield __chunk
             file_out.write(__chunk)
         file_out.close()
-        
+
+
 class WebView:
     """Gives the web CGI frontend"""
     
@@ -239,10 +236,10 @@ class WebView:
 
     def header(self):
         # Required header that tells the browser how to render the HTML.
-        print "Content-Type: text/html\n\n"
+        print "Content-Type: text/html\n"
         print "<HTML>"
         print "<HEAD>"
-        print "\t<TITLE>"+self.title+"</TITLE>"
+        print "<TITLE>TeleOddCast - "+self.title+"</TITLE>"
         print "<link href=\"css/teleoddcast.css\" rel=\"stylesheet\" type=\"text/css\">"
         print '<script language="Javascript" type="text/javascript" >'
         print 'function choix(formulaire)'
@@ -250,7 +247,6 @@ class WebView:
         print 'if (i == 0)'
         print   'for(j = 1; j < '+ str(self.len_departments) + '; j++)'
         print      'formulaire.conference.options[j].text="";'
-        #print      'formulaire.conference.options[j].value="";'
         print 'else{'
         print '   switch (i){'
         for k in range(0, self.len_departments):
@@ -274,7 +270,7 @@ class WebView:
         print "<BODY BGCOLOR =\"#FFFFFF\">"
         print "<div id=\"bg\">"
         print "<div id=\"header\">"
-        print "\t<H3>&nbsp;TeleOddCast - L'enregistrement et la diffusion audio en direct par internet</H3>"
+        print "<H3>&nbsp;TeleOddCast - L'enregistrement et la diffusion audio en direct par internet</H3>"
         print "</div>"
 
     def colophon(self):
@@ -291,41 +287,35 @@ class WebView:
     def start_form(self):
         self.header()
         print "<div id=\"main\">"
-        print "\t<h5><span style=\"color: red\">Attention, il est important de remplir tous les champs, y compris le commentaire !</span></h5>"
-        print "\t<TABLE BORDER = 0>"
-        print "\t\t<form method=post action=\"teleoddcast.py\" name=\"formulaire\">"
-        print "\t\t<TR><TH align=\"left\">Titre :</TH><TD>"+self.title+"</TD></TR>"
-        
-        print "\t\t<TR><TH align=\"left\">D&eacute;partement :</TH>"
+        print "<h5><span style=\"color: red\">Attention, il est important de remplir tous les champs, y compris le commentaire !</span></h5>"
+        print "<TABLE BORDER = 0>"
+        print "<form method=post action=\"teleoddcast.py\" name=\"formulaire\">"
+        print "<TR><TH align=\"left\">Titre :</TH><TD>"+self.title+"</TD></TR>"
+        print "<TR><TH align=\"left\">D&eacute;partement :</TH>"
         print "<TD><select name=\"department\" onChange=\"choix(this.form)\">"
         print "<option selected>...........Choisissez un d&eacute;partement...........</option>"
         for department in self.departments:
             print "<option value=\""+department['name']+"\">"+department['name']+"</option>"
         print "</select></TD></TR>"
-        
-        print "\t\t<TR><TH align=\"left\">Intitul&eacute; du cours :</TH>"
+        print "<TR><TH align=\"left\">Conf&eacute;rence :</TH>"
         print "<TD><select name=\"conference\">"
-        print "<option selected>...........Choisissez un intitul&eacute;...........</option>"
+        print "<option selected>...........Choisissez une conf&eacute;rence...........</option>"
         for i in range(1,self.conference_nb_max):
             print "<option></option>"
         print "</select></TD></TR>"
-
-        print "\t\t<TR><TH align=\"left\">Session :</TH><TD><select name=\"session\">"
+        print "<TR><TH align=\"left\">Session :</TH><TD><select name=\"session\">"
         for i in range(1,21):
             print "<option value=\""+str(i)+"\">"+str(i)+"</option>"
         print "</select></TD></TR>"
-
-        print "\t\t<TR><TH align=\"left\">Professeur :</TH><TD><INPUT type = text name = \"professor\"></TD><TR>"
-
-        print "\t\t<TR><TH align=\"left\">Commentaire :</TH><TD><INPUT type = text name = \"comment\"></TD></TR>"
-
-        print "\t</TABLE>"
+        print "<TR><TH align=\"left\">Professeur :</TH><TD><INPUT type = text name = \"professor\"></TD><TR>"
+        print "<TR><TH align=\"left\">Commentaire :</TH><TD><INPUT type = text name = \"comment\"></TD></TR>"
+        print "</TABLE>"
         print "<h5><a href=\""+self.url+":"+self.port+"/augustins.pre-barreau.com_live.ogg.m3u\">Cliquez ici pour &eacute;couter le flux continu 24/24 en direct</a></h5>"
         print "</div>"
         print "<div id=\"tools\">"
-        print "\t<INPUT TYPE = hidden NAME = \"action\" VALUE = \"start\">"
-        print "\t<INPUT TYPE = submit VALUE = \"Start\">"
-        print "\t</FORM>"
+        print "<INPUT TYPE = hidden NAME = \"action\" VALUE = \"start\">"
+        print "<INPUT TYPE = submit VALUE = \"Start\">"
+        print "</FORM>"
         print "</div>"
         self.colophon()
         self.footer()
@@ -341,26 +331,26 @@ class WebView:
 
         self.header()
         print "<div id=\"main\">"
-        print "\t<h4><span style=\"color: red\">Cette formation est en cours de diffusion :</span></h4>"
+        print "<h4><span style=\"color: red\">Cette formation est en cours de diffusion :</span></h4>"
         print "<hr>"
-        print "\t<TABLE BORDER = 0>"
-        print "\t\t<FORM METHOD = post ACTION = \"teleoddcast.py\">"
-        print "\t\t<TR><TH align=\"left\">Titre :</TH><TD>"+self.title+"</TD></TR>"
-        print "\t\t<TR><TH align=\"left\">D&eacute;partement :</TH><TD>"+department+"</TD><TR>"
-        print "\t\t<TR><TH align=\"left\">Intitul&eacute; du cours :</TH><TD>"+conference+"</TD><TR>"
-        print "\t\t<TR><TH align=\"left\">Session :</TH><TD>"+session+"</TD><TR>"
-        print "\t\t<TR><TH align=\"left\">Professeur :</TH><TD>"+professor+"</TD><TR>"
-        print "\t\t<TR><TH align=\"left\">Commentaire :</TH><TD>"+comment+"</TD><TR>"
-        print "\t</TABLE>"
+        print "<TABLE BORDER = 0>"
+        print "<FORM METHOD = post ACTION = \"teleoddcast.py\">"
+        print "<TR><TH align=\"left\">Titre :</TH><TD>"+self.title+"</TD></TR>"
+        print "<TR><TH align=\"left\">D&eacute;partement :</TH><TD>"+department+"</TD><TR>"
+        print "<TR><TH align=\"left\">Conference :</TH><TD>"+conference+"</TD><TR>"
+        print "<TR><TH align=\"left\">Session :</TH><TD>"+session+"</TD><TR>"
+        print "<TR><TH align=\"left\">Professeur :</TH><TD>"+professor+"</TD><TR>"
+        print "<TR><TH align=\"left\">Commentaire :</TH><TD>"+comment+"</TD><TR>"
+        print "</TABLE>"
         print "<hr>"
         print "<h5><a href=\""+self.url+":"+self.port+"/"+clean_string(self.title) + \
               "_-_"+clean_string(department)+"_-_"+clean_string(conference) + \
               ".ogg.m3u\">Cliquez ici pour &eacute;couter cette formation en direct</a></h5>"
         print "</div>"
         print "<div id=\"tools\">"
-        print "\t<INPUT TYPE = hidden NAME = \"action\" VALUE = \"stop\">"
-        print "\t<INPUT TYPE = submit VALUE = \"Stop\">"
-        print "\t</FORM>"
+        print "<INPUT TYPE = hidden NAME = \"action\" VALUE = \"stop\">"
+        print "<INPUT TYPE = submit VALUE = \"Stop\">"
+        print "</FORM>"
         print "</div>"
         self.colophon()
         self.footer()