Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30655
Modified Files:
program_display.py recordings.py
Log Message:
adjustments to recordserver, needs much cleanup
Index: recordings.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/recordings.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** recordings.py 4 Nov 2004 19:55:48 -0000 1.4
--- recordings.py 7 Nov 2004 16:38:53 -0000 1.5
***************
*** 1,19 ****
import sys
import mcomm
server = None
def schedule_recording(prog):
if not server:
return False, 'Recordserver unavailable'
info = {}
# if prog['description']:
# info['description'] = prog['description']
try:
! return server.recording_add(prog['title'], prog['channel'],
! 0, prog['start'], prog['stop'], info)
except mcomm.MException, e:
print e
return False, 'Internal server error'
--- 1,55 ----
import sys
import mcomm
+ import config
server = None
+ def add_favorite(prog):
+ if not server:
+ return False, 'Recordserver unavailable'
+ try:
+ if prog.channel == 'ANY':
+ channel = []
+ for c in config.TV_CHANNELS:
+ channel.append(c[1])
+ else:
+ channel = [ prog.channel ]
+ days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'),
+ _('Sat'), _('Sun'))
+ if prog.dow in days:
+ days = [ Unicode(days.index(prog.dow)) ]
+ else:
+ days = [ 0, 1, 2, 3, 4, 5, 6 ]
+
+ mod = []
+ if prog.mod == 'ANY' or 1: # FIXME: add real mod
+ mod.append('00:00-23:59')
+ return server.favorite_add(prog.title, channel, 0, days, mod, False)
+ except mcomm.MException, e:
+ print e
+ return False, 'Internal server error'
+ except Exception, e:
+ print 'recordings.add_favorite:', e
+ return False, 'Internal client error'
+
+
def schedule_recording(prog):
if not server:
return False, 'Recordserver unavailable'
info = {}
+ print prog['description']
# if prog['description']:
# info['description'] = prog['description']
+ # if prog['subtitle']:
+ # info['subtitle'] = prog['subtitle']
try:
! return server.recording_add(prog['title'], prog['channel'], 0,
! prog['start'], prog['stop'], info)
except mcomm.MException, e:
print e
return False, 'Internal server error'
+ except Exception, e:
+ print 'recordings.schedule_recording:', e
+ return False, 'Internal client error'
***************
*** 33,34 ****
--- 69,71 ----
print 'recordings.notification:', e
+ mcomm.register_entity_notification(notification)
Index: program_display.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/program_display.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** program_display.py 4 Nov 2004 19:55:48 -0000 1.45
--- program_display.py 7 Nov 2004 16:38:53 -0000 1.46
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.46 2004/11/07 16:38:53 dischi
+ # adjustments to recordserver, needs much cleanup
+ #
# Revision 1.45 2004/11/04 19:55:48 dischi
# make it possible to schedule recordings for testing
***************
*** 252,263 ****
def add_favorite(self, arg=None, menuw=None):
! msg = 'WORK IN PROGRESS'
! AlertBox(text=_('Scheduling Failed')+(': %s' % msg)).show()
! return
!
! # FIXME: combine Favorite and FavoriteItem
! # fav = Favorite(self.prog.title, self.prog, True, True, True, -1)
! # fav_item = FavoriteItem(self, fav, fav_action='add')
! # fav_item.display_favorite(menuw=menuw)
--- 255,261 ----
def add_favorite(self, arg=None, menuw=None):
! fav = Favorite(self.name, self)
! fav_item = FavoriteItem(self, fav, fav_action='add')
! fav_item.display_favorite(menuw=menuw)
***************
*** 335,338 ****
--- 333,357 ----
+
+ class Favorite:
+
+
+ def __init__(self, name, prog):
+ self.name = name
+ self.priority = 0
+
+ if prog:
+ self.title = prog.title
+ self.channel = 'ANY'
+ self.dow = 'ANY'
+ self.mod = 'ANY'
+
+ else:
+ self.title = 'NONE'
+ self.channel = 'NONE'
+ self.dow = 'NONE'
+ self.mod = 'NONE'
+
+
class FavoriteItem(Item):
def __init__(self, parent, fav, fav_action='edit'):
***************
*** 343,347 ****
self.fav_action = fav_action
! self.week_days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'),
_('Sat'), _('Sun'))
if fav.channel == 'ANY':
--- 362,367 ----
self.fav_action = fav_action
! self.week_days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'),
! _('Sat'), _('Sun'))
if fav.channel == 'ANY':
***************
*** 358,364 ****
self.mod = strftime(config.TV_TIMEFORMAT, gmtime(float(fav.mod *
60)))
- # needed by the inputbox handler
- self.menuw = None
-
def actions(self):
--- 378,381 ----
***************
*** 401,405 ****
if name:
self.name = self.fav.name = name
-
self.menuw.refresh()
--- 418,421 ----
***************
*** 493,517 ****
def save_changes(self, arg=None, menuw=None):
! if self.fav_action == 'edit':
! (result, msg) = record_client.removeFavorite(self.origname)
else:
! result = True
! if result:
! (result, msg) = record_client.addEditedFavorite(self.fav.name,
! self.fav.title,
! self.fav.channel,
! self.fav.dow,
! self.fav.mod,
! self.fav.priority)
! if not result:
! AlertBox(text=_('Save Failed, favorite was lost')+(': %s' %
msg)).show()
! else:
! self.fav_action = 'edit'
! if menuw:
! menuw.back_one_menu(arg='reload')
! else:
! AlertBox(text=_('Save Failed')+(': %s' % msg)).show()
--- 509,539 ----
def save_changes(self, arg=None, menuw=None):
! (result, msg) = recordings.add_favorite(self.fav)
! if result:
! AlertBox(text=_('"%s" has been scheduled as favorite') % \
! self.title).show()
else:
! AlertBox(text=_('Scheduling Failed')+(': %s' % msg)).show()
! # if self.fav_action == 'edit':
! # (result, msg) = record_client.removeFavorite(self.origname)
! # else:
! # result = True
! # if result:
! # (result, msg) = record_client.addEditedFavorite(self.fav.name,
! # self.fav.title,
! #
self.fav.channel,
! # self.fav.dow,
! # self.fav.mod,
! #
self.fav.priority)
! # if not result:
! # AlertBox(text=_('Save Failed, favorite was lost')+(': %s' %
msg)).show()
! # else:
! # self.fav_action = 'edit'
! # if menuw:
! # menuw.back_one_menu(arg='reload')
! # else:
! # AlertBox(text=_('Save Failed')+(': %s' % msg)).show()
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
