Author: duncan
Date: Sat Feb 23 07:00:02 2008
New Revision: 10418
Log:
Corrected loadFavorites
Minor changes to messages
Modified:
branches/rel-1-7/freevo/src/helpers/recordserver.py
branches/rel-1-7/freevo/src/plugins/rom_drives.py
branches/rel-1-7/freevo/src/tv/epg_types.py
branches/rel-1-7/freevo/src/tv/record_types.py
branches/rel-1/freevo/src/plugins/rom_drives.py
branches/rel-1/freevo/src/tv/epg_types.py
branches/rel-1/freevo/src/tv/record_types.py
Modified: branches/rel-1-7/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/recordserver.py Sat Feb 23 07:00:02 2008
@@ -649,7 +649,7 @@
for chan in guide.chan_list:
if prog.channel_id == chan.id:
prog.tunerid = chan.tunerid
- _debug_('%s tuner: %s' % (prog, prog.tunerid), 1)
+ _debug_('%s %r' % (prog, prog.tunerid), 1)
return prog
Modified: branches/rel-1-7/freevo/src/plugins/rom_drives.py
==============================================================================
--- branches/rel-1-7/freevo/src/plugins/rom_drives.py (original)
+++ branches/rel-1-7/freevo/src/plugins/rom_drives.py Sat Feb 23 07:00:02 2008
@@ -339,7 +339,7 @@
def get_capabilities(self):
""" Open the CD/DVD drive and read its capabilities """
- _debug_('Getting capabilities for %s' % self.drivename, DINFO)
+ _debug_('Getting capabilities for %s (%s)' % (self.drivename,
self.devicename), DINFO)
cdc = 0
try:
fd = os.open(self.devicename, os.O_RDONLY | os.O_NONBLOCK)
@@ -353,15 +353,15 @@
if cdc & CDC_CLOSE_TRAY:
self.can_close = True
- _debug_('%r can close' % self.drivename, DINFO)
+ _debug_('%s can close' % self.drivename, DINFO)
if cdc & CDC_OPEN_TRAY:
self.can_eject = True
- _debug_('%r can open' % self.drivename, DINFO)
+ _debug_('%s can open' % self.drivename, DINFO)
if cdc & CDC_SELECT_SPEED:
self.can_select_speed = True
- _debug_('%r can select speed' % self.drivename, DINFO)
+ _debug_('%s can select speed' % self.drivename, DINFO)
finally:
os.close(fd)
except Exception, e:
Modified: branches/rel-1-7/freevo/src/tv/epg_types.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/epg_types.py (original)
+++ branches/rel-1-7/freevo/src/tv/epg_types.py Sat Feb 23 07:00:02 2008
@@ -95,7 +95,7 @@
st = time.localtime(self.pdc_start) # PDC start time
bt = time.localtime(self.start) # Beginning time tuple
et = time.localtime(self.stop) # End time tuple
- begins = time.strftime('%a %Y-%m-%d %H:%M', bt)
+ begins = time.strftime('%a %b %d %H:%M', bt)
starts = time.strftime('%H:%M', st)
ends = time.strftime('%H:%M', et)
overlaps = self.overlap and '*' or ' '
Modified: branches/rel-1-7/freevo/src/tv/record_types.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/record_types.py (original)
+++ branches/rel-1-7/freevo/src/tv/record_types.py Sat Feb 23 07:00:02 2008
@@ -90,12 +90,14 @@
def loadFavorites(self):
""" """
# may need to use a critical section here
+ self.favorites = {}
try:
favorites_fh = open(self.favorites_file_name, 'rb')
self.favorites = pickle.load(favorites_fh)
favorites_fh.close()
except IOError, why:
- self.favorites = {}
+ return {}
+ return self.favorites
def saveFavorites(self):
Modified: branches/rel-1/freevo/src/plugins/rom_drives.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/rom_drives.py (original)
+++ branches/rel-1/freevo/src/plugins/rom_drives.py Sat Feb 23 07:00:02 2008
@@ -339,7 +339,7 @@
def get_capabilities(self):
""" Open the CD/DVD drive and read its capabilities """
- _debug_('Getting capabilities for %s' % self.drivename, DINFO)
+ _debug_('Getting capabilities for %s (%s)' % (self.drivename,
self.devicename), DINFO)
cdc = 0
try:
fd = os.open(self.devicename, os.O_RDONLY | os.O_NONBLOCK)
@@ -353,15 +353,15 @@
if cdc & CDC_CLOSE_TRAY:
self.can_close = True
- _debug_('%r can close' % self.drivename, DINFO)
+ _debug_('%s can close' % self.drivename, DINFO)
if cdc & CDC_OPEN_TRAY:
self.can_eject = True
- _debug_('%r can open' % self.drivename, DINFO)
+ _debug_('%s can open' % self.drivename, DINFO)
if cdc & CDC_SELECT_SPEED:
self.can_select_speed = True
- _debug_('%r can select speed' % self.drivename, DINFO)
+ _debug_('%s can select speed' % self.drivename, DINFO)
finally:
os.close(fd)
except Exception, e:
Modified: branches/rel-1/freevo/src/tv/epg_types.py
==============================================================================
--- branches/rel-1/freevo/src/tv/epg_types.py (original)
+++ branches/rel-1/freevo/src/tv/epg_types.py Sat Feb 23 07:00:02 2008
@@ -95,7 +95,7 @@
st = time.localtime(self.pdc_start) # PDC start time
bt = time.localtime(self.start) # Beginning time tuple
et = time.localtime(self.stop) # End time tuple
- begins = time.strftime('%a %Y-%m-%d %H:%M', bt)
+ begins = time.strftime('%a %b %d %H:%M', bt)
starts = time.strftime('%H:%M', st)
ends = time.strftime('%H:%M', et)
overlaps = self.overlap and '*' or ' '
Modified: branches/rel-1/freevo/src/tv/record_types.py
==============================================================================
--- branches/rel-1/freevo/src/tv/record_types.py (original)
+++ branches/rel-1/freevo/src/tv/record_types.py Sat Feb 23 07:00:02 2008
@@ -90,12 +90,14 @@
def loadFavorites(self):
""" """
# may need to use a critical section here
+ self.favorites = {}
try:
favorites_fh = open(self.favorites_file_name, 'rb')
self.favorites = pickle.load(favorites_fh)
favorites_fh.close()
except IOError, why:
- self.favorites = {}
+ return {}
+ return self.favorites
def saveFavorites(self):
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
