fix writing and casting metadata

diff --git a/telecaster.py b/telecaster.py
index c2442ef2cda6fc0ef5367a370ef0ce3322149930..b26909aa2912280851d70eaf9bcfabc5ea372fd9 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -69,10 +69,10 @@ class TeleCaster:
         self.lock_file = self.user_dir + os.sep + 'telecaster.lock'
 
     def main(self):
-        edcast_pid = get_pid('^edcast_jack', self.uid)
+        edcast_pid = get_pid('edcast_jack', self.uid)
         deefuzzer_pid = get_pid('/usr/bin/deefuzzer', self.uid)
-        writing = deefuzzer_pid != []
-        casting = edcast_pid != []
+        writing = edcast_pid != []
+        casting = deefuzzer_pid != []
         form = WebView(self.session_file, self.url, version)
 
         if deefuzzer_pid == [] and form.has_key("action") and \
@@ -105,7 +105,7 @@ class TeleCaster:
             self.main()
 
         elif deefuzzer_pid == []:
-            form.start_form()
+            form.start_form(writing, casting)
 
 
 conf_file = '/etc/telecaster/telecaster.xml'

diff --git a/tools/tools.py b/tools/tools.py
index 46e8bdbe587c60c890c03868c767e3d98679811e..50349c1aef3af98663c970a1d688ce5d500efe1d 100644 (file)
--- a/tools/tools.py
+++ b/tools/tools.py
@@ -84,8 +84,7 @@ def get_pid(proc,uid):
         for proc in procs:
             pid = proc.split(' ')[0]
             command = ' '.join(proc.split(' ')[1:])[:-1]
-            if not 'LIVE' in command:
-                pids.append(pid)
+            pids.append(pid)
     return pids
 
 def get_params_from_lock(lock_file):

diff --git a/webview.py b/webview.py
index 9678bf49fff9f7888b70c8c60a09a215db7a7d17..f44b484943d1b682498d4d2d92a5f0481963f8ed 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -240,11 +240,11 @@ class WebView(FieldStorage):
         print "</div>"
 
 
-    def start_form(self, message=''):
+    def start_form(self, writing, casting, message=''):
         self.refresh = False
         self.header()
-        self.casting = False
-        self.writing = False
+        self.casting = writing
+        self.writing = casting
         self.hardware_data()
         print "<form method=\"post\" action=\""+self.url+"/telecaster/telecaster.py\" name=\"formulaire\">"
         print "<div class=\"main\">"