Merge branch 'D20250817_001--cfg_os_ops' into 'master'

Usage of "os" is replaced with ConfigurationOsOps

See merge request d.kovalenko/testgres.postgres_configuration!1

Author: Dmitry Kovalenko

setup.py

@@ -35,6 +35,9 @@
         "testgres.postgres_configuration.core.option.handlers.set_value",
         "testgres.postgres_configuration.core.option.handlers.set_value_item",
         "testgres.postgres_configuration.core.option.handlers.write",
+        "testgres.postgres_configuration.os",
+        "testgres.postgres_configuration.os.abstract",
+        "testgres.postgres_configuration.os.local",
     ],
     package_dir={"testgres.postgres_configuration": "src"},
     description="PostgreSQL Configuration Python Library",

src/core/controller_utils.py

@@ -14,11 +14,12 @@
 from .model import FileData as PgCfgModel__FileData
 # fmt: on
 
+from ..os.abstract.configuration_os_ops import ConfigurationOsOps
+
 from .raise_error import RaiseError
 from .bugcheck_error import BugCheckError
 from .helpers import Helpers
 
-import os
 import typing
 
 # //////////////////////////////////////////////////////////////////////////////
@@ -350,12 +351,13 @@ def Cfg__CreateAndAddTopLevelFile__AUTO(
         assert type(cfgData) == PgCfgModel__ConfigurationData
         assert type(cfgData.m_Files) == list
         assert type(cfgData.m_AllFilesByName) == dict
+        assert isinstance(cfgData.OsOps, ConfigurationOsOps)
         assert type(file_name) == str
         assert file_name != ""
-        assert os.path.basename(file_name) == file_name
+        assert cfgData.OsOps.Path_BaseName(file_name) == file_name
 
-        newFilePath = os.path.join(cfgData.m_DataDir, file_name)
-        newFilePath = os.path.normpath(newFilePath)
+        newFilePath = cfgData.OsOps.Path_Join(cfgData.m_DataDir, file_name)
+        newFilePath = cfgData.OsOps.Path_NormPath(newFilePath)
 
         assert type(newFilePath) == str
         assert newFilePath != ""
@@ -370,9 +372,10 @@ def Cfg__CreateAndAddTopLevelFile__USER(
         assert type(cfgData.m_Files) == list
         assert type(cfgData.m_AllFilesByName) == dict
         assert type(path) == str
+        assert isinstance(cfgData.OsOps, ConfigurationOsOps)
         assert path != ""
 
-        newFilePath = Helpers.NormalizeFilePath(cfgData.m_DataDir, path)
+        newFilePath = Helpers.NormalizeFilePath(cfgData.OsOps, cfgData.m_DataDir, path)
 
         assert type(newFilePath) == str
         assert newFilePath != ""
@@ -395,11 +398,12 @@ def Cfg__GetOrCreateFile__USER(
         assert type(cfgData) == PgCfgModel__ConfigurationData
         assert type(cfgData.m_Files) == list
         assert type(cfgData.m_AllFilesByName) == dict
+        assert isinstance(cfgData.OsOps, ConfigurationOsOps)
         assert type(baseFolder) == str
         assert type(path) == str
         assert path != ""
 
-        newFilePath = Helpers.NormalizeFilePath(baseFolder, path)
+        newFilePath = Helpers.NormalizeFilePath(cfgData.OsOps, baseFolder, path)
 
         assert type(newFilePath) == str
         assert newFilePath != ""
@@ -492,13 +496,14 @@ def Helper__RegFileInCfgData(
         assert cfgData is not None
         assert fileData is not None
         assert type(cfgData) == PgCfgModel__ConfigurationData
+        assert isinstance(cfgData.OsOps, ConfigurationOsOps)
         assert type(fileData) == PgCfgModel__FileData
         assert type(fileData.m_Path) == str
         assert fileData.m_Path != ""
 
         assert fileData.IsAlive()
 
-        fileName = os.path.basename(fileData.m_Path)
+        fileName = cfgData.OsOps.Path_BaseName(fileData.m_Path)
         assert type(fileName) == str
         assert fileName != ""
 
@@ -513,12 +518,13 @@ def Helper__UnRegFileFromCfgData(
         assert cfgData is not None
         assert fileData is not None
         assert type(cfgData) == PgCfgModel__ConfigurationData
+        assert isinstance(cfgData.OsOps, ConfigurationOsOps)
         assert type(fileData) == PgCfgModel__FileData
         assert fileData.m_Path != ""
 
         assert fileData.IsAlive()
 
-        fileName = os.path.basename(fileData.m_Path)
+        fileName = cfgData.OsOps.Path_BaseName(fileData.m_Path)
         assert type(fileName) == str
         assert fileName != ""
 

src/core/helpers.py

@@ -4,8 +4,9 @@
 from .model import OptionData
 from .bugcheck_error import BugCheckError
 
+from ..os.abstract.configuration_os_ops import ConfigurationOsOps
+
 import typing
-import os
 
 # //////////////////////////////////////////////////////////////////////////////
 
@@ -63,24 +64,30 @@ def DoesContainerContainsValue__NotNullAndExact(
         return False
 
     # --------------------------------------------------------------------
-    def NormalizeFilePath(baseFolder: str, filePath: str) -> str:
+    def NormalizeFilePath(
+        cfgOsOps: ConfigurationOsOps,
+        baseFolder: str,
+        filePath: str
+    ) -> str:
+        assert cfgOsOps is not None
+        assert isinstance(cfgOsOps, ConfigurationOsOps)
         assert type(baseFolder) == str
         assert type(filePath) == str
         assert filePath != ""
 
         newFilePath = None
 
-        if os.path.isabs(filePath):
-            newFilePath = os.path.normpath(filePath)
+        if cfgOsOps.Path_IsAbs(filePath):
+            newFilePath = cfgOsOps.Path_NormPath(filePath)
         else:
-            newFilePath = os.path.join(baseFolder, filePath)
-            newFilePath = os.path.normpath(newFilePath)
+            newFilePath = cfgOsOps.Path_Join(baseFolder, filePath)
+            newFilePath = cfgOsOps.Path_NormPath(newFilePath)
 
         assert type(newFilePath) == str
         assert newFilePath != ""
 
-        newFilePath = os.path.abspath(newFilePath)
-        newFilePath = os.path.normcase(newFilePath)
+        newFilePath = cfgOsOps.Path_AbsPath(newFilePath)
+        newFilePath = cfgOsOps.Path_NormCase(newFilePath)
 
         return newFilePath
 

src/core/model.py

@@ -5,8 +5,9 @@
 
 from .raise_error import RaiseError
 
+from ..os.abstract.configuration_os_ops import ConfigurationOsOps
+
 import typing
-import os
 import enum
 import datetime
 
@@ -213,9 +214,9 @@ class FileData(ObjectData):
     def __init__(self, parent: ConfigurationData, path: str):
         assert type(parent) == ConfigurationData
         assert type(path) == str
-        assert os.path.isabs(path)
-        assert os.path.normpath(path) == path
-        assert os.path.normcase(path) == path
+        assert parent.OsOps.Path_IsAbs(path)
+        assert parent.OsOps.Path_NormPath(path) == path
+        assert parent.OsOps.Path_NormCase(path) == path
 
         super().__init__()
 
@@ -251,24 +252,35 @@ def IsAlive(self) -> bool:
 
 class ConfigurationData(ObjectData):
     m_DataDir: str
+    m_OsOps: ConfigurationOsOps
+
     m_Files: list[FileData]
 
     m_AllOptionsByName: dict[str, typing.Union[OptionData, list[OptionData]]]
     m_AllFilesByName: dict[str, typing.Union[FileData, list[FileData]]]
 
     # --------------------------------------------------------------------
-    def __init__(self, data_dir: str):
+    def __init__(self, data_dir: str, osOps: ConfigurationOsOps):
         assert type(data_dir) == str
+        assert isinstance(osOps, ConfigurationOsOps)
 
         super().__init__()
 
         self.m_DataDir = data_dir
+        self.m_OsOps = osOps
+
         self.m_Files = list[FileData]()
         self.m_AllOptionsByName = dict[
             str, typing.Union[OptionData, list[OptionData]]
         ]()
         self.m_AllFilesByName = dict[str, typing.Union[FileData, list[FileData]]]()
 
+    # Own interface ------------------------------------------------------
+    @property
+    def OsOps(self) -> ConfigurationOsOps:
+        assert isinstance(self.m_OsOps, ConfigurationOsOps)
+        return self.m_OsOps
+
     # Object interface ---------------------------------------------------
     def get_Parent(self) -> FileData:
         return None