add missing arguments

[photosort.git] / src / locator.py

diff --git a/src/locator.py b/src/locator.py
index 7ec362fc0772993ad1f6b3f86664bc9e1cb84a41..c19bd6c926d925689f0c5ba447d61ab3cb29f526 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)


@@ -67,8 +68,8 @@ class Locator:
     def _create_db(self):
         logging.info("Creating locator database for %s...", self._base_dir)
         c = self._conn.cursor()
     def _create_db(self):
         logging.info("Creating locator database for %s...", self._base_dir)
         c = self._conn.cursor()

-        c.execute('''CREATE TABLE cache
-                       (name TEXT, size INTEGER, meta_time INTEGER, file_dir TEXT,
-                        access_time INTEGER),
-                     PRIMARY KEY (name, size, meta_time)''')
+        c.execute('''CREATE TABLE cache(
+                       name TEXT, size INTEGER, meta_time INTEGER, file_dir TEXT,
+                       access_time INTEGER,
+                       PRIMARY KEY (name, size, meta_time))''')

         self._conn.commit()
         self._conn.commit()