diff --git a/image_list.py b/image_list.py index ae4d0c3..1ac6c2c 100755 --- a/image_list.py +++ b/image_list.py @@ -944,19 +944,18 @@ def import_metadata(options): conn=sqlite3.connect(options.sqlfile) conn.text_factory=str db=conn.cursor() - before=db.execute("SELECT COUNT(hash) FROM data").fetchall()[0][0] tagsbefore=db.execute("SELECT COUNT(hash) FROM tags").fetchall()[0][0] db.execute("ATTACH ? as fromDB", (options.importfile, )) - db.execute("INSERT OR IGNORE INTO main.data SELECT * FROM fromDB.data") + db.execute("INSERT OR REPLACE INTO main.data SELECT * FROM fromDB.data") db.execute("INSERT OR IGNORE INTO main.tags SELECT * FROM fromDB.tags") conn.commit() db.execute("""DELETE FROM main.tags WHERE rowid NOT IN ( SELECT MIN(rowid) FROM main.tags GROUP BY hash,tag )""") conn.commit() - after=db.execute("SELECT COUNT(hash) FROM data").fetchall()[0][0] + count=db.execute("SELECT COUNT(hash) FROM fromDB.data").fetchall()[0][0] tagsafter=db.execute("SELECT COUNT(hash) FROM tags").fetchall()[0][0] - print("Imported %d metadata, %d tags." % (after-before,tagsafter-tagsbefore)) + print("Imported %d metadata, %d tags." % (count,tagsafter-tagsbefore)) def check_path(path,opt): """ return relative path name to DB if real path doesnt exist """ diff --git a/rm_bg b/rm_bg index d8f7c50..9e7b889 100755 --- a/rm_bg +++ b/rm_bg @@ -11,7 +11,7 @@ function helpexit() { tempfolders=() for f in "$@"; do - d=$( readlink -nf $( dirname "$f" ) )/.rmgb.$$ + d=$( readlink -nf $( dirname "$f" ) )/.rm_bg.$$ mkdir -p "$d" mv $f "$d"/ tempfolders+=( "$d" )