Update of /cvsroot/freevo/freevo/src/record
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6601
Modified Files:
client.py
Log Message:
fix coming up
Index: client.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/record/client.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** client.py 6 Jan 2005 19:02:05 -0000 1.6
--- client.py 7 Jan 2005 20:44:17 -0000 1.7
***************
*** 69,74 ****
self.description['subtitle']:
s += u' - %s' % self.description['subtitle']
! start = time.strftime('%I:%M%p', time.localtime(self.start))
! return s + u' at %s' % Unicode(start)
--- 69,73 ----
self.description['subtitle']:
s += u' - %s' % self.description['subtitle']
! return s
***************
*** 84,94 ****
mcomm.register_entity_notification(self.__entity_update)
mcomm.register_event('record.list.update', self.__list_update)
! self.comingup = _('The recordserver is down')
!
def __entity_update(self, entity):
if not entity.present and entity == self.server:
log.info('recordserver lost')
! self.comingup = _('The recordserver is down')
self.server = None
return
--- 83,94 ----
mcomm.register_entity_notification(self.__entity_update)
mcomm.register_event('record.list.update', self.__list_update)
! self.comingup = ''
! self.running = ''
def __entity_update(self, entity):
if not entity.present and entity == self.server:
log.info('recordserver lost')
! self.comingup = ''
! self.running = ''
self.server = None
return
***************
*** 169,202 ****
reclist = copy.copy(self.__recordings.values())
reclist.sort(lambda x,y: cmp(x.start, y.start))
- today = []
- tomorrow = []
- later = []
-
- date0 = time.localtime()[:3]
- date1 = time.localtime(time.time() + 60 * 60 * 24)[:3]
-
- for what in reclist:
- if time.localtime(what.start)[:3] == date0:
- today.append(what)
- elif time.localtime(what.start)[:3] == date1:
- tomorrow.append(what)
- elif what.start > time.time():
- later.append(what)
-
self.comingup = ''
! if len(today) > 0:
! self.comingup += _('Today') + u':\n'
! for r in today:
! self.comingup += u'%s\n' % Unicode(r)
! if len(tomorrow) > 0:
! self.comingup += _('Tomorrow') + u':\n'
! for r in tomorrow:
! self.comingup += u' %s\n' % Unicode(r)
! if len(later) > 0:
! self.comingup += _('This Week') + u':\n'
! for r in later:
! self.comingup += u' %s\n' % Unicode(r)
! if not self.comingup:
! self.comingup = _('No recordings are scheduled')
--- 169,180 ----
reclist = copy.copy(self.__recordings.values())
reclist.sort(lambda x,y: cmp(x.start, y.start))
self.comingup = ''
! self.running = ''
!
! for rec in reclist:
! if rec.status == SCHEDULED:
! self.comingup += u'%s\n' % Unicode(rec)
! if rec.status == RECORDING:
! self.running += u'%s\n' % Unicode(rec)
***************
*** 325,329 ****
recordings = Recordings()
favorites = Favorites()
-
- def comingup():
- return recordings.comingup
--- 303,304 ----
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
