From 4ba197146b164eb0863cd596f241c6b9e1efca1c Mon Sep 17 00:00:00 2001
From: ville rantanen <ville.rantanen@helsinki.fi>
Date: Wed, 23 Jul 2014 09:06:59 +0300
Subject: [PATCH] fixed bad links file_list

---
 file_list.py | 19 ++++++++++++-------
 sqlite3ncsv  |  5 +++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/file_list.py b/file_list.py
index bf2edcc..7d6aa02 100755
--- a/file_list.py
+++ b/file_list.py
@@ -154,14 +154,19 @@ def add_recurse(options):
     return
 
 def add_single(conn,filename,change=False,hash=None,minsize=0):
-
-    db=conn.cursor()
+    
     print "%(f)s" % {'f':filename}
-    if hash==None:
-        hash=get_md5(filename)
-    ftime=os.path.getmtime(filename)
-    fsize=os.path.getsize(filename)
-    mime=MIME.file(filename.encode('UTF-8'))
+    db=conn.cursor()
+    try:
+        if hash==None:
+            hash=get_md5(filename)
+        ftime=os.path.getmtime(filename)
+        fsize=os.path.getsize(filename)
+        mime=MIME.file(filename.encode('UTF-8'))
+    except IOError:
+        print("File not found. Bad link?")
+        return
+
     if change:
         db.execute("UPDATE list SET date=?, hash=?, size=?, mime=? \
                WHERE file=?",(ftime,hash,fsize,mime,filename))
diff --git a/sqlite3ncsv b/sqlite3ncsv
index 422e484..345a2ba 100755
--- a/sqlite3ncsv
+++ b/sqlite3ncsv
@@ -8,8 +8,9 @@
     exit
 }
 
+sqlfile="$1"
 [[ -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"
 }
@@ -19,5 +20,5 @@
     query="$table"
 }
 
-sqlite3 -header -separator '	' -nullvalue NA "$1" "$query" | ncsv
+sqlite3 -header -separator '	' -nullvalue NA "$sqlfile" "$query" | ncsv