Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27480
Modified Files:
recordserver.py
Log Message:
Upgrade the twisted reactor to something not depricated and move print to
debug.
Index: recordserver.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** recordserver.py 16 Jul 2004 19:39:57 -0000 1.59
--- recordserver.py 24 Jul 2004 00:24:30 -0000 1.60
***************
*** 8,11 ****
--- 8,15 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.60 2004/07/24 00:24:30 rshortt
+ # Upgrade the twisted reactor to something not depricated and move print to
+ # debug.
+ #
# Revision 1.59 2004/07/16 19:39:57 dischi
# store recording timestamp
***************
*** 79,83 ****
! import sys, string, random, time, os, re, pwd, stat
import config
from util import vfs
--- 83,87 ----
! import sys, string, random, time, os, re, pwd, traceback, stat
import config
from util import vfs
***************
*** 95,99 ****
from twisted.web import xmlrpc, server
- from twisted.internet.app import Application
from twisted.internet import reactor
from twisted.python import log
--- 99,102 ----
***************
*** 892,896 ****
def eventNotice(self):
! #print 'RECORDSERVER GOT EVENT NOTICE'
# Use callLater so that handleEvents will get called the next time
# through the main loop.
--- 895,899 ----
def eventNotice(self):
! _debug_('RECORDSERVER GOT EVENT NOTICE')
# Use callLater so that handleEvents will get called the next time
# through the main loop.
***************
*** 899,903 ****
def handleEvents(self):
! #print 'RECORDSERVER HANDLING EVENT'
event = rc_object.get_event()
--- 902,906 ----
def handleEvents(self):
! _debug_('RECORDSERVER HANDLING EVENT')
event = rc_object.get_event()
***************
*** 959,963 ****
elif event == RECORD_START:
! #print 'Handling event RECORD_START'
prog = event.arg
open(tv_lock_file, 'w').close()
--- 962,966 ----
elif event == RECORD_START:
! _debug_('Handling event RECORD_START')
prog = event.arg
open(tv_lock_file, 'w').close()
***************
*** 967,971 ****
elif event == RECORD_STOP:
! #print 'Handling event RECORD_STOP'
os.remove(tv_lock_file)
prog = event.arg
--- 970,974 ----
elif event == RECORD_STOP:
! _debug_('Handling event RECORD_STOP')
os.remove(tv_lock_file)
prog = event.arg
***************
*** 977,981 ****
os.rename(vfs.getoverlay(prog.filename + '.raw.tmp'),
vfs.getoverlay(os.path.splitext(prog.filename)[0] +
'.png'))
! pass
if config.VCR_POST_REC:
util.popen3.Popen3(config.VCR_POST_REC)
--- 980,984 ----
os.rename(vfs.getoverlay(prog.filename + '.raw.tmp'),
vfs.getoverlay(os.path.splitext(prog.filename)[0] +
'.png'))
!
if config.VCR_POST_REC:
util.popen3.Popen3(config.VCR_POST_REC)
***************
*** 989,1005 ****
def main():
- app = Application("RecordServer")
rs = RecordServer()
if (config.DEBUG == 0):
! app.listenTCP(config.TV_RECORD_SERVER_PORT, server.Site(rs,
logPath='/dev/null'))
else:
! app.listenTCP(config.TV_RECORD_SERVER_PORT, server.Site(rs))
rs.startMinuteCheck()
rc_object.subscribe(rs.eventNotice)
! app.run(save=0)
if __name__ == '__main__':
- import traceback
import time
--- 992,1008 ----
def main():
rs = RecordServer()
+
if (config.DEBUG == 0):
! reactor.listenTCP(config.TV_RECORD_SERVER_PORT, server.Site(rs,
logPath='/dev/null'))
else:
! reactor.listenTCP(config.TV_RECORD_SERVER_PORT, server.Site(rs))
!
rs.startMinuteCheck()
rc_object.subscribe(rs.eventNotice)
! reactor.run()
if __name__ == '__main__':
import time
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
