arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2024-12-21 10:59:03 +00:00
Code Releases Wiki Activity

Move try/except of cache db to get() and put()

Browse Source 
- Move the try/except of cache db calls to the calls themselves.
- Add some additional information to logging statements on cache db
  exception to improve troubleshooting.
This commit is contained in:
Andrew Senetar 2022-07-07 21:52:22 -05:00
parent 97f490b8b7
commit 71af825b37
Signed by: arsenetar
GPG Key ID: C63300DCE48AB2F1
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
core/fs.py
View File

@ -144,13 +144,17 @@ class FilesDB:
stat = path.stat() stat = path.stat()
size = stat.st_size size = stat.st_size
mtime_ns = stat.st_mtime_ns mtime_ns = stat.st_mtime_ns
try:
with self.lock:
self.cur.execute(
self.select_query.format(key=key), {"path": str(path), "size": size, "mtime_ns": mtime_ns}
)
result = self.cur.fetchone()
with self.lock: if result:
self.cur.execute(self.select_query.format(key=key), {"path": str(path), "size": size, "mtime_ns": mtime_ns}) return result[0]
result = self.cur.fetchone() except Exception as ex:
logging.warning(f"Couldn't get {key} for {path} w/{size}, {mtime_ns}: {ex}")
if result:
return result[0]
return None return None
@ -158,12 +162,14 @@ class FilesDB:
stat = path.stat() stat = path.stat()
size = stat.st_size size = stat.st_size
mtime_ns = stat.st_mtime_ns mtime_ns = stat.st_mtime_ns
try:
with self.lock: with self.lock:
self.cur.execute( self.cur.execute(
self.insert_query.format(key=key), self.insert_query.format(key=key),
{"path": str(path), "size": size, "mtime_ns": mtime_ns, "value": value}, {"path": str(path), "size": size, "mtime_ns": mtime_ns, "value": value},
) )
except Exception as ex:
logging.warning(f"Couldn't put {key} for {path} w/{size}, {mtime_ns}: {ex}")
def commit(self) -> None: def commit(self) -> None:
with self.lock: with self.lock:
@ -265,34 +271,25 @@ class File:
self.size = nonone(stats.st_size, 0) self.size = nonone(stats.st_size, 0)
self.mtime = nonone(stats.st_mtime, 0) self.mtime = nonone(stats.st_mtime, 0)
elif field == "digest_partial": elif field == "digest_partial":
try: self.digest_partial = filesdb.get(self.path, "digest_partial")
self.digest_partial = filesdb.get(self.path, "digest_partial") if self.digest_partial is None:
if self.digest_partial is None: self.digest_partial = self._calc_digest_partial()
self.digest_partial = self._calc_digest_partial() filesdb.put(self.path, "digest_partial", self.digest_partial)
filesdb.put(self.path, "digest_partial", self.digest_partial)
except Exception as e:
logging.warning("Couldn't get digest_partial for %s: %s", self.path, e)
elif field == "digest": elif field == "digest":
try: self.digest = filesdb.get(self.path, "digest")
self.digest = filesdb.get(self.path, "digest") if self.digest is None:
if self.digest is None: self.digest = self._calc_digest()
self.digest = self._calc_digest() filesdb.put(self.path, "digest", self.digest)
filesdb.put(self.path, "digest", self.digest)
except Exception as e:
logging.warning("Couldn't get digest for %s: %s", self.path, e)
elif field == "digest_samples": elif field == "digest_samples":
size = self.size size = self.size
# Might as well hash such small files entirely. # Might as well hash such small files entirely.
if size <= MIN_FILE_SIZE: if size <= MIN_FILE_SIZE:
setattr(self, field, self.digest) setattr(self, field, self.digest)
return return
try: self.digest_samples = filesdb.get(self.path, "digest_samples")
self.digest_samples = filesdb.get(self.path, "digest_samples") if self.digest_samples is None:
if self.digest_samples is None: self.digest_samples = self._calc_digest_samples()
self.digest_samples = self._calc_digest_samples() filesdb.put(self.path, "digest_samples", self.digest_samples)
filesdb.put(self.path, "digest_samples", self.digest_samples)
except Exception as e:
logging.warning(f"Couldn't get digest_samples for {self.path}: {e}")
def _read_all_info(self, attrnames=None): def _read_all_info(self, attrnames=None):
"""Cache all possible info. """Cache all possible info.