From: yomguy <>
Date: Fri, 1 Oct 2010 13:21:21 +0000 (+0000)
Subject: try to fix first page reload.. :( cleanup
X-Git-Tag: 1.0~155
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7a01aac80d7ee360c4157d7ee69a78011ad57df7;p=telecaster-server.git
try to fix first page reload.. :( cleanup
---
diff --git a/station.py b/station.py
index b30be64..a0bce84 100644
--- a/station.py
+++ b/station.py
@@ -38,7 +38,6 @@
import os
import pwd
-import shutil
import datetime
import time
import urllib
diff --git a/telecaster.py b/telecaster.py
index 811b957..ede25fa 100755
--- a/telecaster.py
+++ b/telecaster.py
@@ -68,13 +68,25 @@ class TeleCaster:
if not os.path.exists(self.user_dir):
os.makedirs(self.user_dir)
self.lock_file = self.user_dir + os.sep + 'telecaster.lock'
- self.form = WebView(self.conf, version)
+
+ def transition_head(self):
+ html_file = open('telecaster_starting_head.html', 'r')
+ html = html_file.read()
+ html_file.close()
+ return html
+
+ def transition_foot(self):
+ html_file = open('telecaster_starting_foot.html', 'r')
+ html = html_file.read()
+ html_file.close()
+ return html
def main(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)
writing = edcast_pid != []
casting = deefuzzer_pid != []
+ self.form = WebView(self.conf, version)
if deefuzzer_pid == [] and self.form.has_key("action") and \
self.form.has_key("department") and self.form.has_key("conference") and \
@@ -88,16 +100,20 @@ class TeleCaster:
'professor': self.form.getfirst("professor"),
'comment': self.form.getfirst("comment")}
+ self.form = 0
+ #print "Content-Type: text/html\n\n"
+ #print self.transition_head()
s = Station(self.conf_file, self.conference_dict, self.lock_file)
s.start()
+# time.sleep(1)
+ #print self.transition_foot()
self.logger.write_info('starting')
- time.sleep(2)
self.main()
elif deefuzzer_pid != [] and os.path.exists(self.lock_file) and not self.form.has_key("action"):
self.conference_dict = get_conference_from_lock(self.lock_file)
self.form.stop_form(self.conference_dict, writing, casting)
- self.logger.write_info('page stop')
+ self.logger.write_info('started')
elif deefuzzer_pid and self.form.has_key("action") and self.form["action"].value == "stop":
if os.path.exists(self.lock_file):
@@ -110,12 +126,13 @@ class TeleCaster:
elif deefuzzer_pid == []:
self.form.start_form(writing, casting)
- self.logger.write_info('page start')
-
+ self.logger.write_info('stopped')
+
conf_file = '/etc/telecaster/telecaster.xml'
if __name__ == '__main__':
t = TeleCaster(conf_file)
t.main()
+
diff --git a/webview.py b/webview.py
index 215934f..825f6f8 100644
--- a/webview.py
+++ b/webview.py
@@ -37,17 +37,13 @@
import os
import cgi
-import cgitb
-import shutil
+#import cgitb
import datetime
import time
-import codecs
import string
-import signal
-import unicodedata
from tools import *
from cgi import FieldStorage
-cgitb.enable()
+#cgitb.enable()
class WebView(FieldStorage):
"""Gives the web CGI frontend"""
@@ -92,7 +88,7 @@ class WebView(FieldStorage):
def header(self):
# Required header that tells the browser how to render the HTML.
- print "Content-Type: text/html\n"
+ print "Content-Type: text/html\n\n"
print ""
print ""
print ""
@@ -217,7 +213,7 @@ class WebView(FieldStorage):
else:
print ""
print ""
- print "| | "
+ print " | "
print " |