aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2015-01-27 14:39:44 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2015-01-27 14:39:44 +0100
commit148b88951d49ffdcd1a8e47e0b8b44a18f2f718a (patch)
tree6390f9867ffafd961bc74f63d3e0a493a9ad0e69
parentDon't prefix root for images (diff)
downloadPhotoFloat-148b88951d49ffdcd1a8e47e0b8b44a18f2f718a.tar.xz
PhotoFloat-148b88951d49ffdcd1a8e47e0b8b44a18f2f718a.zip
Don't deal with invalid unicode
-rw-r--r--scanner/TreeWalker.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scanner/TreeWalker.py b/scanner/TreeWalker.py
index 191b187..f52873b 100644
--- a/scanner/TreeWalker.py
+++ b/scanner/TreeWalker.py
@@ -49,7 +49,10 @@ class TreeWalker:
except KeyboardInterrupt:
raise
except:
- pass
+ next_level()
+ message("unicode error", entry.decode(sys.getfilesystemencoding(), "replace"))
+ back_level()
+ continue
entry = os.path.join(path, entry)
if os.path.isdir(entry):
album.add_album(self.walk(entry))