reorg ini e log

utils/config/loader_ftp_csv.py

@@ -5,11 +5,12 @@ from configparser import ConfigParser
 
 class Config:
     def __init__(self):
+
         c = ConfigParser()
-        c.read(["/etc/aseftp/ftp_csv_receiver.ini", "./ftp_csv_receiver.ini"])
+        c.read(["env/ftp.ini", "env/db.ini"])
+
         # FTP setting
         self.firstport = c.getint("ftpserver", "firstPort")
-        self.logfilename = c.get("ftpserver", "logFilename")
         self.proxyaddr = c.get("ftpserver", "proxyAddr")
         self.portrangewidth = c.getint("ftpserver", "portRangeWidth")
         self.virtpath = c.get("ftpserver", "virtpath")
@@ -22,9 +23,8 @@ class Config:
         # CSV FILE setting
         self.csvfs = c.get("csvfs", "path")
 
-        # LOADER setting
-        self.elablog = c.get("csvelab", "logFilename")
-        self.max_threads = c.getint("csvelab", "max_threads")
+        # LOG setting
+        self.logfilename = c.get("logging", "logFilename")
 
         # DB setting
         self.dbhost = c.get("db", "hostname")
@@ -32,12 +32,13 @@ class Config:
         self.dbuser = c.get("db", "user")
         self.dbpass = c.get("db", "password")
         self.dbname = c.get("db", "dbName")
-        #self.dbschema = c.get("db", "dbSchema")
-        self.dbusertable = c.get("db", "userTableName")
-        self.dbrectable = c.get("db", "recTableName")
-        self.dbrawdata = c.get("db", "rawTableName")
-        self.dbrawdata = c.get("db", "rawTableName")
-        self.dbnodes = c.get("db", "nodesTableName")
+
+        # Tables
+        self.dbusertable = c.get("tables", "userTableName")
+        self.dbrectable = c.get("tables", "recTableName")
+        self.dbrawdata = c.get("tables", "rawTableName")
+        self.dbrawdata = c.get("tables", "rawTableName")
+        self.dbnodes = c.get("tables", "nodesTableName")
 
         # unit setting
         self.units_name = [part for part in c.get("unit", "Names").split('|')]

utils/config/loader_load_data.py

@@ -0,0 +1,31 @@
+"""set configurations
+
+"""
+from configparser import ConfigParser
+
+class Config:
+    def __init__(self):
+
+        c = ConfigParser()
+        c.read(["env/load.ini", "env/db.ini"])
+
+        # LOG setting
+        self.logfilename = c.get("logging", "logFilename")
+
+        # Worker setting
+        self.max_threads = c.getint("threads", "max_num")
+
+        # DB setting
+        self.dbhost = c.get("db", "hostname")
+        self.dbport = c.getint("db", "port")
+        self.dbuser = c.get("db", "user")
+        self.dbpass = c.get("db", "password")
+        self.dbname = c.get("db", "dbName")
+
+        # Tables
+        self.dbusertable = c.get("tables", "userTableName")
+        self.dbrectable = c.get("tables", "recTableName")
+        self.dbrawdata = c.get("tables", "rawTableName")
+        self.dbrawdata = c.get("tables", "rawTableName")
+        self.dbnodes = c.get("tables", "nodesTableName")
+

utils/config/loader_matlab_elab.py

@@ -0,0 +1,30 @@
+"""set configurations
+
+"""
+from configparser import ConfigParser
+
+class Config:
+    def __init__(self):
+
+        c = ConfigParser()
+        c.read(["env/elab.ini", "env/db.ini"])
+
+        # LOG setting
+        self.logfilename = c.get("logging", "logFilename")
+
+        # Worker setting
+        self.max_threads = c.getint("threads", "max_num")
+
+        # DB setting
+        self.dbhost = c.get("db", "hostname")
+        self.dbport = c.getint("db", "port")
+        self.dbuser = c.get("db", "user")
+        self.dbpass = c.get("db", "password")
+        self.dbname = c.get("db", "dbName")
+
+        # Tables
+        self.dbusertable = c.get("tables", "userTableName")
+        self.dbrectable = c.get("tables", "recTableName")
+        self.dbrawdata = c.get("tables", "rawTableName")
+        self.dbrawdata = c.get("tables", "rawTableName")
+        self.dbnodes = c.get("tables", "nodesTableName")

utils/config/parser.py

@@ -1,12 +0,0 @@
-import re
-
-def extract_value(patterns: list, primary_source: str, secondary_source: str, default='Not Defined') -> str:
-    """Extracts the first match for a list of patterns from the primary source.
-    Falls back to the secondary source if no match is found.
-    """
-    for source in (primary_source, secondary_source):
-        for pattern in patterns:
-            matches = re.findall(pattern, source, re.IGNORECASE)
-            if matches:
-                return matches[0]  # Return the first match immediately
-    return default  # Return default if no matches are found