diff --git a/image_list.py b/image_list.py index 969be3c..ae4d0c3 100755 --- a/image_list.py +++ b/image_list.py @@ -45,6 +45,8 @@ def setup_options(): help="Minimum pixel width/height of stored image for --small search [%(default)s]") parser.add_argument("-r",action="store_true",dest="random",default=False, help="Create randomized files for landscape and portrait images [%(default)s]") + parser.add_argument("-R",action="store_true",dest="relative",default=False, + help="Try to find relative path of files, if --measuring from a different machine [%(default)s]") parser.add_argument("-s",type=str,dest="search",default=False, help="Search list based on path pattern") parser.add_argument("--measure",action="store_true",dest="measure",default=False, @@ -194,7 +196,7 @@ def add_recurse(options): sys.exit(1) # if file mentioned, and hash same, no need to change entry conn.commit() - append_data(conn) + append_data(options) return def add_single(conn,filename,change=False,hash=None,minsize=0): @@ -213,7 +215,9 @@ def add_single(conn,filename,change=False,hash=None,minsize=0): print("adding: %(f)s (%(x)s)" % {'f':filename, 'x':humanize_size(fsize)}) return -def append_data(conn): +def append_data(options): + conn=sqlite3.connect(options.sqlfile) + conn.text_factory=str print("Append basic metadata...") db=conn.cursor() dbh=conn.cursor() @@ -228,6 +232,7 @@ def append_data(conn): filename=hash2file(conn.cursor(),row[0]) if filename==None: continue + filename=check_path(filename,options) dims=get_dims(filename) if int(dims[0])