Merge pull request #563 from PixiEditor/1.2-hotfixes

1.2 hotfixes
PixiEditor · Jul 4, 2023 · 9ccf967 · 9ccf967
2 parents ae5ccbd + d70ec75
commit 9ccf967
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 16 deletions.
diff --git a/src/PixiEditor/Data/Localization/Languages/en.json b/src/PixiEditor/Data/Localization/Languages/en.json
@@ -586,5 +586,8 @@
   "ADD_PRIMARY_COLOR_TO_PALETTE": "Add primary color to palette",
   "ADD_PRIMARY_COLOR_TO_PALETTE_DESCRIPTIVE": "Add primary color to current palette",
 
-  "COPY_COLOR": "Copy color"
+  "COPY_COLOR": "Copy color",
+
+  "FAILED_DOWNLOADING_TITLE": "Downloading update failed",
+  "FAILED_DOWNLOADING": "Failed downloading the update, you might not have enough space on the disk"
 }
diff --git a/src/PixiEditor/Extensions/readme.txt b/src/PixiEditor/Extensions/readme.txt
@@ -0,0 +1 @@
+All the extensions goes in this folder.
diff --git a/src/PixiEditor/Models/AppExtensions/ExtensionLoader.cs b/src/PixiEditor/Models/AppExtensions/ExtensionLoader.cs
@@ -20,12 +20,12 @@ internal class ExtensionLoader
 
     public ExtensionLoader()
     {
-        ValidateExtensionFolder();
         _officialExtensionsKeys.Add("pixieditor.supporterpack", new OfficialExtensionData("supporter-pack.snk", AdditionalContentProduct.SupporterPack));
     }
 
     public void LoadExtensions()
     {
+        if (!Directory.Exists(Paths.ExtensionsFullPath)) return;
         var directories = Directory.GetDirectories(Paths.ExtensionsFullPath);
         foreach (var directory in directories)
         {
@@ -208,14 +208,6 @@ private Extension LoadExtensionEntry(Assembly entryAssembly, Type extensionType,
         extensionType = null;
         return null;
     }
-
-    private void ValidateExtensionFolder()
-    {
-        if (!Directory.Exists(Paths.ExtensionsFullPath))
-        {
-            Directory.CreateDirectory(Paths.ExtensionsFullPath);
-        }
-    }
 }
 
 internal struct OfficialExtensionData

diff --git a/src/PixiEditor/Models/IO/Importer.cs b/src/PixiEditor/Models/IO/Importer.cs
@@ -28,8 +28,9 @@ internal class Importer : NotifyableObject
     /// <param name="path">Path of the image.</param>
     /// <param name="size">New size of the image.</param>
     /// <returns>WriteableBitmap of imported image.</returns>
-    public static Surface ImportImage(string path, VecI size)
+    public static Surface? ImportImage(string path, VecI size)
     {
+        if (!Path.Exists(path)) return null;
         Surface original = Surface.Load(path);
         if (original.Size == size || size == VecI.NegativeOne)
         {

diff --git a/src/PixiEditor/PixiEditor.csproj b/src/PixiEditor/PixiEditor.csproj
@@ -170,6 +170,9 @@
 		<EmbeddedResource Include="OfficialExtensions\supporter-pack.snk" />
 		<None Remove="Styles\AvalonDock\Images\**" />
 		<Page Remove="Styles\AvalonDock\Images\**" />
+		<None Update="Extensions\readme.txt">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/PixiEditor/ViewModels/SubViewModels/Main/FileViewModel.cs b/src/PixiEditor/ViewModels/SubViewModels/Main/FileViewModel.cs
@@ -230,6 +230,8 @@ private void OpenRegularImage(string path, bool associatePath)
     {
         var image = Importer.ImportImage(path, VecI.NegativeOne);
 
+        if (image == null) return;
+
         var doc = NewDocument(b => b
             .WithSize(image.Size)
             .WithLayer(l => l

diff --git a/src/PixiEditor/ViewModels/SubViewModels/Main/UpdateViewModel.cs b/src/PixiEditor/ViewModels/SubViewModels/Main/UpdateViewModel.cs
@@ -79,16 +79,29 @@ public async Task<bool> CheckForUpdate()
         {
             UpdateReadyToInstall = false;
             VersionText = new LocalizedString("DOWNLOADING_UPDATE");
-            if (updateCompatible)
+            try
+            {
+                if (updateCompatible)
+                {
+                    await UpdateDownloader.DownloadReleaseZip(UpdateChecker.LatestReleaseInfo);
+                }
+                else
+                {
+                    await UpdateDownloader.DownloadInstaller(UpdateChecker.LatestReleaseInfo);
+                }
+
+                UpdateReadyToInstall = true;
+            }
+            catch (IOException ex)
             {
-                await UpdateDownloader.DownloadReleaseZip(UpdateChecker.LatestReleaseInfo);
+                NoticeDialog.Show("FAILED_DOWNLOADING_TITLE", "FAILED_DOWNLOADING");
+                return false;
             }
-            else
+            catch(TaskCanceledException ex)
             {
-                await UpdateDownloader.DownloadInstaller(UpdateChecker.LatestReleaseInfo);
+                return false;
             }
 
-            UpdateReadyToInstall = true;
             return true;
         }
 

diff --git a/src/PixiEditor/Views/UserControls/Palettes/PaletteViewer.xaml.cs b/src/PixiEditor/Views/UserControls/Palettes/PaletteViewer.xaml.cs
@@ -112,6 +112,7 @@ private async void ImportPalette_OnClick(object sender, RoutedEventArgs e)
     private async Task ImportPalette(string fileName)
     {
         var parser = PaletteProvider.AvailableParsers.FirstOrDefault(x => x.SupportedFileExtensions.Contains(Path.GetExtension(fileName)));
+        if (parser == null) return;
         var data = await parser.Parse(fileName);
         if (data.IsCorrupted || data.Colors.Length == 0) return;
         Colors.Clear();