fixed bad links file_list

This commit is contained in:
ville rantanen
2014-07-23 09:06:59 +03:00
parent 9144e89a9e
commit 4ba197146b
2 changed files with 15 additions and 9 deletions

View File

@@ -155,13 +155,18 @@ def add_recurse(options):
def add_single(conn,filename,change=False,hash=None,minsize=0): def add_single(conn,filename,change=False,hash=None,minsize=0):
db=conn.cursor()
print "%(f)s" % {'f':filename} print "%(f)s" % {'f':filename}
db=conn.cursor()
try:
if hash==None: if hash==None:
hash=get_md5(filename) hash=get_md5(filename)
ftime=os.path.getmtime(filename) ftime=os.path.getmtime(filename)
fsize=os.path.getsize(filename) fsize=os.path.getsize(filename)
mime=MIME.file(filename.encode('UTF-8')) mime=MIME.file(filename.encode('UTF-8'))
except IOError:
print("File not found. Bad link?")
return
if change: if change:
db.execute("UPDATE list SET date=?, hash=?, size=?, mime=? \ db.execute("UPDATE list SET date=?, hash=?, size=?, mime=? \
WHERE file=?",(ftime,hash,fsize,mime,filename)) WHERE file=?",(ftime,hash,fsize,mime,filename))

View File

@@ -8,8 +8,9 @@
exit exit
} }
sqlfile="$1"
[[ -z "$2" ]] && { [[ -z "$2" ]] && {
table=$( sqlite3 "$1" "SELECT name FROM sqlite_master WHERE name NOT LIKE 'sqlite%' LIMIT 1;" ) table=$( sqlite3 "$sqlfile" "SELECT name FROM sqlite_master WHERE name NOT LIKE 'sqlite%' LIMIT 1;" )
} || { } || {
table="$2" table="$2"
} }
@@ -19,5 +20,5 @@
query="$table" query="$table"
} }
sqlite3 -header -separator ' ' -nullvalue NA "$1" "$query" | ncsv sqlite3 -header -separator ' ' -nullvalue NA "$sqlfile" "$query" | ncsv