From 319e8584c8e6e933022b04b75849e04f221962a4 Mon Sep 17 00:00:00 2001
From: q <q@six9.net>
Date: Thu, 12 Jun 2025 09:33:26 +0300
Subject: [PATCH] handle bad file names by skipping them

---
 py-packages/imagelist2/imagelist2/__init__.py | 11 ++++++++---
 py-packages/imagelist2/imagelist2/db.py       | 15 ++++++++++-----
 py-packages/imagelist2/imagelist2/image.py    |  6 +++++-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/py-packages/imagelist2/imagelist2/__init__.py b/py-packages/imagelist2/imagelist2/__init__.py
index 489c9c6..c5e37d8 100644
--- a/py-packages/imagelist2/imagelist2/__init__.py
+++ b/py-packages/imagelist2/imagelist2/__init__.py
@@ -10,7 +10,7 @@ from imagelist2.db import DB, DBCachedWriter, sqlite_sqrt, sqlite_square
 from imagelist2.image import ImageBrokenError, ImageMeasure, is_image_extension
 from tqdm import tqdm
 
-__version__ = "0.0.8"
+__version__ = "0.0.9"
 SQLFILE = "image-list.sqlite"
 BADDIRS = ["_tn", "_med", ".tn", ".med"]
 MINSIZE = 0
@@ -53,6 +53,11 @@ class ImageList:
             for file in tqdm(files, desc="Files", delay=1, position=1, leave=False):
                 if not is_image_extension(file):
                     continue
+                try:
+                    file.encode("utf-8")
+                except UnicodeEncodeError:
+                    print(f"File in folder {path} has incompatible name for unicode encoding")
+                    continue
                 image = ImageMeasure(file)
                 if file in db_files:
                     if self.options.changed:
@@ -890,7 +895,8 @@ def main():
 
     options = setup_options()
     il = ImageList(options)
-
+    if il.db.migrated:
+        sys.exit(0)
     if options.command == "db":
         if not options.no_add:
             il.recursive_add()
@@ -919,7 +925,6 @@ def main():
             il.broken()
     if options.command == "tag":
         il.tag_manage()
-    print("")
 
 
 if __name__ == "__main__":
diff --git a/py-packages/imagelist2/imagelist2/db.py b/py-packages/imagelist2/imagelist2/db.py
index 4c6363e..9d6b813 100644
--- a/py-packages/imagelist2/imagelist2/db.py
+++ b/py-packages/imagelist2/imagelist2/db.py
@@ -78,7 +78,7 @@ class DB:
             # last version without config
             config_version = "0.0.6"
         self.migrated = True
-        if config_version == "0.0.6": # => 0.0.7
+        if config_version == "0.0.6":  # => 0.0.7
             try:
                 with sqlite3.connect(self.sqlfile, timeout=30) as db:
                     cursor = db.cursor()
@@ -96,16 +96,21 @@ class DB:
                 cursor.execute("UPDATE data SET broken = ?;", (False,))
                 db.commit()
 
-        if config_version == "0.0.7": # => 0.0.8
+        if config_version == "0.0.7":  # => 0.0.8
             with sqlite3.connect(self.sqlfile, timeout=30) as db:
                 cursor = db.cursor()
                 config_version = "0.0.8"
-                cursor.execute("UPDATE config SET value = ? WHERE key = ?;", (config_version,"version"))
+                cursor.execute("UPDATE config SET value = ? WHERE key = ?;", (config_version, "version"))
+                db.commit()
+
+        if config_version == "0.0.8":  # => 0.0.9
+            with sqlite3.connect(self.sqlfile, timeout=30) as db:
+                cursor = db.cursor()
+                config_version = "0.0.9"
+                cursor.execute("UPDATE config SET value = ? WHERE key = ?;", (config_version, "version"))
                 db.commit()
 
         print(f"Migrated to {config_version}. Restart", file=sys.stderr)
-        sys.exit(1)
-
 
     def connect(self):
         conn = sqlite3.connect(self.sqlfile, timeout=30)
diff --git a/py-packages/imagelist2/imagelist2/image.py b/py-packages/imagelist2/imagelist2/image.py
index 2a7598a..5cd9800 100644
--- a/py-packages/imagelist2/imagelist2/image.py
+++ b/py-packages/imagelist2/imagelist2/image.py
@@ -154,7 +154,11 @@ class ImageMeasure:
 
     def get_p_hash(self):
         if self.p_hash is None:
-            self.p_hash = str(imagehash.phash(self.get_image("PIL"), hash_size=8))
+            try:
+                self.p_hash = str(imagehash.phash(self.get_image("PIL"), hash_size=8))
+            except Exception:
+                self.broken = True
+                self.p_hash = ""
         return self.p_hash
 
     def get_sharpness(self):