begin to add deefuzzer, NOT tested

diff --git a/README b/README
index 92390fc7d53d6bbbeeb1998375bd1ef365b3d0bd..e4ee4b15be603a9bcd816f5a9affa81a08213883 100644 (file)
--- a/README
+++ b/README
@@ -46,7 +46,7 @@ DEPENDS
 ========
 
 required : python, icecast2, apache2, jackd, edcast-jack (=3.1.7), vorbis-tools,
-           python-mutagen, streamrippper, procps
+           deefuzzer, python-mutagen, streamrippper, procps
 
 optional : lame
 

diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index aae79ea51c5364958ec038e3a0379bbae3f7f317..58537f2e617759ec72edc0b0ed6681c90e6976e6 100644 (file)
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.xml
@@ -4,14 +4,14 @@
         <name>Pre-Barreau</name>
         <description>La preparation au Barreau de Paris</description>
         <url>http://telecaster-04.parisson.com</url>
-        <genre>Other</genre>
+        <genre>Vocal</genre>
     </infos>
     <server>
         <host>stream.pre-barreau.com</host>
         <port>8000</port>
         <sourcepassword>source2parisson</sourcepassword>
         <public>0</public>
-        <root_dir>/var/www/telecaster/</root_dir>
+        <deefuzzer_conf>/etc/telecaster/deefuzzer.xml</deefuzzer_conf>
         <rss>
             <dir>/var/www/rss/</dir>
         </rss>

diff --git a/station.py b/station.py
index a10cf9d03392df3e9cc96f7e40dfbe090f0e56f0..71b1f7bd5427ad92e344baa63f472c4cf571b02c 100644 (file)
--- a/station.py
+++ b/station.py
@@ -79,8 +79,10 @@ class Station(Conference):
         self.time = datetime.datetime.now().strftime("%x-%X")
         self.time_txt = self.time.replace('/','_').replace(':','_').replace(' ','_')
         self.conf = xml2dict(conf_file)
+        self.lock_file = lock_file
         self.conf = self.conf['telecaster']
-        self.root_dir = self.conf['server']['root_dir']
+        self.user = os.get_login()
+        self.user_dir = '/home/' + self.user + '.telecaster'
         self.url_ext = self.conf['infos']['url']
         self.media_dir = self.conf['media']['dir']
         self.host = self.conf['server']['host']
@@ -89,7 +91,8 @@ class Station(Conference):
         self.rss_file = 'telecaster.xml'
         self.password = self.conf['server']['sourcepassword']
         self.url_int = 'http://'+self.host+':'+self.port
-        self.odd_conf_file = self.conf['server']['odd_conf_file']
+        self.deefuzzer_default_conf_file = self.conf['server']['deefuzzer_dict']
+        self.deefuzzer_user_file = self.user + os.sep + 'deefuzzer.xml'
         self.bitrate = self.conf['media']['bitrate']
         self.dict['Bitrate'] = str(self.bitrate) + ' kbps'
         self.ogg_quality = self.conf['media']['ogg_quality']
@@ -101,28 +104,27 @@ class Station(Conference):
         self.ServerName = clean_string('_-_'.join(self.server_name))
         self.mount_point = '/' + clean_string(self.title) + '_-_' + \
                                  clean_string(self.department) + '_-_' + \
-                                 clean_string(self.conference)+'.'+self.format
-        self.lock_file = self.root_dir + os.sep + self.conf['server']['lock_file']
+                                 clean_string(self.conference)
         self.filename = clean_string('_-_'.join(self.description[1:])) + '_-_' + self.time_txt + '.' + self.format
         self.output_dir = self.media_dir + os.sep + self.department + os.sep + self.date
         self.file_dir = self.output_dir + os.sep + self.ServerName
         self.uid = os.getuid()
         self.odd_pid = get_pid('^edcast_jack\ -n', self.uid)
-        self.rip_pid = get_pid('streamripper ' + self.url_int + self.mount_point, self.uid)
+        self.deefuzzer_pid = get_pid('deefuzzer', self.uid)
         self.new_title = clean_string('_-_'.join(self.server_name)+'_-_'+self.session+'_-_'+self.professor+'_-_'+self.comment)
         self.short_title = clean_string('_-_'.join(self.conference)+'_-_'+self.session+'_-_'+self.professor+'_-_'+self.comment)
         self.genre = 'Vocal'
         self.encoder = 'TeleCaster by Parisson'
         self.rsync_host = self.conf['server']['rsync_host']
         self.record = str_to_bool(self.conf['media']['record'])
-        self.raw_dir = self.conf['media']['raw_dir']
+        self.rec_dir = self.conf['media']['rec_dir']
         self.user = os.get_login()
         self.user_dir = '/home/' + self.user + '.telecaster'
 
         if not os.path.exists(self.media_dir):
             os.makedirs(self.media_dir)
-        if not os.path.exists(self.raw_dir):
-            os.makedirs(self.raw_dir)
+        if not os.path.exists(self.rec_dir):
+            os.makedirs(self.rec_dir)
 
         self.jack_inputs = []
         if 'jack' in self.conf:
@@ -133,55 +135,40 @@ class Station(Conference):
             else:
                 self.jack_inputs.append(jack_inputs['name'])
 
-    def set_oddcast_conf(self):
-        #oddconf_temp = NamedTemporaryFile(suffix='.cfg')
-        oddconf = open(self.odd_conf_file,'r')
-        lines = oddconf.readlines()
-        oddconf.close()
-        newlines = []
-        for line in lines:
-            if 'ServerDescription' in line.split('='):
-                newlines.append('ServerDescription=' + \
-                                self.ServerDescription.replace(' ','_') + '\n')
-
-            elif 'ServerName' in line.split('='):
-                newlines.append('ServerName=' + self.ServerName + '\n')
-
-            elif 'ServerMountpoint' in line.split('='):
-                newlines.append('ServerMountpoint=' + self.mount_point + '\n')
-
-            elif 'ServerPassword' in line.split('='):
-                newlines.append('ServerPassword=' + self.password + '\n')
-
-            elif 'SaveDirectory' in line.split('='):
-                newlines.append('SaveDirectory=' + self.raw_dir + '\n')
-            elif 'NumberChannels' in line.split('='):
-                newlines.append('NumberChannels=' + str(len(self.jack_inputs)) + '\n')
-            elif 'BitrateNominal' in line.split('='):
-                newlines.append('BitrateNominal=' + str(self.bitrate) + '\n')
-            elif 'OggQuality' in line.split('='):
-                newlines.append('OggQuality=' + str(self.ogg_quality) + '\n')
-            else:
-                newlines.append(line)
-
-        odd_conf_file = self.user_dir + os.sep + self.title+'.cfg'
-        oddconf = open(odd_conf_file,'w')
-        oddconf.writelines(newlines)
-        oddconf.close()
-        self.odd_conf = odd_conf_file
-
-    def start_oddcast(self):
-        if not self.jack_inputs:
-            jack.attach('telecaster')
-            for jack_input in jack.get_ports():
-                if 'system' in jack_input and 'capture' in jack_input.split(':')[1] :
-                    self.jack_inputs.append(jack_input)
-        jack_ports = ' '.join(self.jack_inputs)
-        command = 'edcast_jack -n "'+clean_string(self.conference)[0:16]+'" -c "'+self.odd_conf+ \
-                  '" '+ jack_ports + ' > /dev/null &'
+    def set_deefuzzer_dict(self):
+        conf_file = open(self.deefuzzer_default_conf_file,'r')
+        xml_data = conf_file.read()
+        deefuzzer_dict.close()
+        deefuzzer_dict = xml2dict(xml_data)
+
+        deefuzzer_dict['deefuzzer']['station']['infos']['short_name'] = self.mount_point
+        deefuzzer_dict['deefuzzer']['station']['infos']['name'] = self.ServerName
+        deefuzzer_dict['deefuzzer']['station']['infos']['description'] = self.ServerDescription.replace(' ','_')
+        deefuzzer_dict['deefuzzer']['server']['host'] = self.host
+        deefuzzer_dict['deefuzzer']['server']['port'] = self.port
+        deefuzzer_dict['deefuzzer']['server']['password'] = self.password
+        deefuzzer_dict['deefuzzer']['media']['bitrate'] = self.bitrate
+        deefuzzer_dict['deefuzzer']['media']['voices'] = str(len(self.jack_inputs))
+        deefuzzer_dict['deefuzzer']['record']['mode'] = '1'
+        deefuzzer_dict['deefuzzer']['record']['dir'] = self.rec_dir
+        deefuzzer_dict['deefuzzer']['relay']['mode'] = '1'
+
+        deefuzzer_xml = dicttoxml(deefuzzer_dict)
+        conf_file = open(self.deefuzzer_user_file,'w')
+        conf_file.write(deefuzzer_xml)
+        conf_file.close()
+
+    def start_deefuzzer(self):
+        #if not self.jack_inputs:
+            #jack.attach('telecaster')
+            #for jack_input in jack.get_ports():
+                #if 'system' in jack_input and 'capture' in jack_input.split(':')[1] :
+                    #self.jack_inputs.append(jack_input)
+        #jack_ports = ' '.join(self.jack_inputs)
+
+        command = 'deefuzzer ' + self.deefuzzer_user_file + ' &'
         os.system(command)
         self.set_lock()
-        time.sleep(1)
 
     def set_lock(self):
         lock = open(self.lock_file,'w')
@@ -193,30 +180,23 @@ class Station(Conference):
     def del_lock(self):
         os.remove(self.lock_file)
 
-    def start_rip(self):
-        if not os.path.exists(self.output_dir):
-            os.makedirs(self.output_dir)
-        command = 'streamripper ' + self.url_int + self.mount_point + \
-                  ' -d '+self.output_dir+' -D \"%S\" -s -t --quiet > /dev/null &'
-        os.system(command)
-        time.sleep(1)
-
-    def stop_oddcast(self):
-        if len(self.odd_pid) != 0:
-            os.system('kill -9 '+self.odd_pid[0])
-
-    def stop_rip(self):
-        if len(self.rip_pid) != 0:
-            os.system('kill -9 ' + self.rip_pid[0])
-        time.sleep(1)
-        date = datetime.datetime.now().strftime("%Y")
-        if os.path.exists(self.file_dir) and os.path.exists(self.file_dir + os.sep + 'incomplete'):
-            try:
-                shutil.move(self.file_dir+os.sep+'incomplete'+os.sep+' - .'+self.format, self.file_dir+os.sep)
-                os.rename(self.file_dir+os.sep+' - .'+self.format, self.file_dir+os.sep+self.filename)
-                shutil.rmtree(self.file_dir+os.sep+'incomplete'+os.sep)
-            except:
-                pass
+    def stop_deefuzzer(self):
+        if len(self.deefuzzer_pid) != 0:
+            os.system('kill -9 '+self.deefuzzer_pid[0])
+
+    def stop_rec(self):
+        pass
+        #if len(self.rip_pid) != 0:
+            #os.system('kill -9 ' + self.rip_pid[0])
+        #time.sleep(1)
+        #date = datetime.datetime.now().strftime("%Y")
+        #if os.path.exists(self.file_dir) and os.path.exists(self.file_dir + os.sep + 'incomplete'):
+            #try:
+                #shutil.move(self.file_dir+os.sep+'incomplete'+os.sep+' - .'+self.format, self.file_dir+os.sep)
+                #os.rename(self.file_dir+os.sep+' - .'+self.format, self.file_dir+os.sep+self.filename)
+                #shutil.rmtree(self.file_dir+os.sep+'incomplete'+os.sep)
+            #except:
+                #pass
 
     def mp3_convert(self):
         os.system('oggdec -o - '+ self.file_dir+os.sep+self.filename+' | lame -S -m m -h -b '+ self.bitrate + \
@@ -259,14 +239,13 @@ class Station(Conference):
 
     def start(self):
         self.set_lock()
-        self.set_oddcast_conf()
-        self.start_oddcast()
-        self.start_rip()
-        self.update_rss()
+        self.set_deefuzzer_conf()
+        self.start_deefuzzer()
+        #self.update_rss()
 
     def stop(self):
-        self.stop_rip()
-        self.stop_oddcast()
+        self.stop_rec()
+        self.stop_deefuzzer()
         if self.format == 'ogg':
             self.write_tags_ogg()
         elif self.format == 'mp3':
@@ -275,49 +254,6 @@ class Station(Conference):
         #self.mp3_convert()
         #self.rsync_out()
 
-    def start_mp3cast(self):
-        item_id = item_id
-        source = source
-        metadata = metadata
-        args = get_args(options)
-        ext = get_file_extension()
-        args = ' '.join(args)
-        command = 'sox "%s" -q -w -r 44100 -t wav -c2 - | lame %s -' % (source, args)
-        # Processing (streaming + cache writing)
-        stream = self.core_process(self.command,self.buffer_size,self.dest)
-        for chunk in stream:
-            yield chunk
-
-    def core_process(self, command, buffer_size, dest):
-        """Encode and stream audio data through a generator"""
-        __chunk = 0
-        file_out = open(dest,'w')
-        try:
-            proc = subprocess.Popen(command,
-                    shell = True,
-                    bufsize = buffer_size,
-                    stdin = subprocess.PIPE,
-                    stdout = subprocess.PIPE,
-                    close_fds = True)
-        except:
-            raise ExportProcessError('Command failure:', command, proc)
-        # Core processing
-        while True:
-            __chunk = proc.stdout.read(buffer_size)
-            status = proc.poll()
-            if status != None and status != 0:
-                raise ExportProcessError('Command failure:', command, proc)
-            if len(__chunk) == 0:
-                break
-            yield __chunk
-            file_out.write(__chunk)
-        file_out.close()
-
-    def rsync_out(self):
-        local_uname = os.uname()
-        hostname = local_uname[1]
-        os.system('rsync -a '+self.media_dir+os.sep+' '+self.rsync_host+':'+os.sep+hostname+os.sep)
-
     def update_rss(self):
         rss_item_list = []
         if not os.path.exists(self.rss_dir):

diff --git a/telecaster.py b/telecaster.py
index 88656bf2a105434e4bea54a0209e5a6e8a351127..89233118d084dcc6925292acf9b397abfd40468a 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -35,13 +35,12 @@
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 """
 
-version = '0.3.9'
+version = '0.4.0'
 
 
 import os
 import cgi
 import cgitb
-import shutil
 import time
 from tools import *
 from webview import *
@@ -53,15 +52,12 @@ class TeleCaster:
     """Manage the calls of Station and Webview to get the network and
     disk streams"""
 
-    def __init__(self, conf_file, school_file):
+    def __init__(self, conf_file, session_file):
         """Main function"""
         self.conf_file = conf_file
-        self.school_file = school_file
-        conf_t = xml2dict(self.conf_file)
-        self.conf = conf_t['telecaster']
-        self.title = self.conf['infos']['name']
-        self.root_dir = self.conf['server']['root_dir']
-        self.lock_file = self.root_dir + os.sep + self.conf['server']['lock_file']
+        self.session_file = session_file
+        conf_dict = xml2dict(self.conf_file)
+        self.conf = conf_dict['telecaster']
         self.title = self.conf['infos']['name']
         self.uid = os.getuid()
         self.url = self.conf['infos']['url']
@@ -69,17 +65,16 @@ class TeleCaster:
         self.user_dir = '/home/' + self.user + '.telecaster'
         if not os.path.exists(self.user_dir):
             os.makedirs(self.user_dir)
+        self.lock_file = self.user_dir + os.sep + 'telecaster.lock'
 
     def main(self):
-        odd_pid = get_pid('^edcast_jack\ -n', self.uid)
-        rip_pid = get_pid('streamripper ', self.uid)
-        writing = False
-        casting = False
-        writing = rip_pid != []
-        casting = odd_pid != []
-        form = WebView(self.school_file, self.url, version)
-
-        if odd_pid == [] and form.has_key("action") and \
+        edcast_pid = get_pid('^edcast_jack\ -n', self.uid)
+        deefuzzer_pid = get_pid('deefuzzer', self.uid)
+        writing = deefuzzer_pid != []
+        casting = edcast_pid != []
+        form = WebView(self.session_file, self.url, version)
+
+        if deefuzzer_pid == [] and form.has_key("action") and \
             form.has_key("department") and form.has_key("conference") and \
             form.has_key("professor") and form.has_key("comment") and \
             form["action"].value == "start":
@@ -91,20 +86,16 @@ class TeleCaster:
                         'professor': form.getfirst("professor"),
                         'comment': form.getfirst("comment")}
 
-            if rip_pid != []:
-                os.system('kill -9 '+rip_pid[0])
-                time.sleep(3)
             s = Station(self.conf_file, self.conference_dict, self.lock_file)
             s.start()
             time.sleep(1)
-            #w.stop_form(self.conference_dict, writing, casting)
             self.main()
 
-        elif odd_pid != [] and os.path.exists(self.lock_file) and not form.has_key("action"):
+        elif deefuzzer_pid != [] and os.path.exists(self.lock_file) and not form.has_key("action"):
             self.conference_dict = get_conference_from_lock(self.lock_file)
             form.stop_form(self.conference_dict, writing, casting)
 
-        elif odd_pid != [] and form.has_key("action") and form["action"].value == "stop":
+        elif deefuzzer_pid and form.has_key("action") and form["action"].value == "stop":
             if os.path.exists(self.lock_file):
                 self.conference_dict = get_conference_from_lock(self.lock_file)
             s = Station(self.conf_file, self.conference_dict, self.lock_file)
@@ -112,15 +103,14 @@ class TeleCaster:
             time.sleep(1)
             self.main()
 
-        elif odd_pid == []:
+        elif deefuzzer_pid == []:
             form.start_form()
 
 
-# Call main function.
 conf_file = '/etc/telecaster/telecaster.xml'
-school_file = '/etc/telecaster/sessions.xml'
+session_file = '/etc/telecaster/sessions.xml'
 
 if __name__ == '__main__':
-    t = TeleCaster(conf_file, school_file)
+    t = TeleCaster(conf_file, session_file)
     t.main()
 

diff --git a/tools/__init__.py b/tools/__init__.py
index 9691d325a871ce2e9ae314c393aeb15ff99b1ba5..8ce7f8b0e76c18332398262038bc2005fdf6ce8d 100644 (file)
--- a/tools/__init__.py
+++ b/tools/__init__.py
@@ -3,3 +3,5 @@ from xmltodict import *
 from tools import *
 from acpi import *
 from PyRSS2Gen import *
+
+