Merge lp:~samuel-buffet/entertainer/bug_373707 into lp:entertainer

[Samuel Buffet]

try/except to catch IOError exception while trying to open an image file. (Fixes Bug 373707)

[Samuel Buffet (samuel-buffet)]

Hi,

I've tried this 2 lines fix on my desktop with success.

Samuel-

Note :
I know this code is likely to be obsolete soon with the new server. But I don't know if Paul is going to rewrite everything or will reuse some parts of the actual code.

[Matt Layman (mblayman)]

This branch works. `make check` was okay. I checked the error log and verified that it wrote to the log file so I know that the exception was handled properly.

This branch just needs a commit message.

review: Approve

=== modified file 'entertainerlib/backend/components/mediacache/image_cache.py'
--- entertainerlib/backend/components/mediacache/image_cache.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/components/mediacache/image_cache.py	2009-05-11 21:45:54 +0000
@@ -282,8 +282,12 @@
         title = tmp.replace('_',' ').title() # Make title more attractive
         description = "" # No description for this image file
 
-        im = Image.open(filename)
-        width, height = im.size
+        try:
+            im = Image.open(filename)
+            width, height = im.size
+        except IOError:
+            self.logger.error("Couldn't identify image file: " + filename)
+            return
 
         # Create thumbnail and return hash
         thumbnailer = ImageThumbnailer(filename)