fixing clean cache statement

[photosort.git] / src / locator.py

diff --git a/src/locator.py b/src/locator.py
index 7a57e090cba90548ffdc5ccf7bb09f0615f21c97..3b866f8550e6d65f39b15aeb5c8b234dedcad42d 100644 (file)
--- a/src/locator.py
+++ b/src/locator.py
@@ -10,10 +10,10 @@ class Locator:
         self._base_dir = base_dir
         self._exclude_dir = exclude_dir
         if not os.path.isfile(db_file):
         self._base_dir = base_dir
         self._exclude_dir = exclude_dir
         if not os.path.isfile(db_file):

-            self._conn = sqlite3.connect(db_file)
+            self._conn = sqlite3.connect(db_file, check_same_thread=False)

             self._create_db()
         else:
             self._create_db()
         else:

-            self._conn = sqlite3.connect(db_file)
+            self._conn = sqlite3.connect(db_file, check_same_thread=False)

         logging.info("Opened locator for %s.", self._base_dir)
 
     def locate_file(self, name, size, meta_time):
         logging.info("Opened locator for %s.", self._base_dir)
 
     def locate_file(self, name, size, meta_time):


@@ -30,7 +30,8 @@ class Locator:
             else:
                 self._remove_from_cache(name, size, meta_time)
         else:
             else:
                 self._remove_from_cache(name, size, meta_time)
         else:

-            file_dir = misc.find_file(name, size, meta_time)
+            file_dir = misc.find_file(self._base_dir, name, size, meta_time,
+                                      self._exclude_dir)

             if file_dir:
                 self._clean_cache()
                 self._add_to_cache(name, size, meta_time, file_dir)
             if file_dir:
                 self._clean_cache()
                 self._add_to_cache(name, size, meta_time, file_dir)


@@ -61,7 +62,7 @@ class Locator:
 
     def _clean_cache(self):
         c = self._conn.cursor()
 
     def _clean_cache(self):
         c = self._conn.cursor()

-        c.execute("DELETE FROM cache WHERE access_time<?", (int(time.time()) - 604800))
+        c.execute("DELETE FROM cache WHERE access_time<?", (int(time.time()) - 604800,))

         self._conn.commit()
 
     def _create_db(self):
         self._conn.commit()
 
     def _create_db(self):