* Add professor list

diff --git a/etc/localhost.xml b/etc/localhost.xml
new file mode 100644 (file)
index 0000000..91384de
--- /dev/null
+++ b/etc/localhost.xml
@@ -0,0 +1,204 @@
+<teleoddcast>
+    <url>http://localhost</url>
+    <title>Augustins - Pre-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/pre-barreau_conferences.xml b/etc/pre-barreau_conferences.xml
index afc7324da62158bd10677cc09f980ff708048617..bba08a57f6d2388007a7c9e3a4c9b69b5eb4a8fa 100644 (file)
--- a/etc/pre-barreau_conferences.xml
+++ b/etc/pre-barreau_conferences.xml
@@ -1,6 +1,6 @@
 <telecaster>
     <url>http://localhost</url>
-    <title>Default School</title>
+    <title>Pre-Barreau - ICP</title>
     <port>8000</port>
     <format>mp3</format>
     
@@ -106,8 +106,8 @@
           <conference>
             <name>TEST</name>
           </conference>
-
         </conferences>
+        
     </department>
 
     <department>
@@ -189,5 +189,72 @@
         </conferences>
     </department>
 
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+      
 </telecaster>
 

diff --git a/etc/telecaster_mp3.cfg b/etc/telecaster_mp3.cfg
new file mode 100644 (file)
index 0000000..87ae267
--- /dev/null
+++ b/etc/telecaster_mp3.cfg
@@ -0,0 +1,23 @@
+Server=localhost
+Port=8000
+ServerPassword=source2parisson
+ServerMountpoint=/Pre-Barreau_-_ICP_-_CRFPA_-_Droit_civil_Corrections.mp3
+ServerPublic=0
+AutomaticReconnectSecs=10
+Encode=MP3 Lame
+BitrateNominal=64
+NumberChannels=1
+Samplerate=44100
+ServerType=Icecast2
+ExternalFile=/tmp
+#YP Settings
+ServerStreamURL=http://www.pre-barreau.com
+ServerName=Pre-Barreau_-_ICP_-_CRFPA_-_Droit_civil_Corrections
+ServerDescription=Pre-Barreau_-_ICP_-_CRFPA_-_Droit_civil_Corrections_-_2_-_GIUSTINIANI_G._-_lkh
+ServerGenre=Teaching
+#Advanced Settings
+LogLevel=1
+LogFile=oddcastv3.log
+SaveAsWAV=0
+OutputControl=SERVER,GENERAL,OUTPUT
+

diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
new file mode 100644 (file)
index 0000000..63ceee6
--- /dev/null
+++ b/etc/telecaster_mp3.xml
@@ -0,0 +1,30 @@
+<telecaster>
+    <infos>
+        <short_name>Pre-Barreau - ICP</short_name>
+        <name>Pre-Barreau - ICP</name>
+        <description>La preparation au Barreau de Paris</description>
+        <url>http://pre-barreau.com</url>
+        <genre>Other</genre>
+        <channels>1</channels>
+    </infos>
+    <server>
+        <host>localhost</host>
+        <port>8000</port>
+        <sourcepassword>source2parisson</sourcepassword>
+        <public>0</public>
+        <root_dir>/var/www/telecaster/</root_dir>
+        <odd_conf_file>etc/telecaster_mp3.cfg</odd_conf_file>
+        <lock_file>lock/telecaster.lock</lock_file>
+        <rsync_host>localhost/tmp/</rsync_host>
+    </server>
+    <media>
+        <record>true</record>
+        <dir>/tmp/media</dir>
+        <format>mp3</format>
+        <bitrate>64</bitrate>
+        <ogg_quality>2</ogg_quality>
+        <samplerate>44100</samplerate>
+        <voices>2</voices>
+        <shuffle>1</shuffle>
+    </media>
+</telecaster>

diff --git a/telecaster.py b/telecaster.py
index a792e18df278d9f5624ed466fbb4fa4e38b1a996..1b5436dcd03b01e7f6be44ed609681718812cf95 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -262,10 +262,13 @@ class WebView:
         self.format = self.conf['format']
         self.title = self.conf['title']
         self.departments = self.conf['department']
+        self.professors = self.conf['professor']
         #print self.departments
         #self.conferences = self.conf['department']['conferences']
         self.len_departments = len(self.departments)
+        self.len_professors = len(self.professors)
         self.conference_nb_max = 40
+        self.professor_nb_max = 40
 
     def header(self):
         # Required header that tells the browser how to render the HTML.
@@ -341,7 +344,12 @@ class WebView:
         for i in range(1,21):
             print "<option value=\""+str(i)+"\">"+str(i)+"</option>"
         print "</select></TD></TR>"
-        print "<TR><TH align=\"left\">Professeur :</TH><TD><INPUT type = text name = \"professor\"></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 "<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."+self.format+".m3u\">Cliquez ici pour &eacute;couter le flux continu 24/24 en direct</a></h5>"