Separate Lockfile into new class

1 files changed, 18 insertions, 23 deletions

diff --git a/jimbrella/admin_log.py b/jimbrella/admin_log.py
index 811d722..4cc9b16 100644
--- a/jimbrella/admin_log.py
+++ b/jimbrella/admin_log.py
@@ -1,6 +1,7 @@
 import csv
 import os
 from datetime import datetime
+from .lockfile import Lockfile
 
 
 class AdminLog:
@@ -33,25 +34,7 @@ class AdminLog:
 
     def __init__(self, path: str):
         self.path = path
-
-    def _lock(self) -> int:
-        """Create a lockfile for admin log. Operates in the sameway as `Database._lock`."""
-        try:
-            f = open(self.path + ".lock", "x")
-            f.close()
-            return 1
-        except FileExistsError:
-            return 0
-
-    def _unlock(self) -> None:
-        """Remove lockfile created by `_lock`.
-
-        If there is no lockfile, simply ignore.
-        """
-        try:
-            os.remove(self.path + ".lock")
-        except FileNotFoundError:
-            pass
+        self.lockfile = Lockfile(self.path)
 
     def _read(self) -> list:
         """Deserialize admin log."""
@@ -102,7 +85,7 @@ class AdminLog:
         `logs` is a list of log entries, to be appended at the end of the log file.
         """
         # wait until database is locked for this write
-        while not self._lock():
+        while not self.lockfile.lock():
             continue
 
         with open(self.path, "a") as f:  # append only
@@ -112,9 +95,21 @@ class AdminLog:
                 line = [event, entry["date"].isoformat()]
                 info = []
                 if event in ("TAKEAWAY", "GIVEBACK", "OVERDUE"):
-                    info = [entry["serial"], entry["tenant_name"], entry["tenant_id"], entry["tenant_phone"], entry["tenant_email"]]
+                    info = [
+                        entry["serial"],
+                        entry["tenant_name"],
+                        entry["tenant_id"],
+                        entry["tenant_phone"],
+                        entry["tenant_email"],
+                    ]
                 elif event == "ADMIN_MODIFY_DB":
-                    info = [entry["admin_name"], entry["serial"], entry["column"], entry["past_value"], entry["new_value"]]
+                    info = [
+                        entry["admin_name"],
+                        entry["serial"],
+                        entry["column"],
+                        entry["past_value"],
+                        entry["new_value"],
+                    ]
 
                 line.extend(info)
                 line.append(entry["note"])
@@ -122,4 +117,4 @@ class AdminLog:
 
             f.close()
 
-        self._unlock()
+        self.lockfile.unlock()