fix: 起動時のブックと本棚の復元を整備 (#1754)

neelabo · neelabo · commit bfbe0d24c535 · 2025-07-02T12:18:33.000+09:00
- 主に FirstLoader.cs の改善
- ブックと本棚の両方の復元が指定されている場合はそれぞれの復元情報を尊重するようにした
- 履歴がなくても本棚の状態を復元可能にした
- 本棚の並びがシャッフルの場合も復元できるようにした
- アプリ終了処理でのハンドルされていない例外のキャッチを解除
diff --git a/NeeView/App.Exception.cs b/NeeView/App.Exception.cs
@@ -37,6 +37,15 @@ private void InitializeUnhandledException()
             this.DispatcherUnhandledException += Application_DispatcherUnhandledException;
         }
 
+        private void TerminateUnhandledException()
+        {
+#if DEBUG
+            TaskScheduler.UnobservedTaskException -= TaskScheduler_UnobservedTaskException;
+#endif
+            AppDomain.CurrentDomain.UnhandledException -= CurrentDomain_UnhandledException;
+            this.DispatcherUnhandledException -= Application_DispatcherUnhandledException;
+        }
+
         /// <summary>
         /// TaskScheduler の未処理例外処理
         /// </summary>
diff --git a/NeeView/App.xaml.cs b/NeeView/App.xaml.cs
@@ -422,12 +422,17 @@ private void Terminate(bool callProcessTerminator)
             if (_isTerminated) return;
             _isTerminated = true;
 
+            TerminateUnhandledException();
+
             try
             {
                 // 現在のブックを履歴に保存
                 PageFrameBoxPresenter.Current.ForceSaveBookMemento();
                 PageFrameBoxPresenter.Current.SaveLastBookMemento();
 
+                // 現在の本棚の場所を保存
+                BookshelfFolderList.Current.SaveLastFolderPath();
+
                 // 各種Dispose
                 ApplicationDisposer.Current.Dispose();
 
@@ -455,6 +460,7 @@ private void Terminate(bool callProcessTerminator)
             {
                 Debug.Assert(false, "Application Terminate failed!!");
                 Trace.Fail($"App.Terminate: {DateTime.Now}: {ex.ToStackString()}");
+                throw;
             }
 
             if (callProcessTerminator)
diff --git a/NeeView/Config/StartUpConfig.cs b/NeeView/Config/StartUpConfig.cs
@@ -1,5 +1,6 @@
 ﻿using NeeLaboratory.ComponentModel;
 using NeeView.Windows.Property;
+using System;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
@@ -8,8 +9,9 @@ namespace NeeView
     public class StartUpConfig : BindableBase
     {
         private string? _lastBookPath;
-        private BookMemento? _lastBookMement;
         private string? _lastFolderPath;
+        private BookMemento? _lastBook;
+        private BookshelfFolderMemento? _lastFolder;
         private bool _isSplashScreenEnabled = true;
         private bool _isMultiBootEnabled;
         private bool _isRestoreWindowPlacement = true;
@@ -89,26 +91,34 @@ public bool IsAutoPlaySlideShow
 
         #region HiddenParameters
 
-        [PropertyMapIgnore]
+        [Obsolete, PropertyMapIgnore]
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         public string? LastBookPath
         {
             get { return IsOpenLastBook ? _lastBookPath : null; }
             set { SetProperty(ref _lastBookPath, value); }
         }
         
+        [Obsolete, PropertyMapIgnore]
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        public string? LastFolderPath
+        {
+            get { return IsOpenLastFolder ? _lastFolderPath : null; }
+            set { SetProperty(ref _lastFolderPath, value); }
+        }
+
         [PropertyMapIgnore]
-        public BookMemento? LastBookMemento
+        public BookMemento? LastBook
         {
-            get { return _lastBookMement; }
-            set { SetProperty(ref _lastBookMement, value); }
+            get { return _lastBook; }
+            set { SetProperty(ref _lastBook, value); }
         }
 
         [PropertyMapIgnore]
-        public string? LastFolderPath
+        public BookshelfFolderMemento? LastFolder
         {
-            get { return IsOpenLastFolder ? _lastFolderPath : null; }
-            set { SetProperty(ref _lastFolderPath, value); }
+            get { return _lastFolder; }
+            set { SetProperty(ref _lastFolder, value); }
         }
 
         #endregion HiddenParameters
diff --git a/NeeView/Languages/en.restext b/NeeView/Languages/en.restext
@@ -1906,7 +1906,6 @@ StartUpConfig.IsAutoPlaySlideShow=Start playing slideshow
 StartUpConfig.IsMultiBootEnabled=Allow multiple activations
 StartUpConfig.IsOpenLastBook=Restore an open book
 StartUpConfig.IsOpenLastFolder=Restore bookshelf location
-StartUpConfig.IsOpenLastFolder.Remarks=The location of the bookshelf if you do not open the book at startup.
 StartUpConfig.IsRestoreFullScreen=Restore full screen state
 StartUpConfig.IsRestoreSecondWindowPlacement=Restore the second window coordinates
 StartUpConfig.IsRestoreSecondWindowPlacement.Remarks=Restores window coordinates even after duplicate launches. If turned off, the window will be displayed with the initial coordinates.
diff --git a/NeeView/Languages/it-IT.restext b/NeeView/Languages/it-IT.restext
@@ -1912,7 +1912,6 @@ StartUpConfig.IsAutoPlaySlideShow=Inizia esecuzione presentazione
 StartUpConfig.IsMultiBootEnabled=Permetti attivazioni multiple
 StartUpConfig.IsOpenLastBook=Ripristina un libro aperto
 StartUpConfig.IsOpenLastFolder=Ripristina posizione libreria
-StartUpConfig.IsOpenLastFolder.Remarks=La posizione della libreria se non si apre il libro all'avvio.
 StartUpConfig.IsRestoreFullScreen=Ripristina lo stato di schermo intero
 StartUpConfig.IsRestoreSecondWindowPlacement=Ripristina coordinate seconda finestra
 StartUpConfig.IsRestoreSecondWindowPlacement.Remarks=Ripristina le coordinate della finestra anche quando vengono lanciati i duplicati. Se disattivato, la finestra è mostrata con le coordinate iniziali.
diff --git a/NeeView/Languages/ja.restext b/NeeView/Languages/ja.restext
@@ -1898,7 +1898,6 @@ StartUpConfig.IsAutoPlaySlideShow=スライドショーの再生を開始する
 StartUpConfig.IsMultiBootEnabled=多重起動を許可する
 StartUpConfig.IsOpenLastBook=開いていたブックを復元する
 StartUpConfig.IsOpenLastFolder=本棚の場所を復元する
-StartUpConfig.IsOpenLastFolder.Remarks=起動時に本を開かない場合の本棚の場所です。
 StartUpConfig.IsRestoreFullScreen=フルスクリーン状態を復元する
 StartUpConfig.IsRestoreSecondWindowPlacement=2 つめのウィンドウ座標の復元
 StartUpConfig.IsRestoreSecondWindowPlacement.Remarks=重複起動した場合もウィンドウ座標を復元します。オフにすると初期座標で表示されます。
diff --git a/NeeView/Languages/ko.restext b/NeeView/Languages/ko.restext
@@ -1898,7 +1898,6 @@ StartUpConfig.IsAutoPlaySlideShow=슬라이드쇼 재생 시작
 StartUpConfig.IsMultiBootEnabled=다중 실행 허용
 StartUpConfig.IsOpenLastBook=마지막으로 열었던 책 기억
 StartUpConfig.IsOpenLastFolder=서랍 경로 기억
-StartUpConfig.IsOpenLastFolder.Remarks=책을 열지 않고 실행 시 서랍 경로
 StartUpConfig.IsRestoreFullScreen=전체 화면 상태 기억
 StartUpConfig.IsRestoreSecondWindowPlacement=2개째의 창 위치 기억
 StartUpConfig.IsRestoreSecondWindowPlacement.Remarks=중복 실행 시에도 창 위치를 복원합니다. 이 항목을 끄면 초기 위치에 표시됩니다.
diff --git a/NeeView/Languages/pt-BR.restext b/NeeView/Languages/pt-BR.restext
@@ -1906,7 +1906,6 @@ StartUpConfig.IsAutoPlaySlideShow=Comece a reproduzir o slideshow
 StartUpConfig.IsMultiBootEnabled=Permitir múltiplas instâncias
 StartUpConfig.IsOpenLastBook=Restaurar um livro aberto
 StartUpConfig.IsOpenLastFolder=Restaurar localização da estante
-StartUpConfig.IsOpenLastFolder.Remarks=A localização da estante se você não abrir o livro na inicialização.
 StartUpConfig.IsRestoreFullScreen=Restaurar o estado de tela cheia
 StartUpConfig.IsRestoreSecondWindowPlacement=Restaure as coordenadas da segunda janela
 StartUpConfig.IsRestoreSecondWindowPlacement.Remarks=Restaure também as coordenadas da janela quando as duplicatas forem ativadas. Quando definido como DESLIGADO, é exibido nas coordenadas iniciais.
diff --git a/NeeView/Languages/ru.restext b/NeeView/Languages/ru.restext
@@ -1906,7 +1906,6 @@ StartUpConfig.IsAutoPlaySlideShow=Начать воспроизведение с
 StartUpConfig.IsMultiBootEnabled=Разрешить несколько запусков
 StartUpConfig.IsOpenLastBook=Восстановить открытую книгу
 StartUpConfig.IsOpenLastFolder=Восстановить расположение книжной полки
-StartUpConfig.IsOpenLastFolder.Remarks=Расположение книжной полки, если вы не открываете книгу при запуске.
 StartUpConfig.IsRestoreFullScreen=Восстановить полноэкранное состояние
 StartUpConfig.IsRestoreSecondWindowPlacement=Восстановить координаты второго окна
 StartUpConfig.IsRestoreSecondWindowPlacement.Remarks=Восстанавливает координаты окна даже после повторных запусков. Если выключено, окно будет отображаться с начальными координатами.
diff --git a/NeeView/Languages/zh-Hans.restext b/NeeView/Languages/zh-Hans.restext
@@ -1898,7 +1898,6 @@ StartUpConfig.IsAutoPlaySlideShow=启动幻灯片播放
 StartUpConfig.IsMultiBootEnabled=允许多重启动
 StartUpConfig.IsOpenLastBook=恢复打开的书籍
 StartUpConfig.IsOpenLastFolder=恢复书架位置
-StartUpConfig.IsOpenLastFolder.Remarks=启动时如果未打开书籍的书架位置。
 StartUpConfig.IsRestoreFullScreen=恢复全屏状态
 StartUpConfig.IsRestoreSecondWindowPlacement=恢复第二窗口坐标
 StartUpConfig.IsRestoreSecondWindowPlacement.Remarks=即使在重复启动后也恢复窗口坐标。如果关闭，窗口将以初始坐标显示。
diff --git a/NeeView/Languages/zh-Hant.restext b/NeeView/Languages/zh-Hant.restext
@@ -1898,7 +1898,6 @@ StartUpConfig.IsAutoPlaySlideShow=開始幻燈片放映
 StartUpConfig.IsMultiBootEnabled=允許多重啟動
 StartUpConfig.IsOpenLastBook=還原開啟的書本
 StartUpConfig.IsOpenLastFolder=還原書庫位置
-StartUpConfig.IsOpenLastFolder.Remarks=啟動時未開啟書本前的書庫位置。
 StartUpConfig.IsRestoreFullScreen=還原全螢幕狀態
 StartUpConfig.IsRestoreSecondWindowPlacement=還原第 2 視窗座標
 StartUpConfig.IsRestoreSecondWindowPlacement.Remarks=重複啟動的視窗座標也一併還原。關閉時顯示初始座標。
diff --git a/NeeView/MainView/PageFrameBoxPresenter.cs b/NeeView/MainView/PageFrameBoxPresenter.cs
@@ -220,8 +220,15 @@ public void SaveLastBookMemento()
         {
             if (_box is null) return;
 
-            var bookMemento = _box.BookMementoControl.CreateBookMement();
-            Config.Current.StartUp.LastBookMemento = bookMemento;
+            if (Config.Current.StartUp.IsOpenLastBook)
+            {
+                var bookMemento = _box.BookMementoControl.CreateBookMement();
+                Config.Current.StartUp.LastBook = bookMemento;
+            }
+            else
+            {
+                Config.Current.StartUp.LastBook = null;
+            }
         }
 
         private void BookHub_LoadRequesting(object? sender, BookPathEventArgs e)
diff --git a/NeeView/MainWindow/FirstLoader.cs b/NeeView/MainWindow/FirstLoader.cs
diff --git a/NeeView/SidePanels/Bookshelf/BookshelfFolderList.cs b/NeeView/SidePanels/Bookshelf/BookshelfFolderList.cs
diff --git a/NeeView/SidePanels/Bookshelf/BookshelfFolderMemento.cs b/NeeView/SidePanels/Bookshelf/BookshelfFolderMemento.cs
diff --git a/NeeView/SidePanels/Bookshelf/FolderList/FolderCollection.cs b/NeeView/SidePanels/Bookshelf/FolderList/FolderCollection.cs
diff --git a/NeeView/SidePanels/Bookshelf/FolderList/FolderList.cs b/NeeView/SidePanels/Bookshelf/FolderList/FolderList.cs
diff --git a/NeeView/SidePanels/Bookshelf/FolderParameter.cs b/NeeView/SidePanels/Bookshelf/FolderParameter.cs
