From 355cc0dfbe4a0e82bceb8f785585a856ee8dfa54 Mon Sep 17 00:00:00 2001
From: Marat Fayzullin <luarvique@gmail.com>
Date: Tue, 9 Jan 2024 16:03:23 -0500
Subject: [PATCH] Fixing stored file name computation.

---
 owrx/fax.py     | 11 ++++++-----
 owrx/sstv.py    | 11 ++++++-----
 owrx/storage.py |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/owrx/fax.py b/owrx/fax.py
index 0b361218..197cac69 100644
--- a/owrx/fax.py
+++ b/owrx/fax.py
@@ -32,16 +32,17 @@ class FaxParser(ThreadModule):
     def closeFile(self):
         if self.file is not None:
             try:
-                logger.debug("Closing bitmap file '%s'." % self.file.name)
+                filePath = self.file.name
+                logger.debug("Closing bitmap file '%s'." % filePath)
                 self.file.close()
                 self.file = None
                 if self.height==0 or self.line<self.height:
-                    logger.debug("Deleting short bitmap file '%s'." % self.file.name)
-                    os.unlink(self.file.name)
+                    logger.debug("Deleting short bitmap file '%s'." % filePath)
+                    os.unlink(filePath)
                 else:
                     # Convert file from BMP to PNG
-                    logger.debug("Converting '%s' to PNG..." % self.file.name)
-                    Storage.convertImage(self.file.name)
+                    logger.debug("Converting '%s' to PNG..." % filePath)
+                    Storage.convertImage(filePath)
                     # Delete excessive files from storage
                     logger.debug("Performing storage cleanup...")
                     Storage.getSharedInstance().cleanStoredFiles()
diff --git a/owrx/sstv.py b/owrx/sstv.py
index d3cd5d1f..bc04375c 100644
--- a/owrx/sstv.py
+++ b/owrx/sstv.py
@@ -75,16 +75,17 @@ class SstvParser(ThreadModule):
     def closeFile(self):
         if self.file is not None:
             try:
-                logger.debug("Closing bitmap file '%s'." % self.file.name)
+                filePath = self.file.name
+                logger.debug("Closing bitmap file '%s'." % filePath)
                 self.file.close()
                 self.file = None
                 if self.height==0 or self.line<self.height:
-                    logger.debug("Deleting short bitmap file '%s'." % self.file.name)
-                    os.unlink(self.file.name)
+                    logger.debug("Deleting short bitmap file '%s'." % filePath)
+                    os.unlink(filePath)
                 else:
                     # Convert file from BMP to PNG
-                    logger.debug("Converting '%s' to PNG..." % self.file.name)
-                    Storage.convertImage(self.file.name)
+                    logger.debug("Converting '%s' to PNG..." % filePath)
+                    Storage.convertImage(filePath)
                     # Delete excessive files from storage
                     logger.debug("Performing storage cleanup...")
                     Storage.getSharedInstance().cleanStoredFiles()
diff --git a/owrx/storage.py b/owrx/storage.py
index 9212cf0c..0c567705 100644
--- a/owrx/storage.py
+++ b/owrx/storage.py
@@ -35,10 +35,10 @@ class Storage(object):
         with self.lock:
             if not os.path.exists(filePath):
                 return open(filePath, "wb", buffering = buffering)
-            elif filePath.contains("."):
+            elif "." in filePath:
                 filePathX = "-{0}.".join(filePath.rsplit(".", 1))
                 for i in range(99):
-                    filePath1 = filePathX.format(i)
+                    filePath1 = filePathX.format(i + 1)
                     if not os.path.exists(filePath1):
                         return open(filePath1, "wb", buffering = buffering)