commented protobuf compilation

ParadoxSaveParser.CLI/Modes/Interactive.cs

@@ -1,9 +1,4 @@
-using System.IO;
+using Path = DTLib.Filesystem.Path;
-using System.IO.Compression;
-using System.Linq;
-using System.Text.Json;
-using ParadoxSaveParser.Lib;
-using Path = DTLib.Filesystem.Path;
 
 namespace ParadoxSaveParser.CLI;
 

ParadoxSaveParser.CLI/ParadoxSaveParser.CLI.csproj

@@ -14,6 +14,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="DTLib" Version="1.7.1"/>
+        <PackageReference Include="DTLib" Version="1.7.4" />
     </ItemGroup>
 </Project>

ParadoxSaveParser.Lib.Tests/ParadoxSaveParser.Lib.Tests.csproj

@@ -23,8 +23,8 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="DTLib" Version="1.7.1"/>
+        <PackageReference Include="DTLib" Version="1.7.4" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
         <PackageReference Include="NUnit" Version="4.3.2" />
         <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
           <PrivateAssets>all</PrivateAssets>

ParadoxSaveParser.Lib/ParadoxSaveParser.Lib.csproj

@@ -8,6 +8,6 @@
     </PropertyGroup>
     
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.4" />
+      <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.5" />
     </ItemGroup>
 </Project>

ParadoxSaveParser.WebAPI/Database/DatabaseConnector.cs

@@ -51,15 +51,15 @@ public class DatabaseConnector
     {
         meta.errorMessage = errorMessage;
         await UpdateMetadataStatus(meta, SaveFileProcessingStatus.Error);
-        DeleteAssociatedFiles(meta);
+        TryDeleteAssociatedFiles(meta);
     }
 
-    public async Task DeleteMetadata(SaveFileMetadata meta)
+    public async Task DeleteMetadata(SaveFileMetadata meta, string reason)
     {
-        _logger.LogDebug($"Deleting save file (id: {meta.id} status: {meta.status} " +
+        _logger.LogDebug($"Deleting save file (id: {meta.id} reason: {reason}" +
                          $"uploadDate: {meta.uploadDateTime:yyyy/MM/dd})");
         await _db.DeleteAsync(meta);
-        DeleteAssociatedFiles(meta);
+        TryDeleteAssociatedFiles(meta);
     }
 
     /// <summary>
@@ -71,20 +71,21 @@ public class DatabaseConnector
         
         var expirationDate = DateTime.Now.AddDays(-_uploadsLifetimeDays);
         var metadataTable = _db.Table<SaveFileMetadata>();
-        int rowCount = await metadataTable.CountAsync();
+        var metadataList = await metadataTable.ToListAsync();
-        int i = 0;
         int deleteCount = 0;
-        while(i < rowCount)
+        foreach (var meta in metadataList)
         {
-            var meta = await metadataTable.ElementAtAsync(i)!;
+            string deletionReason;
-            if(meta.status != SaveFileProcessingStatus.Done || 
+            if(meta.status != SaveFileProcessingStatus.Done)
-               meta.uploadDateTime < expirationDate ||
+                deletionReason = $"invalid status ({meta.status})";
-               !meta.AssociatedFilesExist())
+            else if (meta.uploadDateTime < expirationDate)
-            {
+               deletionReason = "expired";
-                deleteCount++;
+            else if(!meta.AssociatedFilesExist())
-                await DeleteMetadata(meta);
+                deletionReason = "files not found";
-            }
+            else continue;
-            i++;
+            
+            deleteCount++;
+            await DeleteMetadata(meta, deletionReason);
         }
 
         _logger.LogInfo($"Deleted {deleteCount} invalid records");
@@ -97,7 +98,7 @@ public class DatabaseConnector
         File.Delete(file);
     }
 
-    private void DeleteAssociatedFiles(SaveFileMetadata meta)
+    private void TryDeleteAssociatedFiles(SaveFileMetadata meta)
     {
         TryDeleteFile(meta.GetSaveFilePath());
         TryDeleteFile(meta.GetParsedDataPath());

ParadoxSaveParser.WebAPI/ParadoxSaveParser.WebAPI.csproj

@@ -13,16 +13,16 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="DTLib.Web" Version="1.3.0"/>
+        <PackageReference Include="DTLib.Web" Version="1.4.0" />
-        <PackageReference Include="Google.Protobuf" Version="3.30.2" />
+<!--        <PackageReference Include="Google.Protobuf" Version="3.31.0" />-->
         <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
     </ItemGroup>
 
-    <ItemGroup>
+<!--    <ItemGroup>-->
-        <Compile Include="obj\Protobuf\*.g.cs" />
+<!--        <Compile Include="obj\Protobuf\*.g.cs" />-->
-    </ItemGroup>
+<!--    </ItemGroup>-->
 
-    <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+<!--    <Target Name="PreBuild" BeforeTargets="PreBuildEvent">-->
-        <Exec Command="sh -c &quot;mkdir -p obj/Protobuf &amp;&amp; protoc Protobuf/*.proto --csharp_out=obj/Protobuf --csharp_opt=file_extension=.g.cs&quot;" />
+<!--        <Exec Command="sh -c &quot;mkdir -p obj/Protobuf &amp;&amp; protoc Protobuf/*.proto &#45;&#45;csharp_out=obj/Protobuf &#45;&#45;csharp_opt=file_extension=.g.cs&quot;" />-->
-    </Target>
+<!--    </Target>-->
 </Project>

ParadoxSaveParser.WebAPI/PathHelper.cs

@@ -4,7 +4,8 @@ namespace ParadoxSaveParser.WebAPI;
 
 public static class PathHelper
 {
-    public static readonly IOPath DATA_DIR = "data";
+    public static readonly IOPath PUBLIC_DIR = "public";
+    public static readonly IOPath DATA_DIR = Path.Concat(PUBLIC_DIR, "data");
     public static readonly IOPath SAVES_DIR = Path.Concat(DATA_DIR, "saves");
     public static readonly IOPath PARSED_DIR = Path.Concat(DATA_DIR, "parsed");
     public static readonly IOPath TEMP_DIR = "temp";

ParadoxSaveParser.WebAPI/Program.cs

@@ -96,11 +96,14 @@ public static class Program
             
             // http server
             var router = new SimpleRouter(loggerRoot);
-            router.DefaultRoute = new ServeFilesRouteHandler("public");
+            router.DefaultRoute = new SimpleRouter.RouteWithMethod(HttpMethod.GET, 
-            router.MapRoute("/getSaveStatus", HttpMethod.GET, new GetSaveStatusHandler(mainCancel.Token));
+                new ServeFilesRouteHandler(PathHelper.PUBLIC_DIR));
-            router.MapRoute("/uploadSave", HttpMethod.POST, new UploadSaveHandler(mainCancel.Token, 
+            router.MapRoute("/uploadSave", HttpMethod.POST,
-                bgJobManager, saveFilters));
+                new UploadSaveHandler(mainCancel.Token, bgJobManager, saveFilters));
-            router.MapRoute("/getSaveData", HttpMethod.GET, new GetSaveDataHandler(mainCancel.Token));
+            router.MapRoute("/getSaveStatus", HttpMethod.GET,
+                new GetSaveStatusHandler(mainCancel.Token));
+            router.MapRoute("/getSaveData", HttpMethod.GET,
+                new GetSaveDataHandler(mainCancel.Token));
 
             var app = new WebApp(config.BaseUrl, loggerRoot, router, mainCancel.Token);
             await app.Run();

ParadoxSaveParser.WebAPI/Routes/UploadSaveHandler.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Net;
-using System.Reflection.Metadata;
 using ParadoxSaveParser.WebAPI.BackgroundTasks;
 using ParadoxSaveParser.WebAPI.Database;
 using ParadoxSaveParser.WebAPI.HttpHelpers;

TODO.md

@@ -1,3 +1,4 @@
 ## WebAPI.SaveParsingOperation:
 	Save parsed data in protobuf
 	Re-parse if saved data was parsed with another query
+    Implement automatic database cleanup