Ftp server improvement (#193)

* Improved check and verbosity on received file consistency

* Version increased

* Addressed PR comments

Author: stefanodellosa-personal

wadas/_version.py

@@ -17,5 +17,5 @@
 # Date: 2024-08-14
 # Description: module to keep track of WADAS version
 
-__version__ = "v1.0.0.a2"
+__version__ = "v1.0.0.a3"
 __dbversion__ = __version__

wadas/domain/ftps_server.py

@@ -82,22 +82,30 @@ def on_login(self, username):
     def on_logout(self, username):
         logger.info("%s camera logged out.", username)
 
-    def on_file_received(self, file):
-        logger.info("Received %s file from FTPS camera %s.", file, self.username)
+    def on_file_received(self, received_file):
+        logger.info("Received %s file from FTPS camera %s.", received_file, self.username)
 
         # check if the received file match one of the allowed extensions
         # (the check relies on an inspection of the file content)
-        if (ftype := filetype.guess(file)) and f".{ftype.extension}" in self.ALLOWED_EXTS:
-            media_queue.put(
-                {
-                    "media_path": file,
-                    "media_id": pathlib.PurePath(file).parent.name,
-                    "camera_id": self.username,
-                }
-            )
+
+        if ftype := filetype.guess(received_file):
+            file_ext = ftype.extension
+            logger.debug("Extension of received file: %s", file_ext)
+
+            if f".{ftype.extension}" in self.ALLOWED_EXTS:
+                media_queue.put(
+                    {
+                        "media_path": received_file,
+                        "media_id": pathlib.PurePath(received_file).parent.name,
+                        "camera_id": self.username,
+                    }
+                )
+            else:
+                logger.warning("Unsupported file %s. Removing file.", received_file)
+                os.remove(received_file)
         else:
-            logger.warning("Unsupported file %s. Removing file.", file)
-            os.remove(file)
+            logger.warning("Unable to determine file type for %s. Removing file.", received_file)
+            os.remove(received_file)
 
     def on_incomplete_file_received(self, file):
         logger.info("Partial file received. Removing %s", file)