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/csv/__init__.py

@@ -0,0 +1 @@
+"""Parser delle centraline"""

utils/ftp/file_management.py

@@ -5,7 +5,7 @@ import mysql.connector
 
 from utils.database.connection import connetti_db
 
-from utils.config.parser import extract_value
+from utils.csv.parser import extract_value
 
 logger = logging.getLogger(__name__)
 

utils/parsers/cr1000x_cr1000x.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)

utils/parsers/d2w_d2w.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)

utils/parsers/g201_g201.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)

utils/parsers/g301_g301.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)

utils/parsers/g801_iptm.py

@@ -1,4 +1,4 @@
 from .g801_mums import main_loader as g801_mums_main_loader
 
-def main_loader(cfg: object, id: int) -> None:
+async def main_loader(cfg: object, id: int) -> None:
     return g801_mums_main_loader(cfg, id)

utils/parsers/g801_loc.py

@@ -1,11 +1,11 @@
 #!.venv/bin/python
 from utils.database.loader_action import load_data
-from utils.parsers.data_preparation import make_loc_matrix
+from utils.csv.data_preparation import make_loc_matrix
 import logging
 
 logger = logging.getLogger(__name__)
 
-def main_loader(cfg, id):
+async def main_loader(cfg, id):
     matrice_valori = make_loc_matrix(cfg, id)
     load_data(cfg, matrice_valori)
 

utils/parsers/g801_mums.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)

utils/parsers/g801_musa.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)

utils/parsers/g801_mux.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)

utils/parsers/g802_dsas.py

@@ -1,4 +1,4 @@
 from .g801_mums import main_loader as g801_mums_main_loader
 
-def main_loader(cfg: object, id: int) -> None:
+async def main_loader(cfg: object, id: int) -> None:
     return g801_mums_main_loader(cfg, id)

utils/parsers/g802_gd.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)

utils/parsers/g802_loc.py

@@ -1,4 +1,4 @@
 from .g801_loc import main_loader as g801_loc_main_loader
 
-def main_loader(cfg: object, id: int) -> None:
+async def main_loader(cfg: object, id: int) -> None:
     return g801_loc_main_loader(cfg, id)

utils/parsers/g802_modb.py

@@ -1,4 +1,4 @@
 from .g801_mums import main_loader as g801_mums_main_loader
 
-def main_loader(cfg: object, id: int) -> None:
+async def main_loader(cfg: object, id: int) -> None:
     return g801_mums_main_loader(cfg, id)

utils/parsers/g802_mums.py

@@ -1,4 +1,4 @@
 from .g801_mums import main_loader as g801_mums_main_loader
 
-def main_loader(cfg: object, id: int) -> None:
+async def main_loader(cfg: object, id: int) -> None:
     return g801_mums_main_loader(cfg, id)

utils/parsers/g802_mux.py

@@ -1,4 +1,4 @@
 from .g801_mux import main_loader as g801_mux_main_loader
 
-def main_loader(cfg: object, id: int) -> None:
+async def main_loader(cfg: object, id: int) -> None:
     return g801_mux_main_loader(cfg, id)

utils/parsers/gs1_gs1.py

@@ -1,4 +1,4 @@
 from .tlp_tlp import main_loader as tlp_tlp_main_loader
 
-def main_loader(cfg: object, id: int) -> None:
+async def main_loader(cfg: object, id: int) -> None:
     return tlp_tlp_main_loader(cfg, id)

utils/parsers/hortus_hortus.py

@@ -1,4 +1,4 @@
 from .cr1000x_cr1000x import main_loader as cr1000x_cr1000x_main_loader
 
-def main_loader(cfg: object, id: int) -> None:
+async def main_loader(cfg: object, id: int) -> None:
     return cr1000x_cr1000x_main_loader(cfg, id)

utils/parsers/tlp_tlp.py

@@ -1,7 +1,7 @@
 #!.venv/bin/python
 # Import necessary modules
 from utils.database.loader_action import load_data, update_status, DATA_LOADED
-from utils.parsers.data_preparation import make_matrix
+from utils.csv.data_preparation import make_matrix
 import logging
 
 logger = logging.getLogger(__name__)