TSVZ 2.65__tar.gz → 2.67__tar.gz

{tsvz-2.65 → tsvz-2.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TSVZ
-Version: 2.65
+Version: 2.67
 Summary: An simple in memory wrapper around a TSV file to function as a database
 Home-page: https://github.com/yufei-pan/TSVZ
 Author: Yufei Pan

{tsvz-2.65 → tsvz-2.67}/TSVZ.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TSVZ
-Version: 2.65
+Version: 2.67
 Summary: An simple in memory wrapper around a TSV file to function as a database
 Home-page: https://github.com/yufei-pan/TSVZ
 Author: Yufei Pan

{tsvz-2.65 → tsvz-2.67}/TSVZ.py

@@ -10,7 +10,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     import fcntl
 
-version = '2.65'
+version = '2.67'
 author = 'pan@zopyr.us'
 
 
@@ -384,12 +384,22 @@ def clearTSV(fileName,teeLogger = None,header = '',verifyHeader = False,verbose
         __teePrintOrNot(f"Cleared {fileName}",teeLogger=teeLogger)
 
 def getFileUpdateTimeNs(fileName):
+    # return 0 if the file does not exist
+    if not os.path.isfile(fileName):
+        return 0
     try:
         return os.stat(fileName).st_mtime_ns
     except:
         __teePrintOrNot(f"Failed to get file update time for {fileName}",'error')
-        return time.time_ns()
+        return get_time_ns()
 
+def get_time_ns():
+    try:
+        return time.time_ns()
+    except:
+        # try to get the time in nanoseconds
+        return int(time.time()*1e9)
+    
 # create a tsv class that functions like a ordered dictionary but will update the file when modified
 class TSVZed(OrderedDict):
     def __teePrintOrNot(self,message,level = 'info'):
@@ -503,7 +513,7 @@ class TSVZed(OrderedDict):
         if self.verbose:
             self.__teePrintOrNot(f"Appending {key} to the appendQueue")
         self.appendQueue.append('\t'.join(value))
-        self.lastUpdateTime = time.time_ns()
+        self.lastUpdateTime = get_time_ns()
         # if not self.appendThread.is_alive():
         #     self.commitAppendToFile()
         # else:
@@ -521,7 +531,7 @@ class TSVZed(OrderedDict):
         if self.memoryOnly:
             return
         self.__appendEmptyLine(key)
-        self.lastUpdateTime = time.time_ns()
+        self.lastUpdateTime = get_time_ns()
         
     def __appendEmptyLine(self,key):
         self.dirty = True
@@ -614,7 +624,7 @@ memoryOnly:{self.memoryOnly}
         key, value = super().popitem(last)
         if not self.memoryOnly:
             self.__appendEmptyLine(key)
-        self.lastUpdateTime = time.time_ns()
+        self.lastUpdateTime = get_time_ns()
         return key, value
     
     __marker = object()
@@ -632,7 +642,7 @@ memoryOnly:{self.memoryOnly}
         value = super().pop(key)
         if not self.memoryOnly:
             self.__appendEmptyLine(key)
-        self.lastUpdateTime = time.time_ns()
+        self.lastUpdateTime = get_time_ns()
         return value
     
     def move_to_end(self, key, last=True):
@@ -647,7 +657,7 @@ memoryOnly:{self.memoryOnly}
             self.__teePrintOrNot(f"rewrite_on_exit set to True")
         if self.verbose:
             self.__teePrintOrNot(f"Warning: Trying to move Key {key} moved to {'end' if last else 'beginning'} Need to resync for changes to apply to disk")
-        self.lastUpdateTime = time.time_ns()
+        self.lastUpdateTime = get_time_ns()
         return self
     
     @classmethod
@@ -777,6 +787,8 @@ memoryOnly:{self.memoryOnly}
     def checkExternalChanges(self):
         if self.deSynced:
             return self
+        if not self.monitor_external_changes:
+            return self
         realExternalFileUpdateTime = getFileUpdateTimeNs(self._fileName)
         if self.externalFileUpdateTime < realExternalFileUpdateTime:
             self.deSynced = True
@@ -877,12 +889,15 @@ memoryOnly:{self.memoryOnly}
             if self.verbose:
                 self.__teePrintOrNot(f"File {file.name} unlocked / released")
         except Exception as e:
-            self.__teePrintOrNot(f"Failed to release file {file.name}: {e}",'error')
-        finally:
             try:
                 self.writeLock.release()  # Ensure the thread lock is always released
             except Exception as e:
                 self.__teePrintOrNot(f"Failed to release writeLock for {file.name}: {e}",'error')
+            self.__teePrintOrNot(f"Failed to release file {file.name}: {e}",'error')
+        try:
+            self.writeLock.release()  # Ensure the thread lock is always released
+        except Exception as e:
+            self.__teePrintOrNot(f"Failed to release writeLock for {file.name}: {e}",'error')
         self.externalFileUpdateTime = getFileUpdateTimeNs(self._fileName)
 
 

{tsvz-2.65 → tsvz-2.67}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='TSVZ',
-    version='2.65',  
+    version='2.67',  
     py_modules=['TSVZ'],  # List of module names (without .py)
     description='An simple in memory wrapper around a TSV file to function as a database',
     author='Yufei Pan',