TSVZ 3.16__tar.gz → 3.18__tar.gz

{tsvz-3.16 → tsvz-3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: TSVZ
-Version: 3.16
+Version: 3.18
 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-3.16 → tsvz-3.18}/TSVZ.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: TSVZ
-Version: 3.16
+Version: 3.18
 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-3.16 → tsvz-3.18}/TSVZ.py

@@ -22,7 +22,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     import fcntl
 
-version = '3.16'
+version = '3.18'
 __version__ = version
 author = 'pan@zopyr.us'
 
@@ -57,10 +57,10 @@ def get_delimiter(delimiter,file_name = ''):
     return rtn
 
 def pretty_format_table(data, delimiter = DEFAULT_DELIMITER,header = None):
-    version = 1.1
+    version = 1.11
     if not data:
         return ''
-    if type(data) == str:
+    if isinstance(data, str):
         data = data.strip('\n').split('\n')
         data = [line.split(delimiter) for line in data]
     elif isinstance(data, dict):
@@ -72,7 +72,7 @@ def pretty_format_table(data, delimiter = DEFAULT_DELIMITER,header = None):
         else:
             # it is a dict of lists
             data = [[key] + list(value) for key, value in data.items()]
-    elif type(data) != list:
+    elif not isinstance(data,list):
         data = list(data)
     # format the list into 2d list of list of strings
     if isinstance(data[0], dict):
@@ -87,6 +87,9 @@ def pretty_format_table(data, delimiter = DEFAULT_DELIMITER,header = None):
         #col_widths[c] = max(len(row[c]) for row in data)
         # handle ansii escape sequences
         col_widths[c] = max(len(re.sub(r'\x1b\[[0-?]*[ -/]*[@-~]','',row[c])) for row in data)
+    if header:
+        header_widths = [len(re.sub(r'\x1b\[[0-?]*[ -/]*[@-~]', '', col)) for col in header]
+        col_widths = [max(col_widths[i], header_widths[i]) for i in range(num_cols)]
     # Build the row format string
     row_format = ' | '.join('{{:<{}}}'.format(width) for width in col_widths)
     # Print the header
@@ -425,7 +428,7 @@ def _formatHeader(header,verbose = False,teeLogger = None,delimiter = DEFAULT_DE
     Returns:
         str: The formatted header string.
     """
-    if type(header) != str:
+    if not isinstance(header,str):
         try:
             header = delimiter.join(header)
         except:
@@ -644,17 +647,22 @@ def appendLinesTabularFile(fileName,linesToAppend,teeLogger = None,header = '',c
         return
     formatedLines = []
     for line in linesToAppend:
-        if type(line) == str:
+        if isinstance(linesToAppend,dict):
+            key = line
+            line = linesToAppend[key]
+        if isinstance(line,str):
             line = line.split(delimiter)
-        else:
+        elif line:
             for i in range(len(line)):
-                if type(line[i]) != str:
+                if not isinstance(line[i],str):
                     try:
                         line[i] = str(line[i])
                     except Exception as e:
                         line[i] = str(e)
+        if isinstance(linesToAppend,dict):
+            if not line or line[0] != key:
+                line = [key]+line
         formatedLines.append(line)
-    
     with open(fileName, mode ='r+b')as file:
         correctColumnNum = max([len(line) for line in formatedLines])
         if header.rstrip():
@@ -843,10 +851,10 @@ class TSVZed(OrderedDict):
         if not key:
             self.__teePrintOrNot('Key cannot be empty','error')
             return
-        if type(value) == str:
+        if isinstance(value,str):
             value = value.split(self.delimiter)
         # sanitize the value
-        value = [(str(segment).rstrip() if type(segment) != str else segment.rstrip()) if segment else '' for segment in value]
+        value = [(str(segment).rstrip() if not isinstance(segment,str) else segment.rstrip()) if segment else '' for segment in value]
         # escape the delimiter and newline characters
         value = [segment.replace(self.delimiter,'<sep>').replace('\n','\\n') for segment in value]
         # the first field in value should be the key