Bug fixes

Utils/DataSerialization.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Text.Json;
 using GazpromApp.Models;
 
@@ -8,12 +9,26 @@ public static class DataSerialization
 {
     private static void SaveData(string path, string data)
     {
-        System.IO.File.WriteAllText(path, data);
+        if (!File.Exists(path))
+        {
+            File.WriteAllText(path, data);
+            return;
+        }
+
+        var dir = Path.GetDirectoryName(path) ?? "";
+        var fileName = Path.GetFileNameWithoutExtension(path);
+        var ext = Path.GetExtension(path);
+        var index = 1;
+    
+        while (File.Exists(Path.Combine(dir, $"{fileName} ({index}){ext}")))
+            index++;
+        
+        File.WriteAllText(Path.Combine(dir, $"{fileName} ({index}){ext}"), data);
     }
 
     private static string LoadData(string path)
     {
-        var text = System.IO.File.ReadAllText(path);
+        var text = File.ReadAllText(path);
         return text;
     }
 

ViewModels/MainWindowViewModel.cs

@@ -82,12 +82,14 @@ public partial class MainWindowViewModel : ViewModelBase
                     Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
         });
         
+        if (files.Count < 1) return;
+        
         IsLoading = true;
         
         foreach (var file in files)
         {
             var url = file.Path.AbsolutePath;
-            var decoded = HttpUtility.HtmlDecode(url);
+            var decoded = HttpUtility.UrlDecode(url);
             var point = DataSerialization.LoadPoint(decoded);
             point?.SetPropertyParents();
 
@@ -113,11 +115,9 @@ public partial class MainWindowViewModel : ViewModelBase
                 await w.StorageProvider.TryGetFolderFromPathAsync(
                     Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
         });
+        if (folder.Count != 1) return;
         foreach (var point in Points)
-        {
+            DataSerialization.SavePoint(point.GetPoint(), Path.Combine(HttpUtility.UrlDecode(folder[0].Path.AbsolutePath), point.Name + ".json") );
-            DataSerialization.SavePoint(point.GetPoint(), Path.Combine(HttpUtility.HtmlDecode(folder[0].Path.AbsolutePath), point.Name + ".json") );
-        }
-        
     }
     
     // Visual and other properties

Views/EditEquipmentDialog.axaml

@@ -49,7 +49,7 @@
     <TextBlock Grid.Column="0" Grid.Row="1" Margin="20,4,0,4" 
                Text="{Binding Description}"
                IsVisible="{Binding !IsDescriptionEditing}"/>
-    <TextBox Grid.Column="0" Grid.Row="1" Margin="12,4,0,4" 
+    <TextBox Grid.Column="0" Grid.Row="1" Margin="12,4,0,4" AcceptsReturn="True" TextWrapping="Wrap"
              Text="{Binding Description}"
              IsVisible="{Binding IsDescriptionEditing}"/>
     <Button Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" Margin="10"
@@ -73,12 +73,12 @@
                     <Image Stretch="Uniform" Width="200" Height="200" Grid.RowSpan="3" Grid.ColumnSpan="5" 
                            Source="{Binding FileName}" />
                     <Button Grid.Row="1" Grid.Column="1" Width="20" Height="20"
-                            Command="{Binding #Root.((vm:EditPointDialogViewModel)DataContext).ViewImageCommand}"
+                            Command="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).ViewImageCommand}"
                             CommandParameter="{Binding .}">
                       <Image Width="16" Height="16" Source="avares://GazpromApp/Assets/ic_fluent_eye_show_24_filled (Custom) 16.png"/>
                     </Button>
                     <Button Grid.Row="1" Grid.Column="3" Width="20" Height="20"
-                            Command="{Binding #Root.((vm:EditPointDialogViewModel)DataContext).DeleteImageCommand}"
+                            Command="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).DeleteImageCommand}"
                             CommandParameter="{Binding .}">
                       <Image Width="16" Height="16" Source="avares://GazpromApp/Assets/ic_fluent_delete_24_filled (Custom) 16.png"/>
                     </Button>
@@ -137,7 +137,8 @@
                     
                         <TextBlock Grid.Column="2" Margin="16,0,0,0" Text="Период: " FontSize="18" VerticalAlignment="Center"/>
                         <NumericUpDown Grid.Column="3" AllowSpin="True" Width="120" VerticalAlignment="Center"
-                                       Value="{Binding PeriodValue}"/>
+                                       Value="{Binding PeriodValue}"
+                                       Minimum="0"/>
                         <ComboBox Grid.Column="4" Width="100" VerticalAlignment="Center" Margin="4,0,0,0"
                                   ItemsSource="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).AllPeriods}"
                                   SelectedItem="{Binding PeriodType, Mode=TwoWay}"

Views/EditEquipmentDialog.axaml.cs

@@ -35,10 +35,6 @@ public partial class EditEquipmentDialog : Window
             m.Reply(dialog.ShowDialog<ErrorViewModel?>(w));
         });
         
-        // new property dialog
-        
-        // edit property dialog
-        
         // complete editing equipment
         WeakReferenceMessenger.Default.Register<EditEquipmentDialog, EditEquipmentDone>(this, static (w, m) =>
         {
@@ -56,8 +52,6 @@ public partial class EditEquipmentDialog : Window
     {
         WeakReferenceMessenger.Default.Unregister<ViewImageMessage>(this);
         WeakReferenceMessenger.Default.Unregister<ErrorMessage>(this);
-        //
-        //
         WeakReferenceMessenger.Default.Unregister<EditEquipmentDone>(this);
     }
 }

Views/EditPointDialog.axaml

@@ -47,7 +47,7 @@
     <TextBlock Grid.Column="0" Grid.Row="1" Margin="20,4,0,4" 
                Text="{Binding Description}"
                IsVisible="{Binding !IsDescriptionEditing}"/>
-    <TextBox Grid.Column="0"  Grid.Row="1" Margin="12,4,0,4" 
+    <TextBox Grid.Column="0"  Grid.Row="1" Margin="12,4,0,4" AcceptsReturn="True" TextWrapping="Wrap"
              Text="{Binding Description}"
              IsVisible="{Binding IsDescriptionEditing}"/>
     <Button Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" Margin="10"

Views/EditPointDialog.axaml.cs

@@ -61,30 +61,7 @@ public partial class EditPointDialog : Window
         // re registering error when new equipment done
         WeakReferenceMessenger.Default.Register<EditPointDialog, NewEquipmentDone>(this, (_, _) =>
         {
-            WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
+            if (!WeakReferenceMessenger.Default.IsRegistered<ErrorMessage>(this))
-            {
-                var dialog = new ErrorView
-                {
-                    DataContext = m.Error
-                };
-                m.Reply(dialog.ShowDialog<ErrorViewModel?>(w));
-            });
-        });
-        
-        // re registering view image and error view
-        WeakReferenceMessenger.Default.Register<EditPointDialog, EditEquipmentDone>(this, (_, _) =>
-        {
-            WeakReferenceMessenger.Default.Register<EditPointDialog, ViewImageMessage>(this, static (w, m) =>
-            {
-                var dialog = new ImageView
-                {
-                    DataContext = m.Image
-                };
-                m.Reply(dialog.ShowDialog<ImageViewModel?>(w));
-            });
-
-            try
-            {
                 WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
                 {
                     var dialog = new ErrorView
@@ -93,16 +70,30 @@ public partial class EditPointDialog : Window
                     };
                     m.Reply(dialog.ShowDialog<ErrorViewModel?>(w));
                 });
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
         });
         
-        // new property
+        // re registering view image and error view
-        
+        WeakReferenceMessenger.Default.Register<EditPointDialog, EditEquipmentDone>(this, (_, _) =>
-        // edit property
+        {
+            if (!WeakReferenceMessenger.Default.IsRegistered<ViewImageMessage>(this))
+                WeakReferenceMessenger.Default.Register<EditPointDialog, ViewImageMessage>(this, static (w, m) =>
+                {
+                    var dialog = new ImageView
+                    {
+                        DataContext = m.Image
+                    };
+                    m.Reply(dialog.ShowDialog<ImageViewModel?>(w));
+                });
+            if (!WeakReferenceMessenger.Default.IsRegistered<ErrorMessage>(this))
+                WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
+                {
+                    var dialog = new ErrorView
+                    {
+                        DataContext = m.Error
+                    };
+                    m.Reply(dialog.ShowDialog<ErrorViewModel?>(w));
+                });
+        });
         
         // complete editing point
         WeakReferenceMessenger.Default.Register<EditPointDialog, EditPointDone>(this, static (w, m) =>
@@ -123,8 +114,6 @@ public partial class EditPointDialog : Window
         WeakReferenceMessenger.Default.Unregister<ErrorMessage>(this);
         WeakReferenceMessenger.Default.Unregister<NewEquipmentMessage>(this);
         WeakReferenceMessenger.Default.Unregister<EditEquipmentMessage>(this);
-        // new prop
-        // edit prop
         WeakReferenceMessenger.Default.Unregister<EditPointDone>(this);
     }
 }

Views/NewEquipmentDialog.axaml

@@ -31,7 +31,7 @@
     <TextBlock Grid.Column="0" Grid.Row="2" Margin="8" Text="Изображение: "/>
     <TextBox Grid.Column="1" Grid.Row="0" Margin="8"
              Text="{Binding Name}"/>
-    <TextBox Grid.Column="1" Grid.Row="1" Margin="8"
+    <TextBox Grid.Column="1" Grid.Row="1" Margin="8" AcceptsReturn="True" TextWrapping="Wrap"
              Text="{Binding Description}"/>
     
     <Panel Grid.Column="1" Grid.Row="2" Margin="8" IsVisible="{Binding !IsImagesEmpty}">

Views/NewPointDialog.axaml

@@ -31,7 +31,7 @@
     <TextBlock Grid.Column="0" Grid.Row="2" Margin="8" Text="Изображение: "/>
     <TextBox Grid.Column="1" Grid.Row="0" Margin="8"
              Text="{Binding Name}"/>
-    <TextBox Grid.Column="1" Grid.Row="1" Margin="8"
+    <TextBox Grid.Column="1" Grid.Row="1" Margin="8" AcceptsReturn="True" TextWrapping="Wrap"
              Text="{Binding Description}"/>
     <Panel Grid.Column="1" Grid.Row="2" Margin="8" IsVisible="{Binding !IsImagesEmpty}">
       <ScrollViewer>

Views/NewPointDialog.axaml.cs

@@ -12,7 +12,7 @@ public partial class NewPointDialog : Window
     {
         InitializeComponent();
 
-        // done entering new point
+        // done entering a new point
         WeakReferenceMessenger.Default.Register<NewPointDialog, NewPointDone>(this, static (w, m) =>
         {
             w.Close(m.Point);

obj/Debug/net8.0/Avalonia/Resources.Inputs.cache

@@ -1 +1 @@
-6ec01d8198a7aa89515263050c4105434cbcd2354fb50cf2ffbc3673c60121f8
+ce571eaa8794cd8018cfc316b7aa3a875ff0192541a3e5a99ac1c0b1fe0464bc

obj/Debug/net8.0/GazpromApp.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("GazpromApp")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7a34fc2dbb087fdbf1bea9de2367b1627dbfd934")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d8cb1c0597162160d03e7987cc85991c880988b8")]
 [assembly: System.Reflection.AssemblyProductAttribute("GazpromApp")]
 [assembly: System.Reflection.AssemblyTitleAttribute("GazpromApp")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

obj/Debug/net8.0/GazpromApp.AssemblyInfoInputs.cache

@@ -1 +1 @@
-79ee0a1c89f7354058711501fd55995c28018c56cfa0b0de53a84dfaced70957
+77f531bfc5aeafe36631b408a11c11c294e011bb2a474f23c97785d02864a447

obj/GazpromApp.csproj.nuget.dgspec.json

@@ -44,7 +44,7 @@
           "auditLevel": "low",
           "auditMode": "direct"
         },
-        "SdkAnalysisLevel": "9.0.200"
+        "SdkAnalysisLevel": "9.0.300"
       },
       "frameworks": {
         "net8.0": {
@@ -117,7 +117,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json"
         }
       }
     }

obj/project.assets.json

@@ -4799,7 +4799,7 @@
         "auditLevel": "low",
         "auditMode": "direct"
       },
-      "SdkAnalysisLevel": "9.0.200"
+      "SdkAnalysisLevel": "9.0.300"
     },
     "frameworks": {
       "net8.0": {
@@ -4872,7 +4872,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json"
       }
     }
   }

obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "hnfkdEFJuA8=",
+  "dgSpecHash": "tG1MV/2SQjY=",
   "success": true,
   "projectFilePath": "D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj",
   "expectedPackageFiles": [

obj/project.packagespec.json

@@ -1 +1 @@
-"restore":{"projectUniqueName":"D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj","projectName":"GazpromApp","projectPath":"D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj","outputPath":"D:\\RiderProjects\\GazpromApp\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"AnimatedImage.Avalonia":{"target":"Package","version":"[2.0.0, )"},"Avalonia":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Controls.ItemsRepeater":{"target":"Package","version":"[11.1.5, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.2, )"},"AvaloniaUI.DiagnosticsSupport":{"target":"Package","version":"[2.0.4, )"},"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.2.1, )"},"Microsoft.EntityFrameworkCore":{"target":"Package","version":"[9.0.6, )"},"Microsoft.EntityFrameworkCore.Design":{"include":"Runtime, Build, Native, ContentFiles, Analyzers, BuildTransitive","suppressParent":"All","target":"Package","version":"[9.0.6, )"},"Microsoft.EntityFrameworkCore.Sqlite":{"target":"Package","version":"[9.0.6, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json"}}
+"restore":{"projectUniqueName":"D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj","projectName":"GazpromApp","projectPath":"D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj","outputPath":"D:\\RiderProjects\\GazpromApp\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.300"}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"AnimatedImage.Avalonia":{"target":"Package","version":"[2.0.0, )"},"Avalonia":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Controls.ItemsRepeater":{"target":"Package","version":"[11.1.5, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.2, )"},"AvaloniaUI.DiagnosticsSupport":{"target":"Package","version":"[2.0.4, )"},"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.2.1, )"},"Microsoft.EntityFrameworkCore":{"target":"Package","version":"[9.0.6, )"},"Microsoft.EntityFrameworkCore.Design":{"include":"Runtime, Build, Native, ContentFiles, Analyzers, BuildTransitive","suppressParent":"All","target":"Package","version":"[9.0.6, )"},"Microsoft.EntityFrameworkCore.Sqlite":{"target":"Package","version":"[9.0.6, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json"}}

obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17522225915601599
+17527364972202368

obj/rider.project.restore.info

@@ -1 +1 @@
-17522225915601599
+17527364972202368