Menu
▾
▴
[Freevo-cvslog] r8742 - in branches/rel-1/freevo/src: . image plugins tv util video/plugins
|
From: Duncan W. <du...@fr...> - 2006-12-19 07:26:16
|
Author: duncan
Date: Tue Dec 19 07:26:12 2006
New Revision: 8742
Modified:
branches/rel-1/freevo/src/childapp.py
branches/rel-1/freevo/src/evdev.py
branches/rel-1/freevo/src/helpers/recordserver.py
branches/rel-1/freevo/src/image/__init__.py
branches/rel-1/freevo/src/osd.py
branches/rel-1/freevo/src/plugins/cd_burn.py
branches/rel-1/freevo/src/tv/epg_xmltv.py
branches/rel-1/freevo/src/tv/record_client.py
branches/rel-1/freevo/src/util/fileops.py
branches/rel-1/freevo/src/util/videothumb.py
branches/rel-1/freevo/src/video/plugins/bmovl.py
Log:
Added information about exceptions, so that it is known from where they come
Modified: branches/rel-1/freevo/src/childapp.py
==============================================================================
--- branches/rel-1/freevo/src/childapp.py (original)
+++ branches/rel-1/freevo/src/childapp.py Tue Dec 19 07:26:12 2006
@@ -392,7 +392,7 @@
rc.unregister(self.stop)
if cmd and self.isAlive():
- _debug_('sending exit command to app')
+ _debug_('sending exit command to app \"%r\"' % cmd)
self.write(cmd)
# wait for the app to terminate itself
for i in range(60):
Modified: branches/rel-1/freevo/src/evdev.py
==============================================================================
--- branches/rel-1/freevo/src/evdev.py (original)
+++ branches/rel-1/freevo/src/evdev.py Tue Dec 19 07:26:12 2006
@@ -360,4 +360,4 @@
except ImportError:
from evfallback import _types, _events, _ids, _buses
except StandardError, e:
- print e
+ print 'evfallback:', e
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Tue Dec 19 07:26:12 2006
@@ -297,7 +297,7 @@
try:
recording = prog.isRecording
except Exception, e:
- print e
+ print 'removeScheduledRecording:', e
recording = FALSE
scheduledRecordings = self.getScheduledRecordings()
Modified: branches/rel-1/freevo/src/image/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/image/__init__.py (original)
+++ branches/rel-1/freevo/src/image/__init__.py Tue Dec 19 07:26:12 2006
@@ -32,7 +32,6 @@
import os
# Add support for bins album files (http://bins.sautret.org/)
-#import kaa.metadata.misc.dirinfo as bins
import config
import util
@@ -140,8 +139,7 @@
items += citems
except OSError, e:
- print 'slideshow error:'
- print e
+ print 'slideshow error:', e
pl = Playlist('', items, fxd.getattr(None, 'parent', None),
random=fxd.getattr(node, 'random', 0),
@@ -176,8 +174,7 @@
elif child.name == 'file':
files.append(fname)
except OSError, e:
- print 'playlist error:'
- print e
+ print 'playlist error:', e
if files:
pl.background_playlist = Playlist(playlist=files, random = random,
Modified: branches/rel-1/freevo/src/osd.py
==============================================================================
--- branches/rel-1/freevo/src/osd.py (original)
+++ branches/rel-1/freevo/src/osd.py Tue Dec 19 07:26:12 2006
@@ -610,8 +610,8 @@
if url.mode == 'BGRA':
url.mode = 'RGBA'
image = pygame.image.fromstring(str(url.get_raw_data(format=url.mode)), url.size, url.mode)
- except Exception, e:
- print e
+ except AttributeError:
+ print 'url:', url
if url[:8] == 'thumb://':
filename = os.path.abspath(url[8:])
@@ -660,6 +660,10 @@
traceback.print_exc()
return None
+ except Exception, e:
+ print 'image.fromstring:', e
+ return None
+
# convert the surface to speed up blitting later
if image and image.get_alpha():
image.set_alpha(image.get_alpha(), RLEACCEL)
@@ -906,7 +910,7 @@
alpha[x,y] = int(alpha[x,y][0]*opaque_mod)
opaque_mod -= opaque_stp
except Exception, e:
- print e
+ print '__draw_transparent_text__:', e
def drawstringframed(self, string, x, y, width, height, font, fgcolor=None,
Modified: branches/rel-1/freevo/src/plugins/cd_burn.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/cd_burn.py (original)
+++ branches/rel-1/freevo/src/plugins/cd_burn.py Tue Dec 19 07:26:12 2006
@@ -826,7 +826,7 @@
if len(cur2.files)>0:
to_return.append(( cur2.burn, 'Burn audio files (MP3, Wav and Ogg) as Audio CD'))
except Exception, e:
- print e
+ print 'fill_menu:', e
pass
try:
Modified: branches/rel-1/freevo/src/tv/epg_xmltv.py
==============================================================================
--- branches/rel-1/freevo/src/tv/epg_xmltv.py (original)
+++ branches/rel-1/freevo/src/tv/epg_xmltv.py Tue Dec 19 07:26:12 2006
@@ -291,7 +291,7 @@
else:
prog.sub_title = u'Teil %s' % part
except Exception, e:
- print e
+ print 'Teil:', e
guide.AddProgram(prog)
except:
Modified: branches/rel-1/freevo/src/tv/record_client.py
==============================================================================
--- branches/rel-1/freevo/src/tv/record_client.py (original)
+++ branches/rel-1/freevo/src/tv/record_client.py Tue Dec 19 07:26:12 2006
@@ -56,7 +56,7 @@
try:
(status, message) = server.getScheduledRecordings()
except Exception, e:
- print e
+ print 'getScheduledRecordings:', e
return (FALSE, 'record_client: '+_('connection error'))
return returnFromJelly(status, message)
@@ -75,7 +75,7 @@
try:
(status, message) = server.echotest(teststr)
except Exception, e:
- print e
+ print 'connectionTest:', e
traceback.print_exc()
return (FALSE, 'record_client: '+_('connection error'))
Modified: branches/rel-1/freevo/src/util/fileops.py
==============================================================================
--- branches/rel-1/freevo/src/util/fileops.py (original)
+++ branches/rel-1/freevo/src/util/fileops.py Tue Dec 19 07:26:12 2006
@@ -170,7 +170,7 @@
try:
os.rmdir(d)
except (IOError, OSError), e:
- print e
+ print 'rmrf:', e
#
@@ -473,7 +473,7 @@
except Exception, e:
print 'Invalid thumbnail for %s' % filename
if config.DEBUG:
- print e
+ print 'invalid thumbnail:', e
if not image:
if __freevo_app__ == 'main':
@@ -487,7 +487,7 @@
except Exception, e:
print 'Error loading thumbnail %s' % filename
if config.DEBUG:
- print e
+ print 'create_thumbnail:', e
if not image or image.width < 100 or image.height < 100:
try:
@@ -495,7 +495,7 @@
except Exception, e:
print 'error caching image %s' % filename
if config.DEBUG:
- print e
+ print 'caching image:', e
return None
try:
Modified: branches/rel-1/freevo/src/util/videothumb.py
==============================================================================
--- branches/rel-1/freevo/src/util/videothumb.py (original)
+++ branches/rel-1/freevo/src/util/videothumb.py Tue Dec 19 07:26:12 2006
@@ -111,7 +111,7 @@
else:
image.save(imagefile)
except (OSError, IOError), e:
- print e
+ print 'snapshot:', e
else:
print 'no imagefile found'
print imagefile
Modified: branches/rel-1/freevo/src/video/plugins/bmovl.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/bmovl.py (original)
+++ branches/rel-1/freevo/src/video/plugins/bmovl.py Tue Dec 19 07:26:12 2006
@@ -158,7 +158,7 @@
try:
update = self.screen.subsurface(rect)
except Exception, e:
- print e
+ print 'update:', e
print rect, self.screen
return
|