libs5-python 1.0.8__tar.gz → 1.0.10__tar.gz

{libs5_python-1.0.8 → libs5_python-1.0.10}/.gitignore

@@ -43,4 +43,8 @@ dist/libs5_python-1.0.5.tar.gz
 dist/libs5_python-1.0.6-py3-none-any.whl
 dist/libs5_python-1.0.6.tar.gz
 dist/libs5_python-1.0.7-py3-none-any.whl
-dist/libs5_python-1.0.7.tar.gz
+dist/libs5_python-1.0.7.tar.gz
+dist/libs5_python-1.0.8-py3-none-any.whl
+dist/libs5_python-1.0.8.tar.gz
+dist/libs5_python-1.0.9-py3-none-any.whl
+dist/libs5_python-1.0.9.tar.gz

{libs5_python-1.0.8 → libs5_python-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libs5-python
-Version: 1.0.8
+Version: 1.0.10
 Summary: libs5 python scripts, and helper classes (useg e.g. in BEANS software)
 Project-URL: Homepage, https://gitlab.com/ahypki/libs5-python
 Project-URL: Issues, https://gitlab.com/ahypki/libs5-python/-/issues/

{libs5_python-1.0.8 → libs5_python-1.0.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "libs5-python"
-version = "1.0.8"
+version = "1.0.10"
 authors = [
   { name="Arkadiusz Hypki" },
 ]

{libs5_python-1.0.8 → libs5_python-1.0.10}/src/net/hypki/Ini.py

@@ -63,6 +63,29 @@ class Ini(object):
                     keys.append(self.__getKey(line))
         return keys
     
+    def remove(self, section, key):
+        v = self.get(section, key)
+        if v is None:
+            return
+        
+        newLines = []
+        currentSection = None
+        for line in self.__getIni():
+            if self.__isSection(line):
+                currentSection = self.__getSection(line)
+            
+            currentKey = None
+            if self.__isKey(line):
+                currentKey = self.__getKey(line)
+                
+            if currentSection is not None and currentSection == section and currentKey is not None and currentKey == key:
+                # not adding this line
+                pass
+            else:
+                newLines.append(line)
+                
+        self.__iniLines = newLines
+    
     def add(self, section, key, value):
         v = self.get(section, key)
         forceAdd = True
@@ -73,28 +96,58 @@ class Ini(object):
     def set(self, section, key, value, forceAdd = False):
         newLines = []
         currentSection = None
+        newKeyAdded = False
         for line in self.__getIni():
             lineAdded = False
             
             if self.__isSection(line):
                 currentSection = self.__getSection(line)
                 
-            if forceAdd and currentSection is not None and currentSection == section:
+            if newKeyAdded is False and forceAdd and currentSection is not None and currentSection == section:
+                newLines.append(line)
                 newLines.append(key + " = " + value)
                 lineAdded = True
+                newKeyAdded = True
             else:
                 if self.__isKey(line):
                     currentKey = self.__getKey(line)
                     if currentSection is not None and currentSection == section and currentKey == key:
                         newLines.append(key + " = " + value)
                         lineAdded = True
+                        newKeyAdded = True
                     
             if not lineAdded:
                 newLines.append(line)
                 
+        if newKeyAdded is False:
+            if forceAdd:
+                newLines.append(f"")
+                newLines.append(f"[{section}]")
+                newLines.append(f"{key} = {value}")
+                
         self.__iniLines = newLines
         
-    def get(self, section, key):
+    def getFloat(self, section, key, defaultValue = 0.0):
+        g = self.get(section, key, defaultValue = None)
+        if g is None:
+            return defaultValue
+        elif isinstance(g, str):
+            return float(g)
+        else:
+            return defaultValue
+        
+    def getInt(self, section, key, defaultValue = 0):
+        g = self.get(section, key, defaultValue = None)
+        if g is None:
+            return defaultValue
+        elif isinstance(g, str):
+            return int(g)
+        elif isinstance(g, int):
+            return g
+        else:
+            return defaultValue
+        
+    def get(self, section, key, defaultValue = None):
         currentSection = None
         for line in self.__getIni():
             if self.__isSection(line):
@@ -104,10 +157,22 @@ class Ini(object):
                 currentKey = self.__getKey(line)
                 if currentSection is not None and currentSection == section and currentKey == key:
                     return line[(line.index("=") + 1):].strip()
-        return None
+        return defaultValue
+
+    # names: this is list of strings in a format section.key e.g.: ['Mcluster.n', 'Mcluster.rh_mcl']
+    # values: tuple with values e.g.: ('50000', '1.0')
+    def updateValues(self, names, values):
+        i = 0
+        for oneCarth in values:
+            sec = names[i].split(".")[0]
+            key = names[i].split(".")[1]
+            value = oneCarth
+        
+            self.set(sec, key, value)
+            i += 1
         
-    def save(self):
+    def save(self, newPath = None):
         if self.__iniLines is not None:
-            with open(self.__path, 'w') as f:
+            with open(self.__path if newPath is None else newPath, 'w') as f:
                 for line in self.__iniLines:
                     f.write(f"{line.strip()}\n")

{libs5_python-1.0.8 → libs5_python-1.0.10}/src/net/hypki/args.py

@@ -7,6 +7,13 @@ Created on 15-06-2013
 import sys
 
 class ArgUtils:
+    
+    def getStrings(name):  # @NoSelf
+        v = []
+        for i in range(len(sys.argv)):
+            if sys.argv[i] == "--" + name or sys.argv[i] == "-" + name:
+                v.append(sys.argv[i + 1].strip())
+        return v
 
     def getString(name, defaultvalue):  # @NoSelf
         for i in range(len(sys.argv)):
@@ -18,4 +25,10 @@ class ArgUtils:
         for i in range(len(sys.argv)):
             if sys.argv[i] == "--" + name or sys.argv[i] == "-" + name:
                 return True
-        return False
+        return False
+    
+    def getArgsCount():  # @NoSelf
+        return len(sys.argv)
+    
+    def getArg(idx):  # @NoSelf
+        return sys.argv[idx]