From: yomguy <yomguy@parisson.com>
Date: Mon, 20 Feb 2012 12:36:11 +0000 (+0100)
Subject: fix station record mode, add urls
X-Git-Tag: 0.9~110
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0e34e78f42cc9eabc404e93fd8ffcea20cbcc694;p=telecaster-client.git

fix station record mode, add urls
---

diff --git a/telecaster/htdocs/css/telecaster.css b/telecaster/htdocs/css/telecaster.css
index 510f009..98a3081 100644
--- a/telecaster/htdocs/css/telecaster.css
+++ b/telecaster/htdocs/css/telecaster.css
@@ -230,3 +230,6 @@ table.hardware {
 .icon_trash{
     background-image: url('../images/bin.png');
 }
+.icon_stop{
+    background-image: url('../images/control_stop.png');
+    }
\ No newline at end of file
diff --git a/telecaster/htdocs/js/application.js b/telecaster/htdocs/js/application.js
index 16f4e1c..120b334 100644
--- a/telecaster/htdocs/js/application.js
+++ b/telecaster/htdocs/js/application.js
@@ -155,10 +155,14 @@ function server_status_callback(){
                              var line = res[i];
                              var wrapper = doc.getElementById('status_'+line.id);
                              s = '<td><span class="'+line.class+'">'+line.value+'</span></td>';
-                             wrapper.innerHTML = s
+                             wrapper.innerHTML = s;
                          }
                      },
-                     function(){return false;}
+                     function(){
+                         var wrapper = doc.getElementById('server_status_table_wrapper');
+                         s = '<span class="warning">NOT connected</span>';
+                         wrapper.innerHTML = s;
+                     }
                      );
     };
     refresh();
diff --git a/telecaster/models.py b/telecaster/models.py
index cea73b6..6d20911 100644
--- a/telecaster/models.py
+++ b/telecaster/models.py
@@ -295,16 +295,18 @@ class Station(Model):
             audio.save()
 
     def start(self):
-        self.set_lock()
-        self.deefuzzer_setup()
-        self.deefuzzer_write_conf()
-        self.deefuzzer_start()
+        self.started = True
+#        self.set_lock()
+#        self.deefuzzer_setup()
+#        self.deefuzzer_write_conf()
+#        self.deefuzzer_start()
 
     def stop(self):
-        self.rec_stop()
-        time.sleep(2)
-        self.deefuzzer_stop()
-        self.del_lock()
+        self.started = False
+#        self.rec_stop()
+#        time.sleep(2)
+#        self.deefuzzer_stop()
+#        self.del_lock()
 
 
 class Record(Model):
diff --git a/telecaster/old/station.py b/telecaster/old/station.py
new file mode 100644
index 0000000..b05e628
--- /dev/null
+++ b/telecaster/old/station.py
@@ -0,0 +1,228 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# *-* coding: utf-8 *-*
+"""
+   telecaster
+
+   Copyright (c) 2006-2010 Guillaume Pellerin <yomguy@parisson.org>
+
+# This software is governed by the CeCILL  license under French law and
+# abiding by the rules of distribution of free software.  You can  use,
+# modify and/ or redistribute the software under the terms of the CeCILL
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# "http://www.cecill.info".
+
+# As a counterpart to the access to the source code and  rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty  and the software's author,  the holder of the
+# economic rights,  and the successive licensors  have only  limited
+# liability.
+
+# In this respect, the user's attention is drawn to the risks associated
+# with loading,  using,  modifying and/or developing or reproducing the
+# software by the user in light of its specific status of free software,
+# that may mean  that it is complicated to manipulate,  and  that  also
+# therefore means  that it is reserved for developers  and  experienced
+# professionals having in-depth computer knowledge. Users are therefore
+# encouraged to load and test the software's suitability as regards their
+# requirements in conditions enabling the security of their systems and/or
+# data to be ensured and,  more generally, to use and operate it in the
+# same conditions as regards security.
+
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL license and that you accept its terms.
+
+# Author: Guillaume Pellerin <yomguy@parisson.com>
+
+"""
+
+import os
+import pwd
+import datetime
+import time
+import urllib
+import liblo
+from tools import *
+from mutagen.oggvorbis import OggVorbis
+from mutagen.id3 import ID3, TIT2, TP1, TAL, TDA, TDAT, TDRC, TCO, COM
+#import jack
+
+
+class Conference:
+    """A conference object including metadata"""
+
+    def __init__(self, dict):
+        self.dict = dict
+        self.title = dict['title']
+        self.department = dict['department']
+        self.conference = dict['conference']
+        self.session = dict['session']
+        self.professor = dict['professor']
+        self.comment = dict['comment']
+
+    def get_info(self):
+        return self.title, self.department, self.conference, self.session, self.professor, self.comment
+
+
+class Station(Conference):
+    """Control the Oddcastv3-jack thread which send audio data to the icecast server
+    and the Streamripper thread which write audio on the hard disk"""
+
+    def __init__(self, conf_file, conference_dict, lock_file):
+        Conference.__init__(self, conference_dict)
+        self.date = datetime.datetime.now().strftime("%Y")
+        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.user = pwd.getpwuid(os.getuid())[0]
+        self.user_dir = '/home' + os.sep + self.user + os.sep + '.telecaster'
+        self.rec_dir = self.conf['media']['rec_dir']
+        self.deefuzzer_default_conf_file = self.conf['deefuzzer']['conf']
+        self.deefuzzer_user_file = self.user_dir + os.sep + 'deefuzzer.xml'
+        self.bitrate = self.conf['media']['bitrate']
+        self.dict['Bitrate'] = str(self.bitrate) + ' kbps'
+        self.record = str_to_bool(self.conf['media']['record'])
+        self.rec_dir = self.conf['media']['rec_dir']
+        self.play_dir = self.conf['media']['play_dir']
+        self.ogg_quality = self.conf['media']['ogg_quality']
+        self.format = self.conf['media']['format']
+        self.channels = int(self.conf['media']['channels'])
+        self.description = [self.title, self.department, self.conference, self.session, self.professor, self.comment]
+        self.server_name = [self.title, self.department, self.conference]
+        self.ServerDescription = clean_string('-'.join(self.description))
+        self.ServerName = clean_string('_-_'.join(self.server_name))
+        self.mount_point = self.ServerName
+        self.filename = clean_string('_-_'.join(self.description[1:])) + '-' + self.time_txt + '.' + self.format
+        self.output_dir = self.rec_dir + os.sep + self.date + os.sep + self.department
+        self.file_dir = self.output_dir + os.sep + self.ServerName
+        self.uid = os.getuid()
+        self.odd_pid = get_pid('^edcast_jack', self.uid)
+        self.deefuzzer_pid = get_pid('/usr/bin/deefuzzer '+self.deefuzzer_user_file, 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 = self.conf['infos']['genre']
+        self.encoder = 'TeleCaster by Parisson'
+
+        if not os.path.exists(self.file_dir):
+            os.makedirs(self.file_dir)
+
+        self.jack_inputs = []
+        if 'jack' in self.conf:
+            jack_inputs = self.conf['jack']['input']
+            if len(jack_inputs) > 1:
+                for jack_input in jack_inputs:
+                    self.jack_inputs.append(jack_input['name'])
+            else:
+                self.jack_inputs.append(jack_inputs['name'])
+
+        self.deefuzzer_dict = xml2dict(self.deefuzzer_default_conf_file)
+        self.deefuzzer_osc_ports =  []
+        self.server_ports = []
+        
+        for station in self.deefuzzer_dict['deefuzzer']['station']:
+            if station['control']['mode'] == '1':
+                self.deefuzzer_osc_ports.append(station['control']['port'])
+                self.server_ports.append(station['server']['port'])
+            if station['server']['host'] == 'localhost' or  station['server']['host'] == '127.0.0.1':
+                self.conf['play_port'] = station['server']['port']
+            else:
+                self.conf['play_port'] = '8000'
+
+    def deefuzzer_setup(self):
+        i = 0
+        for station in self.deefuzzer_dict['deefuzzer']['station']:
+            station['infos']['short_name'] = self.mount_point
+            station['infos']['name'] = self.ServerName
+            station['infos']['description'] = self.ServerDescription.replace(' ','_')
+            station['infos']['genre'] = self.genre
+            station['media']['bitrate'] = self.bitrate
+            station['media']['dir'] = self.play_dir
+            station['media']['voices'] = str(len(self.jack_inputs))
+            station['record']['dir'] = self.file_dir
+            station['relay']['mode'] = '1'
+            station['relay']['author'] = self.professor
+            self.deefuzzer_dict['deefuzzer']['station'][i] = station
+            i += 1        
+        self.deefuzzer_xml = dicttoxml(self.deefuzzer_dict)
+
+    def deefuzzer_write_conf(self):
+        conf_file = open(self.deefuzzer_user_file,'w')
+        conf_file.write(self.deefuzzer_xml)
+        conf_file.close()
+
+    def deefuzzer_start(self):
+        command = 'deefuzzer ' + self.deefuzzer_user_file + ' > /dev/null &'
+        os.system(command)
+        self.set_lock()
+
+    def set_lock(self):
+        lock = open(self.lock_file,'w')
+        lock_text = clean_string('_*_'.join(self.description))
+        lock_text = lock_text.replace('\n','')
+        lock.write(lock_text)
+        lock.close()
+
+    def del_lock(self):
+        os.remove(self.lock_file)
+
+    def deefuzzer_stop(self):
+        if len(self.deefuzzer_pid) != 0:
+            os.system('kill -9 '+self.deefuzzer_pid[0])
+
+    def rec_stop(self):
+        if len(self.deefuzzer_pid) != 0:
+            for port in self.deefuzzer_osc_ports:
+                target = liblo.Address(int(port))
+                liblo.send(target, '/record', 0)
+
+    def mp3_convert(self):
+        os.system('oggdec -o - '+ self.file_dir+os.sep+self.filename+' | lame -S -m m -h -b '+ self.bitrate + \
+            ' --add-id3v2 --tt "'+ self.new_title + '" --ta "'+self.professor+'" --tl "'+self.title+'" --ty "'+self.date+ \
+            '" --tg "'+self.genre+'" - ' + self.file_dir+os.sep+self.ServerDescription + '.mp3 &')
+
+    def write_tags_ogg(self):
+       file = self.file_dir + os.sep + self.filename
+       if os.path.exists(file):
+            audio = OggVorbis(file)
+            audio['TITLE'] = self.new_title.decode('utf8')
+            audio['ARTIST'] = self.professor.decode('utf8')
+            audio['ALBUM'] = self.title.decode('utf8')
+            audio['DATE'] = self.date.decode('utf8')
+            audio['GENRE'] = self.genre.decode('utf8')
+            audio['SOURCE'] = self.title.decode('utf8')
+            audio['ENCODER'] = self.encoder.decode('utf8')
+            audio['COMMENT'] = self.comment.decode('utf8')
+            audio.save()
+
+    def write_tags_mp3(self):
+        file = self.file_dir + os.sep + self.filename
+        if os.path.exists(file):
+            os.system('mp3info -t "a" -a "a" '+file)
+            audio = ID3(file)
+            #tag = tags.__dict__['TITLE']
+            audio.add(TIT2(encoding=3, text=self.new_title.decode('utf8')))
+            #tag = tags.__dict__['ARTIST']
+            audio.add(TP1(encoding=3, text=self.professor.decode('utf8')))
+            #tag = tags.__dict__['ALBUM']
+            audio.add(TAL(encoding=3, text=self.title.decode('utf8')))
+            #tag = tags.__dict__['DATE']
+            audio.add(TDRC(encoding=3, text=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
+            #tag = tags.__dict__['GENRE']
+            audio.add(TCO(encoding=3, text=self.genre.decode('utf8')))
+            #tag = tags.__dict__['COMMENT']
+            #audio.add(COM(encoding=3, text=self.comment))
+            audio.save()
+
+    def start(self):
+        self.set_lock()
+        self.deefuzzer_setup()
+        self.deefuzzer_write_conf()
+        self.deefuzzer_start()
+
+    def stop(self):
+        self.rec_stop()
+        time.sleep(2)
+        self.deefuzzer_stop()
+        self.del_lock()
diff --git a/telecaster/station.py b/telecaster/station.py
deleted file mode 100644
index b05e628..0000000
--- a/telecaster/station.py
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# *-* coding: utf-8 *-*
-"""
-   telecaster
-
-   Copyright (c) 2006-2010 Guillaume Pellerin <yomguy@parisson.org>
-
-# This software is governed by the CeCILL  license under French law and
-# abiding by the rules of distribution of free software.  You can  use,
-# modify and/ or redistribute the software under the terms of the CeCILL
-# license as circulated by CEA, CNRS and INRIA at the following URL
-# "http://www.cecill.info".
-
-# As a counterpart to the access to the source code and  rights to copy,
-# modify and redistribute granted by the license, users are provided only
-# with a limited warranty  and the software's author,  the holder of the
-# economic rights,  and the successive licensors  have only  limited
-# liability.
-
-# In this respect, the user's attention is drawn to the risks associated
-# with loading,  using,  modifying and/or developing or reproducing the
-# software by the user in light of its specific status of free software,
-# that may mean  that it is complicated to manipulate,  and  that  also
-# therefore means  that it is reserved for developers  and  experienced
-# professionals having in-depth computer knowledge. Users are therefore
-# encouraged to load and test the software's suitability as regards their
-# requirements in conditions enabling the security of their systems and/or
-# data to be ensured and,  more generally, to use and operate it in the
-# same conditions as regards security.
-
-# The fact that you are presently reading this means that you have had
-# knowledge of the CeCILL license and that you accept its terms.
-
-# Author: Guillaume Pellerin <yomguy@parisson.com>
-
-"""
-
-import os
-import pwd
-import datetime
-import time
-import urllib
-import liblo
-from tools import *
-from mutagen.oggvorbis import OggVorbis
-from mutagen.id3 import ID3, TIT2, TP1, TAL, TDA, TDAT, TDRC, TCO, COM
-#import jack
-
-
-class Conference:
-    """A conference object including metadata"""
-
-    def __init__(self, dict):
-        self.dict = dict
-        self.title = dict['title']
-        self.department = dict['department']
-        self.conference = dict['conference']
-        self.session = dict['session']
-        self.professor = dict['professor']
-        self.comment = dict['comment']
-
-    def get_info(self):
-        return self.title, self.department, self.conference, self.session, self.professor, self.comment
-
-
-class Station(Conference):
-    """Control the Oddcastv3-jack thread which send audio data to the icecast server
-    and the Streamripper thread which write audio on the hard disk"""
-
-    def __init__(self, conf_file, conference_dict, lock_file):
-        Conference.__init__(self, conference_dict)
-        self.date = datetime.datetime.now().strftime("%Y")
-        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.user = pwd.getpwuid(os.getuid())[0]
-        self.user_dir = '/home' + os.sep + self.user + os.sep + '.telecaster'
-        self.rec_dir = self.conf['media']['rec_dir']
-        self.deefuzzer_default_conf_file = self.conf['deefuzzer']['conf']
-        self.deefuzzer_user_file = self.user_dir + os.sep + 'deefuzzer.xml'
-        self.bitrate = self.conf['media']['bitrate']
-        self.dict['Bitrate'] = str(self.bitrate) + ' kbps'
-        self.record = str_to_bool(self.conf['media']['record'])
-        self.rec_dir = self.conf['media']['rec_dir']
-        self.play_dir = self.conf['media']['play_dir']
-        self.ogg_quality = self.conf['media']['ogg_quality']
-        self.format = self.conf['media']['format']
-        self.channels = int(self.conf['media']['channels'])
-        self.description = [self.title, self.department, self.conference, self.session, self.professor, self.comment]
-        self.server_name = [self.title, self.department, self.conference]
-        self.ServerDescription = clean_string('-'.join(self.description))
-        self.ServerName = clean_string('_-_'.join(self.server_name))
-        self.mount_point = self.ServerName
-        self.filename = clean_string('_-_'.join(self.description[1:])) + '-' + self.time_txt + '.' + self.format
-        self.output_dir = self.rec_dir + os.sep + self.date + os.sep + self.department
-        self.file_dir = self.output_dir + os.sep + self.ServerName
-        self.uid = os.getuid()
-        self.odd_pid = get_pid('^edcast_jack', self.uid)
-        self.deefuzzer_pid = get_pid('/usr/bin/deefuzzer '+self.deefuzzer_user_file, 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 = self.conf['infos']['genre']
-        self.encoder = 'TeleCaster by Parisson'
-
-        if not os.path.exists(self.file_dir):
-            os.makedirs(self.file_dir)
-
-        self.jack_inputs = []
-        if 'jack' in self.conf:
-            jack_inputs = self.conf['jack']['input']
-            if len(jack_inputs) > 1:
-                for jack_input in jack_inputs:
-                    self.jack_inputs.append(jack_input['name'])
-            else:
-                self.jack_inputs.append(jack_inputs['name'])
-
-        self.deefuzzer_dict = xml2dict(self.deefuzzer_default_conf_file)
-        self.deefuzzer_osc_ports =  []
-        self.server_ports = []
-        
-        for station in self.deefuzzer_dict['deefuzzer']['station']:
-            if station['control']['mode'] == '1':
-                self.deefuzzer_osc_ports.append(station['control']['port'])
-                self.server_ports.append(station['server']['port'])
-            if station['server']['host'] == 'localhost' or  station['server']['host'] == '127.0.0.1':
-                self.conf['play_port'] = station['server']['port']
-            else:
-                self.conf['play_port'] = '8000'
-
-    def deefuzzer_setup(self):
-        i = 0
-        for station in self.deefuzzer_dict['deefuzzer']['station']:
-            station['infos']['short_name'] = self.mount_point
-            station['infos']['name'] = self.ServerName
-            station['infos']['description'] = self.ServerDescription.replace(' ','_')
-            station['infos']['genre'] = self.genre
-            station['media']['bitrate'] = self.bitrate
-            station['media']['dir'] = self.play_dir
-            station['media']['voices'] = str(len(self.jack_inputs))
-            station['record']['dir'] = self.file_dir
-            station['relay']['mode'] = '1'
-            station['relay']['author'] = self.professor
-            self.deefuzzer_dict['deefuzzer']['station'][i] = station
-            i += 1        
-        self.deefuzzer_xml = dicttoxml(self.deefuzzer_dict)
-
-    def deefuzzer_write_conf(self):
-        conf_file = open(self.deefuzzer_user_file,'w')
-        conf_file.write(self.deefuzzer_xml)
-        conf_file.close()
-
-    def deefuzzer_start(self):
-        command = 'deefuzzer ' + self.deefuzzer_user_file + ' > /dev/null &'
-        os.system(command)
-        self.set_lock()
-
-    def set_lock(self):
-        lock = open(self.lock_file,'w')
-        lock_text = clean_string('_*_'.join(self.description))
-        lock_text = lock_text.replace('\n','')
-        lock.write(lock_text)
-        lock.close()
-
-    def del_lock(self):
-        os.remove(self.lock_file)
-
-    def deefuzzer_stop(self):
-        if len(self.deefuzzer_pid) != 0:
-            os.system('kill -9 '+self.deefuzzer_pid[0])
-
-    def rec_stop(self):
-        if len(self.deefuzzer_pid) != 0:
-            for port in self.deefuzzer_osc_ports:
-                target = liblo.Address(int(port))
-                liblo.send(target, '/record', 0)
-
-    def mp3_convert(self):
-        os.system('oggdec -o - '+ self.file_dir+os.sep+self.filename+' | lame -S -m m -h -b '+ self.bitrate + \
-            ' --add-id3v2 --tt "'+ self.new_title + '" --ta "'+self.professor+'" --tl "'+self.title+'" --ty "'+self.date+ \
-            '" --tg "'+self.genre+'" - ' + self.file_dir+os.sep+self.ServerDescription + '.mp3 &')
-
-    def write_tags_ogg(self):
-       file = self.file_dir + os.sep + self.filename
-       if os.path.exists(file):
-            audio = OggVorbis(file)
-            audio['TITLE'] = self.new_title.decode('utf8')
-            audio['ARTIST'] = self.professor.decode('utf8')
-            audio['ALBUM'] = self.title.decode('utf8')
-            audio['DATE'] = self.date.decode('utf8')
-            audio['GENRE'] = self.genre.decode('utf8')
-            audio['SOURCE'] = self.title.decode('utf8')
-            audio['ENCODER'] = self.encoder.decode('utf8')
-            audio['COMMENT'] = self.comment.decode('utf8')
-            audio.save()
-
-    def write_tags_mp3(self):
-        file = self.file_dir + os.sep + self.filename
-        if os.path.exists(file):
-            os.system('mp3info -t "a" -a "a" '+file)
-            audio = ID3(file)
-            #tag = tags.__dict__['TITLE']
-            audio.add(TIT2(encoding=3, text=self.new_title.decode('utf8')))
-            #tag = tags.__dict__['ARTIST']
-            audio.add(TP1(encoding=3, text=self.professor.decode('utf8')))
-            #tag = tags.__dict__['ALBUM']
-            audio.add(TAL(encoding=3, text=self.title.decode('utf8')))
-            #tag = tags.__dict__['DATE']
-            audio.add(TDRC(encoding=3, text=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
-            #tag = tags.__dict__['GENRE']
-            audio.add(TCO(encoding=3, text=self.genre.decode('utf8')))
-            #tag = tags.__dict__['COMMENT']
-            #audio.add(COM(encoding=3, text=self.comment))
-            audio.save()
-
-    def start(self):
-        self.set_lock()
-        self.deefuzzer_setup()
-        self.deefuzzer_write_conf()
-        self.deefuzzer_start()
-
-    def stop(self):
-        self.rec_stop()
-        time.sleep(2)
-        self.deefuzzer_stop()
-        self.del_lock()
diff --git a/telecaster/templates/telecaster/base.html b/telecaster/templates/telecaster/base.html
index cc73ad9..42524a1 100644
--- a/telecaster/templates/telecaster/base.html
+++ b/telecaster/templates/telecaster/base.html
@@ -13,9 +13,13 @@
 <script src="{% url telecaster-js "application.js" %}" type="text/javascript"></script>
 <script type="text/javascript">
 server_status_callback();
-</script>
 {% endblock javascript %}
 
+{% block extrajavascript %}
+{% endblock extrajavascript %}
+
+</script>
+
 </head>
 <body>
 <div class="bg">
diff --git a/telecaster/templates/telecaster/start.html b/telecaster/templates/telecaster/start.html
index 16fbdd8..636ee96 100644
--- a/telecaster/templates/telecaster/start.html
+++ b/telecaster/templates/telecaster/start.html
@@ -2,9 +2,18 @@
 {% load telecaster_utils %}
 {% load i18n %}
 
+{% block extrajavascript %}
+jQuery(window).ready(function(){
+    var a = jQuery('#_record');
+    var f = jQuery('#_StationForm');
+    a.unbind('click').click(function(){f.submit();return false;});
+    });
+{% endblock extrajavascript %}
+
+
 {% block content %}
 
-<form enctype="multipart/form-data" id="_startStationForm" method="post" action="" name="formulaire">{% csrf_token %}   
+<form enctype="multipart/form-data" id="_StationForm" method="post" action="" name="formulaire">{% csrf_token %}
 <div class="main">
 
 <table class="form">
@@ -28,8 +37,7 @@
 
 {% block buttons %}
 <div class="tools">
-<a class="component_icon button icon_refresh" href="#" >Refresh</a>
-<a class="component_icon button icon_record" href="#">Record</a>
+<a class="component_icon button icon_record" href="#" id="_record">Record</a>
 <a class="component_icon button icon_play" href="http://{{ status.ip }}:{{ station.port }}/{{ station.mount_point }}">Play Live</a>
 <a class="component_icon button icon_archives" href="/archives/">Archives</a>
 <a class="component_icon button icon_trash" href="/trash/">Trash</a>
diff --git a/telecaster/templates/telecaster/stop.html b/telecaster/templates/telecaster/stop.html
index da72e9f..df58aea 100644
--- a/telecaster/templates/telecaster/stop.html
+++ b/telecaster/templates/telecaster/stop.html
@@ -2,49 +2,41 @@
 {% load telecaster_utils %}
 {% load i18n %}
 
-{% block javascript %}
-{{ block.super }}
-<script type="text/javascript">
-function station_status_callback(){
-    var j = json; //global variable
-    var d = _REFRESH_TIME_INTERVAL; //global variable
-    var refresh = function(){
-        var data = j({},"telecaster.get_station_status", function(data){
-            var res = data.result;
-            var doc = document;
-            var tblwrapper = doc.getElementById('station_status_table_wrapper');
-            var s = "<table class='form'><tbody>";
-            for(var i=0; i <res.length; i++){
-                var line = res[i];
-                s+= '<tr id="'+line.id+'"><td>'+line.label+'</td><td><span class="'+line.class+'">'+line.value+'</span></td></tr>';
-            }
-            tblwrapper.innerHTML = s+'</tbody></table>';
-        });
-    };
-    refresh();
-    setInterval(refresh,d);
-};
-station_status_callback();
-</script>
-{% endblock javascript %}
-
+{% block extrajavascript %}
+jQuery(window).ready(function(){
+    var a = jQuery('#_stop');
+    var f = jQuery('#_StationForm');
+    a.unbind('click').click(function(){f.submit();return false;});
+    });
+{% endblock extrajavascript %}
+    
 {% block content %}
 
-<form enctype="multipart/form-data" id="_stopStationForm" method="post" action="" name="formulaire">{% csrf_token %}   
+<form enctype="multipart/form-data" id="_StationForm" method="post" action="" name="formulaire">{% csrf_token %}
 <div class="main">
 
     <div id="station_status_table_wrapper">
-        <!--<table class="form">
+        <table class="form">
 <TR><TH align="left">{% trans "Organization" %}</TH><TD> : </TD><TD>{{ station.organization }}</TD></TR>
 <TR><TH align="left">{% trans "Department" %}</TH><TD> : </TD><TD>{{ station.conference.department }}</TD></TR>
 <TR><TH align="left">{% trans "Conference" %}</TH><TD> : </TD><TD>{{ station.conference }}</TD></TR>
 <TR><TH align="left">{% trans "Session" %}</TH><TD> : </TD><TD>{{ station.session }}</TD></TR>
 <TR><TH align="left">{% trans "Professor" %}</TH><TD> : </TD><TD>{{ station.professor }}</TD></TR>
 <TR><TH align="left">{% trans "Comment" %}</TH><TD> : </TD><TD>{{ station.comment }}</TD></TR>
-        </table>-->
+        </table>
     </div>
 </div>
 
 </form>
         
 {% endblock content %}
+
+{% block buttons %}
+<div class="tools">
+<a class="component_icon button icon_stop" href="#" id="_stop">Stop</a>
+<a class="component_icon button icon_play" href="http://{{ status.ip }}:{{ station.port }}/{{ station.mount_point }}">Play Live</a>
+<a class="component_icon button icon_archives" href="/archives/">Archives</a>
+<a class="component_icon button icon_trash" href="/trash/">Trash</a>
+
+</div>
+{% endblock buttons %}
\ No newline at end of file
diff --git a/telecaster/tools/tools.py b/telecaster/tools/tools.py
index d3b481e..ee2d831 100644
--- a/telecaster/tools/tools.py
+++ b/telecaster/tools/tools.py
@@ -45,7 +45,9 @@ from xmltodict import *
 import socket
 import fcntl
 import struct
+import acpi
 import subprocess
+import pwd
 
 class SubProcessPipe:
     def __init__(self, command, stdin=None):
@@ -161,3 +163,66 @@ def str_to_bool(string):
 
 def norm_string(string):
     pass
+
+
+class Status(object):
+
+    interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2','eth3']
+    acpi_states = {0: 'battery', 1: 'battery', 2: 'AC'}
+
+    def __init__(self):
+        self.acpi = acpi.Acpi()
+        self.uid = os.getuid()
+        self.user = pwd.getpwuid(os.getuid())[0]
+        self.user_dir = '/home' + os.sep + self.user + os.sep + '.telecaster'
+
+    def update(self):
+        self.acpi.update()
+        try:
+            self.temperature = self.acpi.temperature(0)
+        except:
+            self.temperature = 'N/A'
+        self.get_ids()
+        self.get_hosts()
+
+    def to_dict(self):
+        status = [
+          {'id': 'acpi_state','class': 'default', 'value': self.acpi_states[self.acpi.charging_state()], 'label': 'Power'},
+          {'id': 'acpi_percent', 'class': 'default', 'value': str(self.acpi.percent()), 'label': 'Battery Charge'},
+          {'id': 'temperature', 'class': 'default', 'value': self.temperature, 'label': 'Temperature'},
+          {'id': 'jack_state', 'class': 'default', 'value': self.jacking, 'label': 'Jack server'},
+          {'id': 'name', 'class': 'default', 'value': self.name, 'label': 'Name'},
+          {'id': 'ip', 'class': 'default', 'value': self.ip, 'label': 'IP address'},
+          {'id': 'encoder_state','class': 'default', 'value': self.writing, 'label': 'Encoder'},
+          {'id': 'casting', 'class': 'default', 'value': self.casting, 'label': 'Broadcasting'},
+          {'id': 'writing', 'class': 'default', 'value': self.writing, 'label': 'Recording'},
+          ]
+
+        for stat in status:
+            if stat['value'] == False or stat['value'] == 'localhost' or stat['value'] == 'battery':
+                stat['class'] = 'warning'
+
+        return status
+
+    def get_hosts(self):
+        ip = ''
+        for interface in self.interfaces:
+            try:
+                ip = get_ip_address(interface)
+                if ip:
+                    self.ip = ip
+                break
+            except:
+                self.ip = '127.0.0.1'
+        self.url = 'http://' + self.ip
+        self.name = get_hostname()
+
+    def get_ids(self):
+        edcast_pid = get_pid('edcast_jack', self.uid)
+        deefuzzer_pid = get_pid('/usr/bin/deefuzzer '+self.user_dir+os.sep+'deefuzzer.xml', self.uid)
+        jackd_pid = get_pid('jackd', self.uid)
+        if jackd_pid == []:
+            jackd_pid = get_pid('jackdbus', self.uid)
+        self.writing = edcast_pid != []
+        self.casting = deefuzzer_pid != []
+        self.jacking = jackd_pid != []
diff --git a/telecaster/urls.py b/telecaster/urls.py
index bd06e8d..93d235f 100644
--- a/telecaster/urls.py
+++ b/telecaster/urls.py
@@ -48,21 +48,23 @@ htdocs = os.path.dirname(__file__) + '/htdocs'
 
 urlpatterns = patterns('',
     url(r'^$', web_view.index, name="telecaster-index"),
-    
+    url(r'^record/$', web_view.record, name="telecaster-record"),
+    url(r'^items/(?P<id>.*)$', web_view.index, name="telecaster-item"),
+
     # CSS+Images (FIXME: for developement only)
-    url(r'^css/(?P<path>.*)$', 'django.views.static.serve', 
+    url(r'^css/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': htdocs+'/css'},
         name="telecaster-css"),
-    url(r'images/(?P<path>.*)$', 'django.views.static.serve', 
+    url(r'images/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': htdocs+'/images'},
         name="telecaster-images"),
-    url(r'^js/(?P<path>.*)$', 'django.views.static.serve', 
+    url(r'^js/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': htdocs+'/js'},
         name="telecaster-js"),
-    
+
     # JSON RPC
-    url(r'^json/$', jsonrpc_site.dispatch, name='jsonrpc_mountpoint'),
+    url(r'json/$', jsonrpc_site.dispatch, name='jsonrpc_mountpoint'),
     # for the graphical browser/web console only, omissible
-    url(r'^json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"), 
-    
+    url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"),
+
 )
diff --git a/telecaster/views.py b/telecaster/views.py
index 85e2ea6..fb28394 100644
--- a/telecaster/views.py
+++ b/telecaster/views.py
@@ -1,7 +1,6 @@
 # Create your views here.
 
 import os
-import cgi
 import datetime
 import time
 import string
@@ -55,40 +54,45 @@ class WebView(object):
         self.url = self.conf['infos']['url']
         self.status = Status()
 
-    def index(self, request):
+    def index(self, request, id=None):
         stations = Station.objects.filter(started=True)
-        status = self.get_server_status()
-
-        if stations or (status.writing or status.casting):
-            template = 'telecaster/stop.html'
+        if stations:
             # FIXME: manage multiple stations
-            station = stations[0]
-            station.set_conf(self.conf)
-            station.setup()
+            template = 'telecaster/stop.html'
+            if id:
+                station = Station.objects.get(id=id)
+            else:
+                station = stations[0]
             if request.method == 'POST':
                 station.stop()
                 time.sleep(2)
+                station.save()
                 self.logger.write_info('stop')
-                return HttpResponseRedirect('/')
-
-        else:
-            template = 'telecaster/start.html'
-            if request.method == 'POST':
-                station = StationForm(data=request.POST)
-                if station.is_valid():
-                    station.set_conf(self.conf)
-                    station.setup()
-                    station.start()
-                    station.started = True
-                    station.save()
-                    self.logger.write_info('start')
-                    time.sleep(2)
-                    return HttpResponseRedirect('/')
+                return HttpResponseRedirect('/telecaster/record')
             else:
-                station = StationForm()
-
+                return render(request, template, {'station': station, 'status': self.status.update(),
+                                'hidden_fields': self.hidden_fields, })
+        else:
+            return HttpResponseRedirect('/telecaster/record')
+
+
+    def record(self, request):
+        template = 'telecaster/start.html'
+        if request.method == 'POST':
+            station = Station()
+            form = StationForm(data=request.POST, instance=station)
+            if form.is_valid():
+                station.set_conf(self.conf)
+                station.setup()
+                station.start()
+                station.save()
+                self.logger.write_info('start')
+                time.sleep(2)
+                return HttpResponseRedirect('/telecaster/items/'+str(station.id))
+        else:
+            form = StationForm()
 
-        return render(request, template, {'station': station, 'status': status,
+        return render(request, template, {'station': form, 'status': self.status.update(),
                                 'hidden_fields': self.hidden_fields, })
 
 
@@ -112,64 +116,4 @@ class WebView(object):
             station = {}
         return station
 
-class Status(object):
-
-    interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2','eth3']
-    acpi_states = {0: 'battery', 1: 'battery', 2: 'AC'}
-
-    def __init__(self):
-        self.acpi = acpi.Acpi()
-        self.uid = os.getuid()
-        self.user = pwd.getpwuid(os.getuid())[0]
-        self.user_dir = '/home' + os.sep + self.user + os.sep + '.telecaster'
-
-    def update(self):
-        self.acpi.update()
-        try:
-            self.temperature = self.acpi.temperature(0)
-        except:
-            self.temperature = 'N/A'
-        self.get_ids()
-        self.get_hosts()
-
-    def to_dict(self):
-        status = [
-          {'id': 'acpi_state','class': 'default', 'value': self.acpi_states[self.acpi.charging_state()], 'label': 'Power'},
-          {'id': 'acpi_percent', 'class': 'default', 'value': str(self.acpi.percent()), 'label': 'Battery Charge'},
-          {'id': 'temperature', 'class': 'default', 'value': self.temperature, 'label': 'Temperature'},
-          {'id': 'jack_state', 'class': 'default', 'value': self.jacking, 'label': 'Jack server'},
-          {'id': 'name', 'class': 'default', 'value': self.name, 'label': 'Name'},
-          {'id': 'ip', 'class': 'default', 'value': self.ip, 'label': 'IP address'},
-          {'id': 'encoder_state','class': 'default', 'value': self.writing, 'label': 'Encoder'},
-          {'id': 'casting', 'class': 'default', 'value': self.casting, 'label': 'Broadcasting'},
-          {'id': 'writing', 'class': 'default', 'value': self.writing, 'label': 'Recording'},
-          ]
-
-        for stat in status:
-            if stat['value'] == False or stat['value'] == 'localhost' or stat['value'] == 'battery':
-                stat['class'] = 'warning'
-
-        return status
 
-    def get_hosts(self):
-        ip = ''
-        for interface in self.interfaces:
-            try:
-                ip = get_ip_address(interface)
-                if ip:
-                    self.ip = ip
-                break
-            except:
-                self.ip = '127.0.0.1'
-        self.url = 'http://' + self.ip
-        self.name = get_hostname()
-
-    def get_ids(self):
-        edcast_pid = get_pid('edcast_jack', self.uid)
-        deefuzzer_pid = get_pid('/usr/bin/deefuzzer '+self.user_dir+os.sep+'deefuzzer.xml', self.uid)
-        jackd_pid = get_pid('jackd', self.uid)
-        if jackd_pid == []:
-            jackd_pid = get_pid('jackdbus', self.uid)
-        self.writing = edcast_pid != []
-        self.casting = deefuzzer_pid != []
-        self.jacking = jackd_pid != []