diff --git a/tbfDBBackup/Configuration.cs b/tbfDBBackup/Configuration.cs index 4347c71..9f8630f 100644 --- a/tbfDBBackup/Configuration.cs +++ b/tbfDBBackup/Configuration.cs @@ -1,4 +1,5 @@ using System.Text.Json; +using System.Text.Json.Serialization; using tbfDBBackup.configuration; namespace tbfDBBackup; @@ -9,11 +10,19 @@ public class Configuration public const string FileName = "configuration.json"; public string? PathToDumpMysql { get; set; } + + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public Boolean? WaitOnEndCmdOpen { get; set; } + + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public Boolean? PrintConfigurationEnabled { get; set; } public List? DbConnectionStrings { get; set; } + + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public List? UpdateString { get; set; } + + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public List? BackupDB { get; set; } diff --git a/tbfDBBackup/Program.cs b/tbfDBBackup/Program.cs index 16d6789..9b3a366 100644 --- a/tbfDBBackup/Program.cs +++ b/tbfDBBackup/Program.cs @@ -203,7 +203,7 @@ void BackupDatabase(BackupCombination backupCombination) //Deactivate if only one time possible run - if ((backupCombination.Path.IsOneTimeOpaque ?? false) && (backupCombination.Path.Enabled??false)) + if ((backupCombination.Path.IsOneTimeOpaque ?? false) && (backupCombination.Path.Enabled??true)) { backupCombination.Path.Enabled = false; } diff --git a/tbfDBBackup/config/configuration.json b/tbfDBBackup/config/configuration.json index 0212f99..4a8a91c 100644 --- a/tbfDBBackup/config/configuration.json +++ b/tbfDBBackup/config/configuration.json @@ -4,16 +4,16 @@ "PrintConfigurationEnabled": false, "DbConnectionStrings": [ { - "Enabled": false, "Name": "Settings DB", "Connection": "SERVER=localhost; DATABASE={DatabaseName}; UID=root; PASSWORD=; CHARSET=utf8;", - "DatabaseName": "wrcswindon298" + "DatabaseName": "wrcswindon298", + "Enabled": false }, { - "Enabled": true, "Name": "Results DB", "Connection": "SERVER=localhost; DATABASE={DatabaseName}; UID=root; PASSWORD=; CHARSET=utf8;", - "DatabaseName": "wrcswindon298-r" + "DatabaseName": "wrcswindon298-r", + "Enabled": true } ], "UpdateString": [ @@ -26,30 +26,29 @@ ], "BackupDB": [ { - "Enabled": true, "DbConnectionStringsName": "Results DB", "StoreDirPaths": [ { - "Path": "C:\\TBF\\" + "Path": "C:\\TBF\\", + "IsOneTimeOpaque": true }, { - "Path": "C:\\TBF\\storeString", - "Enable": false + "Path": "C:\\TBF\\storeString" } - ] + ], + "Enabled": true }, { - "Enabled": false, "DbConnectionStringsName": "Settings DB", "StoreDirPaths": [ { "Path": "C:\\TBF\\" }, { - "Path": "C:\\TBF\\storeString", - "Enable": true + "Path": "C:\\TBF\\storeString" } - ] + ], + "Enabled": false } ] } \ No newline at end of file diff --git a/tbfDBBackup/configuration/StandardBehaviour.cs b/tbfDBBackup/configuration/StandardBehaviour.cs index 87446fd..8f9d419 100644 --- a/tbfDBBackup/configuration/StandardBehaviour.cs +++ b/tbfDBBackup/configuration/StandardBehaviour.cs @@ -1,7 +1,11 @@ -namespace tbfDBBackup.configuration; +using System.Text.Json.Serialization; + +namespace tbfDBBackup.configuration; public class StandardBehaviour { + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public Boolean? Enabled { get; set; } + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public Boolean? IsOneTimeOpaque { get; set; } } \ No newline at end of file