Small fixes

VladimirKhil · Feb 12, 2024 · 4dbe2bc · 4dbe2bc
1 parent 0c3a848
commit 4dbe2bc
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 102 deletions.
diff --git a/src/SIQuester/SIQuester.ViewModel/ContentItemsViewModel.cs b/src/SIQuester/SIQuester.ViewModel/ContentItemsViewModel.cs
@@ -125,7 +125,7 @@ internal ContentItemViewModel Add(string contentType, string value, string place
         return contentItem;
     }
 
-    protected override void OnCurrentItemChanged(ContentItemViewModel oldValue, ContentItemViewModel newValue)
+    protected override void OnCurrentItemChanged(ContentItemViewModel? oldValue, ContentItemViewModel? newValue)
     {
         base.OnCurrentItemChanged(oldValue, newValue);
 
@@ -503,7 +503,7 @@ private bool AddContentFile(string contentType)
                     Duration = document.GetDurationByContentType(contentType),
                 });
 
-                Insert(index + 1, contentItemViewModel);
+                Insert(index + 1 + (i - initialItemCount), contentItemViewModel);
 
                 var file = collection.Files[i];
 

diff --git a/src/SIQuester/SIQuester.ViewModel/Model/AppSettings.cs b/src/SIQuester/SIQuester.ViewModel/Model/AppSettings.cs
@@ -216,7 +216,9 @@ public FileHistory History
         {
             if (_history != value)
             {
+                _history.Files.CollectionChanged -= CollectionChanged;
                 _history = value;
+                _history.Files.CollectionChanged += CollectionChanged;
                 OnPropertyChanged();
             }
         }
@@ -247,9 +249,9 @@ public CostSetterList CostSetters
         {
             if (_costSetters != value)
             {
-                _costSetters.CollectionChanged -= CostSetters_CollectionChanged;
+                _costSetters.CollectionChanged -= CollectionChanged;
                 _costSetters = value;
-                _costSetters.CollectionChanged += CostSetters_CollectionChanged;
+                _costSetters.CollectionChanged += CollectionChanged;
                 OnPropertyChanged();
             }
         }
@@ -593,10 +595,11 @@ public static AppSettings Load(Stream stream)
 
     public AppSettings()
     {
-        _costSetters.CollectionChanged += CostSetters_CollectionChanged;
+        _costSetters.CollectionChanged += CollectionChanged;
+        _history.Files.CollectionChanged += CollectionChanged;
     }
 
-    private void CostSetters_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) => HasChanges = true;
+    private void CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) => HasChanges = true;
 
     public static AppSettings Create()
     {

diff --git a/src/SImulator/SImulator.ViewModel/Properties/Resources.Designer.cs b/src/SImulator/SImulator.ViewModel/Properties/Resources.Designer.cs
diff --git a/src/SImulator/SImulator.ViewModel/Properties/Resources.resx b/src/SImulator/SImulator.ViewModel/Properties/Resources.resx
@@ -133,7 +133,7 @@
     <value>Соединение с демонстрационным компьютером было разорвано. Игра прекращена.</value>
   </data>
   <data name="GamePackageLoadError" xml:space="preserve">
-    <value>Ошибка при загрузке игрового пакета: {0}</value>
+    <value>Ошибка при загрузке игрового пакета</value>
   </data>
   <data name="GameStartError" xml:space="preserve">
     <value>Ошибка старта игры: {0}</value>
@@ -144,6 +144,9 @@
   <data name="LoggerCreationWarning" xml:space="preserve">
     <value>Ошибка создания файла лога: {0}. Лог записываться не будет</value>
   </data>
+  <data name="LoggerInitError" xml:space="preserve">
+    <value>Ошибка старта записи лога</value>
+  </data>
   <data name="LogsFolderNotSetWarning" xml:space="preserve">
     <value>Папка для записи логов не задана! Логи вестись не будут</value>
   </data>
@@ -159,6 +162,9 @@
   <data name="OpenLicensesError" xml:space="preserve">
     <value>Ошибка при открытии папки лицензий: {0}</value>
   </data>
+  <data name="PackagePreparationError" xml:space="preserve">
+    <value>Ошибка подготовки пакета</value>
+  </data>
   <data name="Pause" xml:space="preserve">
     <value>Приостановить</value>
   </data>

diff --git a/src/SImulator/SImulator.ViewModel/ViewModel/MainViewModel.cs b/src/SImulator/SImulator.ViewModel/ViewModel/MainViewModel.cs
@@ -345,15 +345,25 @@ private async Task<SIDocument> PreparePackageAsync(CancellationToken cancellatio
         var (filePath, isTemporary) = await _packageSource.GetPackageFileAsync(cancellationToken);
 
         var tempDir = Path.Combine(Path.GetTempPath(), AppSettings.AppName, Guid.NewGuid().ToString());
+        SIDocument document;
 
-        var document = await SIDocument.ExtractToFolderAndLoadAsync(
-            filePath,
-            tempDir,
-            cancellationToken: cancellationToken);
-
-        if (isTemporary)
+        try
         {
-            File.Delete(filePath);
+            document = await SIDocument.ExtractToFolderAndLoadAsync(
+                filePath,
+                tempDir,
+                cancellationToken: cancellationToken);
+        }
+        catch (Exception exc)
+        {
+            throw new Exception($"Extraction error. Extraction path: {tempDir}", exc);
+        }
+        finally
+        {
+            if (isTemporary)
+            {
+                File.Delete(filePath);
+            }
         }
 
         return document;
@@ -375,7 +385,7 @@ private EngineOptions GetEngineOptions()
         };
     }
 
-    private IGameLogger CreateLogger()
+    private IGameLogger CreateGameLogger()
     {
         if (Settings.SaveLogs)
         {
@@ -424,7 +434,16 @@ private async Task Start_Executed(object? _)
             _start.CanBeExecuted = false;
             IsStarting = true;
 
-            var document = await PreparePackageAsync(_cancellationTokenSource.Token);
+            SIDocument document;
+
+            try
+            {
+                document = await PreparePackageAsync(_cancellationTokenSource.Token);
+            }
+            catch (Exception exc)
+            {
+                throw new Exception(Resources.PackagePreparationError, exc);
+            }
 
             ISIEngine engine;
 
@@ -443,7 +462,7 @@ private async Task Start_Executed(object? _)
             }
             catch (Exception exc)
             {
-                throw new Exception(string.Format(Resources.GamePackageLoadError, exc.Message));
+                throw new Exception(Resources.GamePackageLoadError, exc);
             }
 
             var presentationListener = new PresentationListener(engine);
@@ -457,15 +476,24 @@ private async Task Start_Executed(object? _)
             presentationController.UpdateShowPlayers(SettingsViewModel.Model.ShowPlayers);
             presentationController.Error += ShowError;
 
-            var logger = CreateLogger();
+            IGameLogger gameLogger;
+
+            try
+            {
+                gameLogger = CreateGameLogger();
+            }
+            catch (Exception exc)
+            {
+                throw new Exception(Resources.LoggerInitError, exc);
+            }
 
             var game = new GameViewModel(
                 SettingsViewModel,
                 engine,
                 presentationListener,
                 presentationController,
                 Players,
-                logger);
+                gameLogger);
 
             Game = game;
 
@@ -492,9 +520,7 @@ private async Task Start_Executed(object? _)
         }
         catch (Exception exc)
         {
-            var reason = exc.InnerException ?? exc;
-
-            PlatformManager.Instance.ShowMessage(string.Format(Resources.GameStartError, reason.Message), false);
+            PlatformManager.Instance.ShowMessage(string.Format(Resources.GameStartError, exc), false);
 
             _game?.CloseMainView();