From 6d75a3ed642529a99227d578f74ec14bd7e03d42 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 9 May 2011 09:33:30 -0400 Subject: [PATCH] To work around Espen's corrupted image bug, we simply try to copy the image twice. The second time will usually work, unless the file is totally borked. --- scanner/PhotoAlbum.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scanner/PhotoAlbum.py b/scanner/PhotoAlbum.py index 6e209e7..f21345f 100644 --- a/scanner/PhotoAlbum.py +++ b/scanner/PhotoAlbum.py @@ -207,7 +207,14 @@ class Photo(object): if os.path.exists(thumb_path) and file_mtime(thumb_path) >= self._attributes["dateTimeFile"]: return gc.collect() - image = image.copy() + try: + image = image.copy() + except: + try: + image = image.copy() # we try again to work around PIL bug + except: + print "Image is corrupted. %s will not be created." % thumb_path + return if square: if image.size[0] > image.size[1]: left = (image.size[0] - image.size[1]) / 2