Update of /cvsroot/freevo/freevo/src/record
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18585/src/record
Modified Files:
client.py conflict.py recording.py server.py
Added Files:
types.py
Log Message:
add types.py and more debug
Index: recording.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/record/recording.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** recording.py 29 Nov 2004 18:58:49 -0000 1.12
--- recording.py 22 Dec 2004 19:51:43 -0000 1.13
***************
*** 31,34 ****
--- 31,35 ----
#
-----------------------------------------------------------------------------
+ __all__ = [ 'Recording' ]
# python imports
***************
*** 45,49 ****
log = logging.getLogger('record')
-
def _int2time(i):
"""
--- 46,49 ----
Index: client.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/record/client.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** client.py 20 Dec 2004 21:25:18 -0000 1.3
--- client.py 22 Dec 2004 19:51:43 -0000 1.4
***************
*** 41,44 ****
--- 41,45 ----
log = logging.getLogger('record')
+ from types import *
class Recording:
Index: conflict.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/record/conflict.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** conflict.py 1 Dec 2004 15:05:34 -0000 1.7
--- conflict.py 22 Dec 2004 19:51:43 -0000 1.8
***************
*** 66,69 ****
--- 66,70 ----
# record imports
import recorder
+ from types import *
# get logging object
***************
*** 90,94 ****
def is_possible(self):
! if self.rec[-1].status == 'recording':
# the recording is running right now, do not move it to
# a new plugin
--- 91,95 ----
def is_possible(self):
! if self.rec[-1].status == RECORDING:
# the recording is running right now, do not move it to
# a new plugin
***************
*** 230,238 ****
for d in devices[:-1]:
for r in d.rec:
! if r.status != 'recording':
! r.status = 'scheduled'
r.recorder = d.plugin, d.id
for r in devices[-1].rec:
! r.status = 'conflict'
r.recorder = None, None
return best_rating
--- 231,239 ----
for d in devices[:-1]:
for r in d.rec:
! if r.status != RECORDING:
! r.status = SCHEDULED
r.recorder = d.plugin, d.id
for r in devices[-1].rec:
! r.status = CONFLICT
r.recorder = None, None
return best_rating
Index: server.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/record/server.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** server.py 21 Dec 2004 15:03:40 -0000 1.29
--- server.py 22 Dec 2004 19:51:43 -0000 1.30
***************
*** 56,59 ****
--- 56,60 ----
# record imports
import recorder
+ from types import *
from recording import Recording
from favorite import Favorite
***************
*** 67,78 ****
- CONFLICT = 'conflict'
- SCHEDULED = 'scheduled'
- RECORDING = 'recording'
- MISSED = 'missed'
- SAVED = 'saved'
- DELETED = 'deleted'
-
-
class RecordServer(RPCServer):
"""
--- 68,71 ----
***************
*** 158,163 ****
# scan for conflicts
to_check = (CONFLICT, SCHEDULED, RECORDING)
! next_recordings = filter(lambda r: r.stop > ctime and \
! r.status in to_check, self.recordings)
for r in next_recordings:
try:
--- 151,156 ----
# scan for conflicts
to_check = (CONFLICT, SCHEDULED, RECORDING)
! next_recordings = filter(lambda r: r.stop + r.stop_padding > ctime \
! and r.status in to_check, self.recordings)
for r in next_recordings:
try:
--- NEW FILE: types.py ---
# status values
CONFLICT = 'conflict'
SCHEDULED = 'scheduled'
RECORDING = 'recording'
MISSED = 'missed'
SAVED = 'saved'
DELETED = 'deleted'
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
