Tests: Update dependencies

Elwig/Elwig.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -23,21 +23,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="bblanchon.PDFium.Win32" Version="153.0.7999" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="153.0.8009" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageReference Include="itext" Version="9.7.0" />
     <PackageReference Include="itext.bouncy-castle-adapter" Version="9.7.0" />
     <PackageReference Include="LinqKit" Version="1.3.11" />
     <PackageReference Include="MailKit" Version="4.17.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.11" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4129.50" />
     <PackageReference Include="NJsonSchema" Version="11.6.1" />
     <PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.10" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.11" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.10" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.11" />
-    <PackageReference Include="System.Management" Version="10.0.10" />
+    <PackageReference Include="System.Management" Version="10.0.11" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/Config.cs

@@ -50,6 +50,7 @@ namespace Elwig.Helpers {
         public string? SyncUrl = null;
         public string SyncUsername = "";
         public string SyncPassword = "";
+        public bool SyncMain = false;
 
         public string? SmtpHost = null;
         public int? SmtpPort = null;
@@ -86,6 +87,7 @@ namespace Elwig.Helpers {
             SyncUrl = config["sync:url"];
             SyncUsername = config["sync:username"] ?? "";
             SyncPassword = config["sync:password"] ?? "";
+            SyncMain = TrueValues.Contains(config["sync:main"]?.ToLower());
 
             SmtpHost = config["smtp:host"];
             SmtpPort = config["smtp:port"]?.All(char.IsAsciiDigit) == true && config["smtp:port"]?.Length > 0 ? int.Parse(config["smtp:port"]!) : null;

Elwig/Helpers/Printing/PdfPrinter.cs

@@ -24,18 +24,18 @@ namespace Elwig.Helpers.Printing {
 
                 using var printer = new Win32Printer.Printer(PrinterName);
                 printer.TrySetDuplex(doublePaged ? Duplexing.TwoSidedLongEdge : Duplexing.OneSided);
-                for (int i = 0; i < copies; i++) {
+                printer.StartDocument(Path.GetFileName(pdfPath));
-                    printer.StartDocument(Path.GetFileName(pdfPath));
+                bool documentStarted = true;
-                    bool documentStarted = true;
+                try {
-                    try {
+                    for (int i = 0; i < copies; i++) {
                         for (int j = 0; j < pageCount; j++) {
                             PrintPage(document, printer, j);
                         }
-                        printer.EndDocument();
-                        documentStarted = false;
-                    } finally {
-                        if (documentStarted) printer.AbortDocument();
                     }
+                    printer.EndDocument();
+                    documentStarted = false;
+                } finally {
+                    if (documentStarted) printer.AbortDocument();
                 }
             } finally {
                 PdfiumNative.FPDF_CloseDocument(document);

Elwig/Services/SyncService.cs

@@ -214,7 +214,7 @@ namespace Elwig.Services {
             ];
         }
 
-        public static async Task Download(string url, string username, string password) {
+        public static async Task Download(string url, string username, string password, bool confirmImports) {
             try {
                 var import = await GetFilesToImport(url, username, password);
                 var paths = new List<string>();
@@ -226,7 +226,7 @@ namespace Elwig.Services {
                         paths.Add(filename);
                     }
                 }
-                await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
+                await ElwigData.Import(paths, confirmImports ? ElwigData.ImportMode.Interactively : ElwigData.ImportMode.FromBranches);
             } catch (HttpRequestException exc) {
                 InteractionService.ShowException("Daten herunterladen", "Eventuell Internetverbindung prüfen!", exc);
             } catch (TaskCanceledException exc) {
@@ -264,5 +264,14 @@ namespace Elwig.Services {
                 return false;
             }
         }
+
+        public static async Task<bool> ChangesAvailable(AppDbContext ctx, string url, string username, string password, int? year = null) {
+            try {
+                year ??= Utils.CurrentLastSeason;
+                return await ctx.Deliveries.Where(d => d.ZwstId == App.ZwstId && d.Year == year).Where(ChangedDeliveries).AnyAsync() || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
+            } catch {
+                return false;
+            }
+        }
     }
 }

Elwig/Windows/MainWindow.xaml.cs

@@ -200,8 +200,13 @@ namespace Elwig.Windows {
                 return;
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
-                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                if (App.Config.SyncMain) {
-                await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                    await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, true);
+                    await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                } else {
+                    await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, false);
+                    await SyncService.UploadBranchDeliveries(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                }
             });
             Mouse.OverrideCursor = null;
         }
@@ -211,7 +216,7 @@ namespace Elwig.Windows {
                 return;
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
-                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, App.Config.SyncMain);
             });
             Mouse.OverrideCursor = null;
         }
@@ -229,6 +234,10 @@ namespace Elwig.Windows {
         private async void Menu_Sync_UploadModified_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
+            if (!App.Config.SyncMain) {
+                InteractionService.ShowInformation("Mitglieder und Lieferungen hochladen", "Hochladen nicht möglich: Dieses Gerät ist nicht das Hauptgerät!");
+                return;
+            }
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
                 await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
@@ -296,6 +305,11 @@ namespace Elwig.Windows {
             if (App.Config.SyncUrl == null)
                 return;
 
+            if (!App.Config.SyncMain) {
+                InteractionService.ShowInformation("Datenbank hochladen", "Hochladen nicht möglich: Dieses Gerät ist nicht das Hauptgerät!");
+                return;
+            }
+
             if (!InteractionService.AskContinue("Datenbank hochladen", "Sind Sie wirklich sicher, dass Sie die Datenbank dieses\nGerätes hochladen möchten? Das sollte nur vom Hauptgerät aus passieren!"))
                 return;
 
@@ -367,7 +381,11 @@ namespace Elwig.Windows {
                 await Task.Delay(delay);
                 var ch = false;
                 using (var ctx = new AppDbContext()) {
-                    ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                    if (App.Config.SyncMain) {
+                        ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                    } else {
+                        ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, default);
+                    }
                 }
                 await App.MainDispatcher.BeginInvoke(() => {
                     if (ch) {

Tests/Tests.csproj

@@ -19,7 +19,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
     <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
     <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
     <PackageReference Include="NUnit" Version="4.6.1" />