feat: 「アーカイバーを選択」メニューに現在アーカイバーのチェックマークを表示 (#1739)

Author: neelabo

NeeView/Archiver/Archive.cs

@@ -157,6 +157,16 @@ public Archive(string path, ArchiveEntry? source, ArchiveHint archiveHint)
         /// </summary>
         public bool Encrypted { get; protected set; }
 
+        /// <summary>
+        /// アーカイバ識別子
+        /// </summary>
+        public ArchiverIdentifier ArchiverIdentifier => new ArchiverIdentifier(ArchiveManager.GetArchiveType(this), GetPluginName());
+
+
+        public virtual string? GetPluginName()
+        {
+            return null;
+        }
 
         protected virtual void OnCreated(FileSystemEventArgs e)
         {

NeeView/Archiver/SusieArchive.cs

@@ -45,6 +45,12 @@ public override bool IsSupported()
             return _susiePlugin;
         }
 
+        // プラグイン名取得
+        public override string? GetPluginName()
+        {
+            return _susiePlugin?.Plugin.Name;
+        }
+
         // アーカイブヒントで指定されたプラグイン名を取得
         private string? GetPluginNameHint()
         {

NeeView/Book/BookSource.cs

@@ -23,11 +23,14 @@ public BookSource(ArchiveEntryCollection archiveEntryCollection, BookPageCollect
         public event EventHandler? DirtyBook;
 
 
-        public BookMemoryService BookMemoryService { get; private set; }    
+        public BookMemoryService BookMemoryService { get; private set; }
 
         // この本のアーカイバ
         public ArchiveEntryCollection ArchiveEntryCollection { get; private set; }
 
+        // この本のアーカイバ識別子
+        public ArchiverIdentifier ArchiverIdentifier => ArchiveEntryCollection.Archive?.ArchiverIdentifier ?? ArchiverIdentifier.None;
+
         // この本の場所
         public string Path => this.ArchiveEntryCollection.Path;
 

NeeView/Command/BookCommandTools.cs

@@ -11,7 +11,13 @@ public static void UpdateSelectArchiverMenu(ItemCollection items)
             items.Clear();
             foreach (var archiver in SelectableArchiverList.Current.GetLatestArchivers())
             {
-                items.Add(new MenuItem() { Header = archiver.ToDisplayString(), Command = ReloadWithCommand.Command, CommandParameter = archiver });
+                items.Add(new MenuItem()
+                {
+                    Header = archiver.ArchiverIdentifier.ToDisplayString(),
+                    IsChecked = archiver.IsChecked,
+                    Command = ReloadWithCommand.Command,
+                    CommandParameter = archiver.ArchiverIdentifier
+                });
             }
         }
 

NeeView/MainWindow/MainWindow.xaml

@@ -59,9 +59,10 @@
 
             <!-- MenuItem SelectArchiver -->
             <Style x:Key="SelectArchiverMenuItemContainerStyle" TargetType="MenuItem" BasedOn="{StaticResource NVMenuItem}">
-                <Setter Property="Header" Value="{Binding .}" />
+                <Setter Property="Header" Value="{Binding ArchiverIdentifier}" />
+                <Setter Property="IsChecked" Value="{Binding IsChecked}" />
                 <Setter Property="Command" Value="{x:Static local:ReloadWithCommand.Command}" />
-                <Setter Property="CommandParameter" Value="{Binding .}" />
+                <Setter Property="CommandParameter" Value="{Binding ArchiverIdentifier}" />
                 <Setter Property="InputGestureText" Value="" />
             </Style>
 

NeeView/Menu/SelectableArchiverList.cs

@@ -1,5 +1,7 @@
 using NeeLaboratory.ComponentModel;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 
 namespace NeeView
 {
@@ -9,7 +11,7 @@ public class SelectableArchiverList : BindableBase
         public static SelectableArchiverList Current { get; }
 
 
-        private List<ArchiverIdentifier> _archivers = new();
+        private List<SelectableArchiverItem> _archivers = new();
         private bool _isDirty = true;
 
 
@@ -20,7 +22,7 @@ public SelectableArchiverList()
         }
 
 
-        public List<ArchiverIdentifier> Archivers
+        public List<SelectableArchiverItem> Archivers
         {
             get { return _archivers; }
             set
@@ -38,7 +40,7 @@ public bool IsEnabled
         }
 
 
-        public List<ArchiverIdentifier> GetLatestArchivers()
+        public List<SelectableArchiverItem> GetLatestArchivers()
         {
             Update();
             return Archivers;
@@ -47,17 +49,22 @@ public List<ArchiverIdentifier> GetLatestArchivers()
         public void Update()
         {
             if (!_isDirty) return;
-            _isDirty = true;
+            _isDirty = false;
 
-            var address = BookHub.Current.Address;
-            if (address is not null)
+            var book = BookOperation.Current.Book;
+            if (book is not null)
             {
-                Archivers = ArchiveManager.Current.GetSupportedArchiverList(address);
+                var bookArchiveIdentifider = book.Source.ArchiverIdentifier;
+                Archivers = ArchiveManager.Current.GetSupportedArchiverList(book.Path)
+                    .Select(e => new SelectableArchiverItem(e, e == bookArchiveIdentifider))
+                    .ToList();
             }
             else
             {
                 Archivers = new();
             }
         }
     }
+
+    public record SelectableArchiverItem(ArchiverIdentifier ArchiverIdentifier, bool IsChecked);
 }