X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=rescan_fs.py;h=1b74f8f15213a4932f4e5326f134bf60e815183b;hb=8fedc324654b410682e313d2542726c8305b2b93;hp=82dbcf81efcdc22a9e59cd3146e5b0c0950ab3e0;hpb=d972f7582e458cbfbbf6a0eca72533ada9ad9324;p=xsetbg.git

diff --git a/rescan_fs.py b/rescan_fs.py
index 82dbcf8..1b74f8f 100755
--- a/rescan_fs.py
+++ b/rescan_fs.py
@@ -7,11 +7,8 @@ This file is a part of XSetBg.
 
 """
 
-__author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2015 PhiloSoft Design"
-__license__ = "GNU GPL"
-
 import os
+import subprocess
 from sqlobject import SQLObjectNotFound
 from sqlobject.sqlbuilder import Insert, Update, Delete
 from xsetbg_conf import xsetbg_dir, xsetbg_conf
@@ -47,6 +44,15 @@ fs_encoding = xsetbg_conf.get("images", "fs_encoding")
 xsetbg_db = recreate_db()
 count_new = count_old = count_del = 0
 
+NULL = open(os.devnull, 'w')
+
+
+def is_image(full_path):
+    # Run `identify` from ImageMagic; convert retcode to bool
+    return not subprocess.call(['identify', full_path],
+                               stdout=NULL, stderr=subprocess.STDOUT)
+
+
 with SQLiteMassInsert() as txn:
     for image_dir in image_dirs:
         # List images in all subdirectories
@@ -57,12 +63,16 @@ with SQLiteMassInsert() as txn:
                     row = xsetbg_db.byFull_name(full_name)
                 except SQLObjectNotFound:
                     values = {'full_name': full_name.encode('utf-8'),
-                              'flag': True}
+                              'is_image': is_image(full_name),
+                              'flag': True,
+                              }
                     query = txn.sqlrepr(Insert(xsetbg_db.sqlmeta.table,
                                                values=values))
                     txn.query(query)
                     count_new += 1
                 else:
+                    if row.is_image is None:
+                        row.is_image = is_image(full_name)
                     row.flag = True
                     count_old += 1
     count_del = xsetbg_db.select('flag IS NULL').count()
@@ -71,6 +81,7 @@ with SQLiteMassInsert() as txn:
     query = txn.sqlrepr(Update(xsetbg_db.sqlmeta.table, {'flag': None}))
     txn.query(query)
 
+NULL.close()
 print "New images:", count_new
 print "Existing images:", count_old
 print "Removed images:", count_del