Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
from .implementation.v00.configuration_std import PostgresConfigurationReader_Std as PostgresConfigurationReader

from .implementation.v00.configuration_std import PostgresConfigurationWriter_Std as PostgresConfigurationWriter

from .abstract.v00.configuration import PostgresConfigurationOption
from .abstract.v00.configuration import PostgresConfigurationInclude
from .abstract.v00.configuration import PostgresConfigurationIncludeIfExists
from .abstract.v00.configuration import PostgresConfigurationComment
from .abstract.v00.configuration import PostgresConfigurationOptions
from .abstract.v00.configuration import PostgresConfigurationFiles
from .abstract.v00.configuration import AddIncludeIfExistsRule
from .abstract.v00.configuration import PostgresConfigurationSetOptionValueResult
from .abstract.v00.configuration import PostgresConfigurationSetOptionValueEventID
# fmt: on

# //////////////////////////////////////////////////////////////////////////////
Expand All @@ -16,6 +26,15 @@
"PostgresConfiguration",
"PostgresConfigurationReader",
"PostgresConfigurationWriter",
"PostgresConfigurationOption",
"PostgresConfigurationInclude",
"PostgresConfigurationIncludeIfExists",
"PostgresConfigurationComment",
"PostgresConfigurationOptions",
"PostgresConfigurationFiles",
"AddIncludeIfExistsRule",
"PostgresConfigurationSetOptionValueResult",
"PostgresConfigurationSetOptionValueEventID",
]


Expand Down
54 changes: 54 additions & 0 deletions src/abstract/v00/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
import typing
import enum

# //////////////////////////////////////////////////////////////////////////////
# AddIncludeIfExistsRule


class AddIncludeIfExistsRule(enum.Enum):
without_file = 0
with_file = 1


# //////////////////////////////////////////////////////////////////////////////
# class PostgresConfigurationObject

Expand Down Expand Up @@ -174,6 +183,27 @@ def Delete(
RaiseError.MethodIsNotImplemented(__class__, "Delete")


# //////////////////////////////////////////////////////////////////////////////
# class PostgresConfigurationIncludeIfExists


class PostgresConfigurationIncludeIfExists(PostgresConfigurationElement):
def __init__(self):
super().__init__()

# interface ----------------------------------------------------------
def get_File(self) -> typing.Optional[PostgresConfigurationFile]:
RaiseError.MethodIsNotImplemented(__class__, "get_File")

# --------------------------------------------------------------------
def Delete(
self,
withLine: bool,
) -> None:
assert type(withLine) is bool
RaiseError.MethodIsNotImplemented(__class__, "Delete")


# //////////////////////////////////////////////////////////////////////////////
# class PostgresConfigurationFileLine

Expand Down Expand Up @@ -220,6 +250,19 @@ def AddInclude(
assert (offset is None) or (type(offset) is int)
RaiseError.MethodIsNotImplemented(__class__, "AddInclude")

# --------------------------------------------------------------------
def AddIncludeIfExists(
self,
path: str,
offset: typing.Optional[int],
rule: AddIncludeIfExistsRule,
) -> PostgresConfigurationIncludeIfExists:
assert type(path) is str
assert path != ""
assert (offset is None) or (type(offset) is int)
assert type(rule) is AddIncludeIfExistsRule
RaiseError.MethodIsNotImplemented(__class__, "AddIncludeIfExists")

# --------------------------------------------------------------------
def Clear(self) -> None:
RaiseError.MethodIsNotImplemented(__class__, "Clear")
Expand Down Expand Up @@ -313,6 +356,17 @@ def AddInclude(
assert path != ""
RaiseError.MethodIsNotImplemented(__class__, "AddInclude")

# --------------------------------------------------------------------
def AddIncludeIfExists(
self,
path: str,
rule: AddIncludeIfExistsRule,
) -> PostgresConfigurationIncludeIfExists:
assert type(path) is str
assert path != ""
assert type(rule) is AddIncludeIfExistsRule
RaiseError.MethodIsNotImplemented(__class__, "AddIncludeIfExists")

# --------------------------------------------------------------------
#
# Method for inserting, updating and deleting of an option.
Expand Down
18 changes: 18 additions & 0 deletions src/core/bugcheck_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,12 @@ def IncludeIsNotFoundInFileLine() -> typing.NoReturn:
errMsg = "Include is not found in file line."
__class__.Helper__Raise(errMsg)

# --------------------------------------------------------------------
@staticmethod
def IncludeIfExistsIsNotFoundInFileLine() -> typing.NoReturn:
errMsg = "IncludeIfExists is not found in file line."
__class__.Helper__Raise(errMsg)

# --------------------------------------------------------------------
@staticmethod
def FileLineIsNotFoundInFile() -> typing.NoReturn:
Expand Down Expand Up @@ -296,6 +302,18 @@ def UnknownOptionValueType(

__class__.Helper__Raise(errMsg)

# --------------------------------------------------------------------
@staticmethod
def UnknownAddIncludeIfExistsRule(
value: typing.AnyStr,
) -> typing.NoReturn:

errMsg = "Unknown AddIncludeIfExistsRule: {}.".format(
value,
)

__class__.Helper__Raise(errMsg)

# --------------------------------------------------------------------
@staticmethod
def UnsupportedPgConfStrategy(
Expand Down
35 changes: 35 additions & 0 deletions src/core/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,41 @@ def __init__(
return


# //////////////////////////////////////////////////////////////////////////////
# IncludeIfExistsData


class IncludeIfExistsData(FileLineElementData):
m_Path: str
m_File: typing.Optional[FileData]

# --------------------------------------------------------------------
def __init__(
self,
parent: FileLineData,
offset: typing.Optional[int],
path: str,
fileData: typing.Optional[FileData],
):
assert type(parent) is FileLineData
assert type(path) is str
assert fileData is None or type(fileData) is FileData
assert offset is None or type(offset) is int

assert parent.IsAlive()

if fileData is not None:
assert fileData.IsAlive()
assert fileData.get_Parent() is parent.get_Parent().get_Parent()
pass

super().__init__(parent, offset)

self.m_Path = path
self.m_File = fileData
return


# //////////////////////////////////////////////////////////////////////////////
# FileLineData

Expand Down
133 changes: 132 additions & 1 deletion src/core/model_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from .model import CommentData as PgCfgModel__CommentData
from .model import OptionData as PgCfgModel__OptionData
from .model import IncludeData as PgCfgModel__IncludeData
from .model import IncludeIfExistsData as PgCfgModel__IncludeIfExistsData
from .model import FileLineData as PgCfgModel__FileLineData
from .model import FileData as PgCfgModel__FileData
from .model import MultiIndex as PgCfgModel__MultiIndex
Expand Down Expand Up @@ -110,6 +111,31 @@ def Include__delete(
__class__.Helper__DeleteFileLine(cfgData, fileLineData)
return

# --------------------------------------------------------------------
@staticmethod
def IncludeIfExists__delete(
cfgData: PgCfgModel__ConfigurationData,
includeIfExistsData: PgCfgModel__IncludeIfExistsData,
withLine: bool,
) -> None:
assert type(cfgData) is PgCfgModel__ConfigurationData
assert type(includeIfExistsData) is PgCfgModel__IncludeIfExistsData
assert type(withLine) is bool

fileLineData = includeIfExistsData.m_Parent
assert fileLineData is not None
assert type(fileLineData) is PgCfgModel__FileLineData

__class__.Helper__DeleteIncludeIfExists(includeIfExistsData)

if not withLine:
return

assert not __class__.Helper__FileLineHasWorkData(fileLineData)

__class__.Helper__DeleteFileLine(cfgData, fileLineData)
return

# --------------------------------------------------------------------
@staticmethod
def Comment__delete(
Expand Down Expand Up @@ -193,6 +219,9 @@ def Helper__CheckThatWeCanAddCommentToFileLine(
if type(lastItem.m_Element) is PgCfgModel__IncludeData:
return

if type(lastItem.m_Element) is PgCfgModel__IncludeIfExistsData:
return

if type(lastItem.m_Element) is PgCfgModel__CommentData:
RaiseError.FileLineAlreadyHasComment()

Expand Down Expand Up @@ -230,7 +259,39 @@ def FileLine__add_Include(
fileLineDataItem,
)

# TODO: Reg include data in a global index?
return includeData

# --------------------------------------------------------------------
@staticmethod
def FileLine__add_IncludeIfExists(
fileLineData: PgCfgModel__FileLineData,
filePath: str,
fileData: typing.Optional[PgCfgModel__FileData],
offset: typing.Optional[int],
) -> PgCfgModel__IncludeIfExistsData:
assert type(fileLineData) is PgCfgModel__FileLineData
assert type(filePath) is str
assert fileData is None or type(fileData) is PgCfgModel__FileData
assert filePath != ""
assert offset is None or type(offset) is int

assert fileLineData.IsAlive()
assert fileData is None or fileData.IsAlive()

__class__.Helper__CheckThatWeCanAddWorkDataToFileLine(fileLineData)

includeData = PgCfgModel__IncludeIfExistsData(
fileLineData,
offset,
filePath,
fileData,
)
fileLineDataItem = PgCfgModel__FileLineData.tagItem(
includeData,
)
fileLineData.m_Items.append(
fileLineDataItem,
)

return includeData

Expand Down Expand Up @@ -325,6 +386,9 @@ def Helper__CheckThatWeCanAddWorkDataToFileLine(
if type(lastItem.m_Element) is PgCfgModel__IncludeData:
RaiseError.FileLineAlreadyHasIncludeDirective()

if type(lastItem.m_Element) is PgCfgModel__IncludeIfExistsData:
RaiseError.FileLineAlreadyHasIncludeIfExistsDirective()

if type(lastItem.m_Element) is PgCfgModel__CommentData:
RaiseError.FileLineAlreadyHasComment()

Expand Down Expand Up @@ -463,6 +527,27 @@ def File__FindSimpleOption(
return firstItem.m_Element # <--------- BINGO

if type(firstItem.m_Element) is PgCfgModel__IncludeData:
assert firstItem.m_Element.m_File is not None
assert type(firstItem.m_Element.m_File.m_Path) is str

if not enterIntoIncludes:
# Stop searching upwards: any option defined above an include
# might be overridden by that included file.
return None # <--------- FAIL

assert findCtx is not None
if not findCtx.reg_file(firstItem.m_Element.m_File.m_Path):
continue

nextFile = firstItem.m_Element.m_File
break

if type(firstItem.m_Element) is PgCfgModel__IncludeIfExistsData:
if firstItem.m_Element.m_File is None:
continue

assert type(firstItem.m_Element.m_File.m_Path) is str

if not enterIntoIncludes:
# Stop searching upwards: any option defined above an include
# might be overridden by that included file.
Expand Down Expand Up @@ -1036,6 +1121,9 @@ def Helper__DeleteElement(
if type(objectData) is PgCfgModel__IncludeData:
return __class__.Helper__DeleteInclude(objectData)

if type(objectData) is PgCfgModel__IncludeIfExistsData:
return __class__.Helper__DeleteIncludeIfExists(objectData)

BugCheckError.UnkObjectDataType(type(objectData))

# --------------------------------------------------------------------
Expand Down Expand Up @@ -1195,6 +1283,49 @@ def Helper__DeleteInclude(
fileLineData.m_Items.pop(iFileLineItem)
return

# --------------------------------------------------------------------
@staticmethod
def Helper__DeleteIncludeIfExists(
includeIfExistsData: PgCfgModel__IncludeIfExistsData,
) -> None:
assert type(includeIfExistsData) is PgCfgModel__IncludeIfExistsData
assert includeIfExistsData.IsAlive()

# 0.
fileLineData = None
iFileLineItem = None

# 1.1 Set fileLineData
fileLineData = includeIfExistsData.m_Parent
assert fileLineData is not None
assert type(fileLineData) is PgCfgModel__FileLineData
assert fileLineData.IsAlive()

# 1.2 Set iFileLineItem
iFileLineItem = __class__.Helper__FindIndexOfFileLineElement(
fileLineData,
includeIfExistsData,
)

assert iFileLineItem >= 0
assert iFileLineItem <= len(fileLineData.m_Items)

if iFileLineItem == len(fileLineData.m_Items):
BugCheckError.IncludeIfExistsIsNotFoundInFileLine()

assert iFileLineItem >= 0
assert iFileLineItem < len(fileLineData.m_Items)
assert fileLineData.m_Items[iFileLineItem] is not None
assert fileLineData.m_Items[iFileLineItem].m_Element is includeIfExistsData

# 2. Perform delete operations

# delete from fileLine
includeIfExistsData.MarkAsDeletedFrom(fileLineData)
assert not includeIfExistsData.IsAlive()
fileLineData.m_Items.pop(iFileLineItem)
return

# --------------------------------------------------------------------
@staticmethod
def Helper__DeleteFileLine(
Expand Down
Loading
Loading