Merge pull request #35 from pwa-builder/dev

Bump Libs version
pwa-builder · Nov 14, 2023 · 7be07b8 · 7be07b8
2 parents 3f2dd39 + 62215b2
commit 7be07b8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/AppImageGenerator.csproj b/AppImageGenerator.csproj
@@ -10,15 +10,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
-    <PackageReference Include="SkiaSharp" Version="2.88.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
+    <PackageReference Include="SkiaSharp" Version="2.88.6" />
     <!-- <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" /> -->
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
-    <PackageReference Include="Svg.Skia" Version="0.5.18" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Svg.Skia" Version="1.0.0.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Controllers/ImageController.cs b/Controllers/ImageController.cs
@@ -62,8 +62,16 @@ public async Task<ActionResult> Get(string id)
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, string.Format("{{GetZipById}}: Couldn't get generated zip due to exception", GetZipById));
-            return StatusCode((int)HttpStatusCode.InternalServerError, ex.ToString());
+            if (ex.Message.StartsWith("Could not find file"))
+            {
+                _logger.LogError(ex, string.Format("{{GetZipById}}: Couldn't find file", GetZipById));
+                return StatusCode((int)HttpStatusCode.NotFound, ex.ToString());
+            }
+            else {
+                _logger.LogError(ex, string.Format("{{GetZipById}}: Couldn't get generated zip due to exception", GetZipById));
+                return StatusCode((int)HttpStatusCode.InternalServerError, ex.ToString());
+            }
+
         }
     }
 

diff --git a/Models/ImageGenerationModel.cs b/Models/ImageGenerationModel.cs
@@ -1,8 +1,6 @@
 using System.Globalization;
 
-using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.Processing;
 using SkiaSharp;
 using SKSvg = Svg.Skia.SKSvg;