markus
/
photofloat
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Don't crash when unable to unlink

patches
Joachim Tingvold 2015-06-17 20:41:38 +02:00
parent 49b4667703
commit 0e258a46dc
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scanner/PhotoAlbum.py
View File

@ -388,16 +388,26 @@ class Photo(object):
) )
if p == False: if p == False:
message("couldn't extract video frame", os.path.basename(original_path)) message("couldn't extract video frame", os.path.basename(original_path))
os.unlink(tfn) try:
os.unlink(tfn)
except:
pass
self.is_valid = False self.is_valid = False
return return
try: try:
image = Image.open(tfn) image = Image.open(tfn)
except KeyboardInterrupt: except KeyboardInterrupt:
try:
os.unlink(tfn)
except:
pass
raise raise
except: except:
message("couldn't open video thumbnail", tfn) message("couldn't open video thumbnail", tfn)
os.unlink(tfn) try:
os.unlink(tfn)
except:
pass
self.is_valid = False self.is_valid = False
return return
mirror = image mirror = image
@ -411,7 +421,10 @@ class Photo(object):
for size in Photo.thumb_sizes: for size in Photo.thumb_sizes:
if size[1]: if size[1]:
self._thumbnail(mirror, original_path, thumb_path, size[0], size[1]) self._thumbnail(mirror, original_path, thumb_path, size[0], size[1])
os.unlink(tfn) try:
os.unlink(tfn)
except:
pass
def _video_transcode(self, transcode_path, original_path): def _video_transcode(self, transcode_path, original_path):
transcode_path = os.path.join(transcode_path, video_cache(self._path)) transcode_path = os.path.join(transcode_path, video_cache(self._path))
@ -460,7 +473,7 @@ class Photo(object):
if p == False: if p == False:
message("transcoding failure", os.path.basename(original_path)) message("transcoding failure", os.path.basename(original_path))
try: try:
os.unlink(transcode_path) os.unlink(transcode_path)
except: except:
pass pass
self.is_valid = False self.is_valid = False