chore: 起動時ログ強化 (#1951)

neelabo · neelabo · commit 0ab0c48b0509 · 2026-06-19T22:33:53.000+09:00
diff --git a/NeeView/App.xaml.cs b/NeeView/App.xaml.cs
@@ -95,6 +95,10 @@ private async void Application_Startup(object sender, StartupEventArgs e)
 
             try
             {
+#if !DEBUG
+                Trace.Listeners.Clear();
+#endif
+
                 // [開発用] ログ出力設定
                 if (!string.IsNullOrEmpty(Environment.LogFile))
                 {
@@ -138,18 +142,21 @@ private async void Application_Startup(object sender, StartupEventArgs e)
                 bootLock.Dispose();
             }
 
-            Trace.WriteLine($"App.Initialized: {Stopwatch.ElapsedMilliseconds}ms");
+            Debug.WriteLine($"App.Initialized: {Stopwatch.ElapsedMilliseconds}ms");
 
             // ToolTipService default properties
             ToolTipService.BetweenShowDelayProperty.OverrideMetadata(typeof(DependencyObject), new FrameworkPropertyMetadata(0));
 
             this.ShutdownMode = ShutdownMode.OnMainWindowClose;
 
             // メインウィンドウ起動
+            Trace.WriteLine("Create MainWindow");
             var mainWindow = new MainWindow();
             WindowParameters.Initialize(mainWindow);
 
             NVInterop.NVFpReset();
+
+            Trace.WriteLine("Show MainWindow");
             mainWindow.Show();
 
             MessageDialog.IsShowInTaskBar = false;
@@ -181,24 +188,29 @@ private async Task InitializeAsync(StartupEventArgs e)
             this.ShutdownMode = ShutdownMode.OnExplicitShutdown;
 
             // コマンドライン引数処理
+            Trace.WriteLine("Parse commandline options");
             _option = ParseCommandLineOption(e.Args);
 
             // 待機プロセス指定があれば、そのプロセスの終了を待つ
             if (_option.WaitProcess is not null && int.TryParse(_option.WaitProcess, out var pid))
             {
+                Trace.WriteLine($"Wait other process exit ({pid})");
                 await WaitForProcessExitAsync(pid);
             }
 
             // AnimatedImage ライブラリ初期化
+            Trace.WriteLine("Initialize AnimatedImage");
             AnimatedImageChecker.InitializeLibrary();
 
             // APPXデータフォルダ移動 (ver.38)
+            Trace.WriteLine("Correct LocalAppDataFolder (v38.0)");
             Environment.CorrectLocalAppDataFolder();
 
             // カレントディレクトリを実行ファイルの場所に変更。ファイルロック回避のため
             System.IO.Directory.SetCurrentDirectory(Environment.AssemblyFolder);
 
             // 多重起動サービス起動
+            Trace.WriteLine("Run multi boot service");
             _multiBootService = new MultiBootService();
             await _multiBootService.UpdateServerProcess();
 
@@ -208,13 +220,16 @@ private async Task InitializeAsync(StartupEventArgs e)
             DebugStamp("UserSettingLoading...");
 
             // load UserSetting bytes
+            Trace.WriteLine("Load UserSetting bytes");
             UserSetting? setting = null;
             var settingResource = new UserSettingResource(_option.SettingFilename);
 
             // create boot setting
+            Trace.WriteLine("Create boot setting");
             var boot = settingResource.LoadBootSetting();
             if (boot is null)
             {
+                Trace.WriteLine("Create full setting");
                 setting = CreateUserSetting(settingResource);
                 Debug.Assert(setting.Config is not null);
                 boot = BootSetting.Create(setting.Config);
@@ -223,23 +238,32 @@ private async Task InitializeAsync(StartupEventArgs e)
             // If multiple launches are not possible, send parameters to the main app to terminate.
             if (!CanStart(boot.IsMultiBootEnabled))
             {
+                Trace.WriteLine("Call main app...");
                 await _multiBootService.RemoteRestartAsync(e.Args);
                 throw new OperationCanceledException("Already started.");
             }
 
             // run remote command server
+            Trace.WriteLine("Run remote command server");
             AppRemoteCommandServer.Current.Start();
 
             // show splash screen
+            Trace.WriteLine("Show splash screen");
             ShowSplashScreen(boot);
 
             // initialize before UserSetting
+            Trace.WriteLine("Initialize Text Resource");
             var language = _option.Language ?? boot.Language;
             InitializeTextResource(language);
+
+            Trace.WriteLine("Initialize HtmlNode");
             InitializeHtmlNode();
+
+            Trace.WriteLine("Initialize CommandTable");
             InitializeCommandTable();
 
             // ensure UserSetting
+            Trace.WriteLine("Ensure UserSetting");
             setting ??= CreateUserSetting(settingResource);
             SaveData.Current.SetUserSettingFileStamp(setting.FileStamp);
             UserSettingTools.Restore(setting, UserSettingLoadOption.ReplaceConfig);
@@ -260,8 +284,13 @@ private async Task InitializeAsync(StartupEventArgs e)
             }
 
             // initialize after UserSetting
+            Trace.WriteLine("Initialize temporary");
             InitializeTemporary(Config.Current);
+
+            Trace.WriteLine("Initialize ImeKey");
             InitializeImeKey(Config.Current);
+
+            Trace.WriteLine("Initialize theme");
             InitializeTheme();
 
             AppState.Current.Initialize();
diff --git a/NeeView/BookHistory/BookHistoryCollection.cs b/NeeView/BookHistory/BookHistoryCollection.cs
@@ -224,7 +224,7 @@ public void Remove(IEnumerable<string> places)
         // 無効な履歴削除
         public async Task<int> RemoveUnlinkedAsync(CancellationToken token)
         {
-            LocalDebug.WriteLine($"RemoveUnlinked...");
+            Trace.WriteLine($"BookHistory.RemoveUnlinked...");
 
             var unlinked = new List<BookHistory>();
             foreach (var item in this.ToList())
@@ -241,7 +241,7 @@ public async Task<int> RemoveUnlinkedAsync(CancellationToken token)
                 HistoryChanged?.Invoke(this, new BookMementoCollectionChangedArgs(BookMementoCollectionChangedType.Remove, null, unlinked));
             }
 
-            LocalDebug.WriteLine($"RemoveUnlinked done.");
+            Trace.WriteLine($"BookHistory.RemoveUnlinked done.");
             return unlinked.Count;
         }
 
diff --git a/NeeView/MainWindow/MainWindow.xaml.cs b/NeeView/MainWindow/MainWindow.xaml.cs
@@ -67,19 +67,24 @@ public MainWindow()
             DragDropHelper.AttachDragOverTerminator(this);
 
             // Window状態初期化
+            Trace.WriteLine("Initialize WindowShapeSnap");
             InitializeWindowShapeSnap();
 
             // win proc
             _windowProcedure = new WindowProcedure(this);
 
+            Trace.WriteLine("Initialize WindowStateManager");
             _windowStateManager = new WindowStateManager(this);
             _windowController = new MainWindowController(this, _windowStateManager);
 
+            Trace.WriteLine("Initialize ContextMenuWatcher");
             ContextMenuWatcher.Initialize();
 
+            Trace.WriteLine("Initialize MouseHorizontalWheelService");
             MouseHorizontalWheelService.SubscribeHorizontalWheelEvent(this);
 
             // 固定画像初期化
+            Trace.WriteLine("Initialize StaticImages");
             ThumbnailResource.InitializeStaticImages();
             _ = FileIconCollection.Current.InitializeAsync();
 
@@ -90,6 +95,7 @@ public MainWindow()
             //ContentDropManager.Current.SetDragDropEvent(MainView);
 
             // ViewComponent
+            Trace.WriteLine("Initialize MainViewComponent");
             MainViewComponent.Initialize();
             _viewComponent = MainViewComponent.Current;
 
@@ -123,6 +129,7 @@ public MainWindow()
             RoutedCommandTable.Current.AddMouseInput(new MouseInput(mouseContext));
 
             // サイドパネル初期化
+            Trace.WriteLine("Initialize CustomLayoutPanelManager");
             CustomLayoutPanelManager.Initialize();
 
             // 各コントロールとモデルを関連付け
@@ -172,12 +179,11 @@ public MainWindow()
                 }
             });
 
-
-
             _windowController.SubscribePropertyChanged(nameof(MainWindowController.AutoHideMode),
                 (s, e) => AutoHideModeChanged());
 
             // initialize routed commands
+            Trace.WriteLine("Initialize RoutedCommandTable");
             RoutedCommandTable.Current.UpdateInputGestures();
 
             // watch menu bar visibility
@@ -194,6 +200,7 @@ public MainWindow()
             this.PreviewStylusDown += MainWindow_PreviewStylusDown;
 
             // mouse activate
+            Trace.WriteLine("Mouse activate");
             _mouseActivate = new MouseActivate(this);
 
             // key event for window
@@ -209,9 +216,11 @@ public MainWindow()
             CompositionTarget.Rendering += OnRendering;
 
             // message layer space
+            Trace.WriteLine("Initialize MessageLayerSpace");
             InitializeMessageLayerSpace();
 
             // page caption
+            Trace.WriteLine("Initialize PageCaption");
             InitializePageCaption();
 
             // side panel quick hide
@@ -224,6 +233,7 @@ public MainWindow()
             Debug_Initialize();
 
             Debug.WriteLine($"App.MainWindow.Initialize.Done: {App.Current.Stopwatch.ElapsedMilliseconds}ms");
+            Trace.WriteLine("App.MainWindow.Initialize Done");
         }
 
 
@@ -452,6 +462,7 @@ protected override void OnSourceInitialized(EventArgs e)
 
             if (App.Current.Resources["Window.Background"] is SolidColorBrush brush)
             {
+                Trace.WriteLine("Win32 Background Brushes");
                 // Win32 の背景ブラシを設定して起動時のちらつきを軽減するテスト
                 var hwnd = new WindowInteropHelper(this).Handle;
                 uint color = (uint)(brush.Color.B << 16 | brush.Color.G << 8 | brush.Color.R);
@@ -461,13 +472,16 @@ protected override void OnSourceInitialized(EventArgs e)
             }
 
             // Chrome の情報を最新にする
+            Trace.WriteLine("Refresh window state");
             _windowController.Refresh();
 
             // ウィンドウ座標の復元
             // NOTE: PInvoke.SetWindowPlacement() を呼ぶとLoadedイベントが発生する。WindowPlacementの処理順番に注意
+            Trace.WriteLine("Initialize window place");
             InitializeWindowPlace();
 
             Debug.WriteLine($"App.MainWindow.SourceInitialized.Done: {App.Current.Stopwatch.ElapsedMilliseconds}ms");
+            Trace.WriteLine("App.MainWindow.SourceInitialized Done");
         }
 
         private void MainWindow_SourceInitialized(object sender, EventArgs e)
@@ -483,16 +497,20 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
 
             _dpiProvider.SetDipScale(VisualTreeHelper.GetDpi(this));
 
+            Trace.WriteLine("Initialize PendingItemManager");
             PendingItemManager.Initialize(this);
 
+            Trace.WriteLine("Update MainViewManager");
             MainViewManager.Current.Update(false);
 
             // レイアウト更新
             DirtyWindowLayout();
 
             // WinProc登録
+            Trace.WriteLine("Initialize SystemDeviceWatcher");
             SystemDeviceWatcher.Current.Initialize(this);
 
+            Trace.WriteLine("ViewModel.Loaded");
             _vm.Loaded();
 
             if (InputGestureDisplayString.ErrorMessages.Count > 0)
@@ -508,14 +526,16 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
                 this.Activate();
             }
 
-            Trace.WriteLine($"App.MainWindow.Loaded.Done: {App.Current.Stopwatch.ElapsedMilliseconds}ms");
+            Debug.WriteLine($"App.MainWindow.Loaded.Done: {App.Current.Stopwatch.ElapsedMilliseconds}ms");
+            Trace.WriteLine("App.MainWindow.Loaded Done");
         }
 
         // ウィンドウコンテンツ表示開始
         private async void MainWindow_ContentRendered(object sender, EventArgs e)
         {
             Debug.WriteLine($"App.MainWindow.ContentRendered: {App.Current.Stopwatch.ElapsedMilliseconds}ms");
 
+            Trace.WriteLine("ViewModel.ContentRenderedAsync");
             await _vm.ContentRenderedAsync();
 
             // focus
@@ -525,6 +545,7 @@ private async void MainWindow_ContentRendered(object sender, EventArgs e)
             }
 
             Debug.WriteLine($"App.MainWindow.ContentRendered.Done: {App.Current.Stopwatch.ElapsedMilliseconds}ms");
+            Trace.WriteLine("App.MainWindow.ContentRendered Done");
 
             // 初回起動ダイアログ
             if (!Config.Current.System.IsLoadedSettings)
@@ -1036,6 +1057,7 @@ public RenameManager GetRenameManager()
         [Conditional("DEBUG")]
         private static void Debug_Initialize()
         {
+            Trace.WriteLine("Initialize Debug");
             DebugGesture.Initialize(App.Current.MainWindow);
         }
 
diff --git a/NeeView/Picture/PictureFileExtensionTools.cs b/NeeView/Picture/PictureFileExtensionTools.cs
@@ -41,7 +41,7 @@ private static Dictionary<string, string> CreateSystemExtensions(bool useWic)
                     var sw = Stopwatch.StartNew();
                     var wicMap = WicDecoders.ListUp();
                     sw.Stop();
-                    Trace.WriteLine($"CreateSystemExtensions({useWic}): {sw.ElapsedMilliseconds}ms");
+                    Debug.WriteLine($"CreateSystemExtensions({useWic}): {sw.ElapsedMilliseconds}ms");
 
                     foreach (var pair in map)
                     {
diff --git a/NeeView/Styles/FileIconCollection.cs b/NeeView/Styles/FileIconCollection.cs
@@ -64,6 +64,7 @@ public override int GetHashCode()
         public async Task InitializeAsync()
         {
             await AppDispatcher.BeginInvoke(() => CreateDefaultFolderIcon());
+            Trace.WriteLine("Initialize StaticImages done.");
         }
 
 
diff --git a/NeeView/System/AppSequence.cs b/NeeView/System/AppSequence.cs

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public void Remove(IEnumerable<string> places)`
`224`	`224`	`// 無効な履歴削除`
`225`	`225`	`public async Task<int> RemoveUnlinkedAsync(CancellationToken token)`
`226`	`226`	`{`
`227`		`- LocalDebug.WriteLine($"RemoveUnlinked...");`
	`227`	`+ Trace.WriteLine($"BookHistory.RemoveUnlinked...");`
`228`	`228`
`229`	`229`	`var unlinked = new List<BookHistory>();`
`230`	`230`	`foreach (var item in this.ToList())`
`@@ -241,7 +241,7 @@ public async Task<int> RemoveUnlinkedAsync(CancellationToken token)`
`241`	`241`	`HistoryChanged?.Invoke(this, new BookMementoCollectionChangedArgs(BookMementoCollectionChangedType.Remove, null, unlinked));`
`242`	`242`	`}`
`243`	`243`
`244`		`- LocalDebug.WriteLine($"RemoveUnlinked done.");`
	`244`	`+ Trace.WriteLine($"BookHistory.RemoveUnlinked done.");`
`245`	`245`	`return unlinked.Count;`
`246`	`246`	`}`
`247`	`247`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private static Dictionary<string, string> CreateSystemExtensions(bool useWic)`
`41`	`41`	`var sw = Stopwatch.StartNew();`
`42`	`42`	`var wicMap = WicDecoders.ListUp();`
`43`	`43`	`sw.Stop();`
`44`		`- Trace.WriteLine($"CreateSystemExtensions({useWic}): {sw.ElapsedMilliseconds}ms");`
	`44`	`+ Debug.WriteLine($"CreateSystemExtensions({useWic}): {sw.ElapsedMilliseconds}ms");`
`45`	`45`
`46`	`46`	`foreach (var pair in map)`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public override int GetHashCode()`
`64`	`64`	`public async Task InitializeAsync()`
`65`	`65`	`{`
`66`	`66`	`await AppDispatcher.BeginInvoke(() => CreateDefaultFolderIcon());`
	`67`	`+ Trace.WriteLine("Initialize StaticImages done.");`
`67`	`68`	`}`
`68`	`69`
`69`	`70`