-#! /usr/bin/env python
+#! /usr/bin/env python3
"""Rescan filesystem and update database
Rescan images directories; remove unknown images from DB; add new images.
import os
import subprocess
+
from sqlobject import SQLObjectNotFound
from sqlobject.sqlbuilder import Insert, Update, Delete
+from m_lib.defenc import default_encoding
+
from xsetbg_conf import xsetbg_dir, xsetbg_conf
from xsetbg_db import recreate_db, SQLiteMassInsert
def is_image(full_path):
# Run `identify` from ImageMagic; convert retcode to bool
- return not subprocess.call(['identify', full_path],
+ return not subprocess.call(['identify', full_path.encode(fs_encoding)],
stdout=NULL, stderr=subprocess.STDOUT)
# List images in all subdirectories
for dirpath, dirs, files in os.walk(image_dir):
for file in files:
- full_name = os.path.join(dirpath, file).decode(fs_encoding)
+ if default_encoding != fs_encoding:
+ file = file.encode().decode(fs_encoding)
+ full_name = os.path.join(dirpath, file)
try:
row = xsetbg_db.byFull_name(full_name)
except SQLObjectNotFound:
- values = {'full_name': full_name.encode('utf-8'),
+ values = {'full_name': full_name,
'is_image': is_image(full_name),
'flag': True,
}
txn.query(query)
NULL.close()
-print "New images:", count_new
-print "Existing images:", count_old
-print "Removed images:", count_del
+print("New images:", count_new)
+print("Existing images:", count_old)
+print("Removed images:", count_del)