diff --git a/classes/database.py b/classes/database.py index 0075b62..52ba1df 100644 --- a/classes/database.py +++ b/classes/database.py @@ -180,9 +180,9 @@ class Database: return [f[0] for f in cur.fetchall()] - def getCompletionByFileUUID(self, fileuuid: str) -> List[Optional[str]]: + def getCompletionByFileUUID(self, fileuuid: str) -> list[Optional[str]]: cur = self.getCursor() - cur.execute("SELECT vessel FROM contentmonster_file_log WHERE file = ?", (fileuuid)) + cur.execute("SELECT vessel FROM contentmonster_file_log WHERE file = ?", (fileuuid,)) return [v[0] for v in cur.fetchall()] diff --git a/classes/directory.py b/classes/directory.py index b8822fe..4cba8f7 100644 --- a/classes/directory.py +++ b/classes/directory.py @@ -61,7 +61,7 @@ class Directory: if os.path.isfile(self.completeddir): raise FileExistsError("Cannot create directory %s - path exists but is not a directory!" % str(self.completeddir)) - os.path.mkdir(self.completeddir) + os.mkdir(self.completeddir) def getFiles(self) -> list[File]: """Get all Files in Directory diff --git a/classes/file.py b/classes/file.py index b042601..395eee5 100644 --- a/classes/file.py +++ b/classes/file.py @@ -41,7 +41,7 @@ class File: return os.path.isfile(self.directory.location / self.name) def moveCompleted(self) -> None: - self.getFullPath.rename(self.directory.completeddir / self.name) + self.getFullPath().rename(self.directory.completeddir / self.name) def getUUID(self) -> str: """Return unique identifier for this File object diff --git a/classes/vesselthread.py b/classes/vesselthread.py index 33cea2f..b03e3f4 100644 --- a/classes/vesselthread.py +++ b/classes/vesselthread.py @@ -143,7 +143,7 @@ class VesselThread(Process): def checkFileCompletion(self, fileobj: File) -> None: db = Database() - complete = db.getCompletionByFileUUID() + complete = db.getCompletionByFileUUID(fileobj.uuid) del(db) for vessel in [v.name for v in self._state["config"].vessels]: