winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Use branch name in config

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-05-25 19:03:10 +02:00
parent 7468af3970
commit 9229f27cf7
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Elwig/App.xaml.cs
View File

@ -32,13 +32,13 @@ namespace Elwig {
} }
protected override void OnStartup(StartupEventArgs evt) { protected override void OnStartup(StartupEventArgs evt) {
IEnumerable<string> branches = Array.Empty<string>(); Dictionary<string, string> branches = new();
using (var ctx = new AppDbContext()) { using (var ctx = new AppDbContext()) {
if (!ctx.Database.CanConnect()) { if (!ctx.Database.CanConnect()) {
MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error); MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
Shutdown(); Shutdown();
} else { } else {
branches = ctx.Branches.Select(b => b.ZwstId).ToList(); branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => b.ZwstId);
} }
} }
Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged)); Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
@ -67,15 +67,15 @@ namespace Elwig {
} }
Scales = list; Scales = list;
if (Config.ZwstId != null) { if (Config.Branch != null) {
if (!branches.Contains(Config.ZwstId)) { if (!branches.ContainsKey(Config.Branch.ToLower())) {
MessageBox.Show("Invalid branch id in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error); MessageBox.Show("Invalid branch name in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
Shutdown(); Shutdown();
} else { } else {
ZwstId = Config.ZwstId; ZwstId = branches[Config.Branch.ToLower()];
} }
} else if (branches.Count() == 1) { } else if (branches.Count == 1) {
ZwstId = branches.First(); ZwstId = branches.First().Value;
} else { } else {
MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error); MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
Shutdown(); Shutdown();

6
Elwig/Helpers/Config.cs
View File

@ -11,7 +11,7 @@ namespace Elwig.Helpers {
private readonly string FileName; private readonly string FileName;
public string DatabaseFile = App.DataPath + "database.sqlite3"; public string DatabaseFile = App.DataPath + "database.sqlite3";
public string? DatabaseLog = null; public string? DatabaseLog = null;
public string? ZwstId = null; public string? Branch = null;
public IEnumerable<string[]> Scales; public IEnumerable<string[]> Scales;
private readonly LinkedList<string[]> ScaleList = new(); private readonly LinkedList<string[]> ScaleList = new();
@ -45,9 +45,9 @@ namespace Elwig.Helpers {
} }
if (ini == null || !ini.TryGetKey("general.branch", out string branch)) { if (ini == null || !ini.TryGetKey("general.branch", out string branch)) {
ZwstId = null; Branch = null;
} else { } else {
ZwstId = branch; Branch = branch;
} }
ScaleList.Clear(); ScaleList.Clear();