fix: ページの並び順でフォルダーと圧縮ファイルの区別がされていない不具合修正 (#1868)

Author: neelabo

NeeView/BookOperation/BookOperation.cs

@@ -238,13 +238,13 @@ public void ToggleMediaPlay()
         public bool CanMoveToChildBook()
         {
             var page = Book?.CurrentPage;
-            return page != null && page.PageType == PageType.Folder;
+            return page != null && page.PageType.IsFolder();
         }
 
         public void MoveToChildBook(object sender)
         {
             var page = Book?.CurrentPage;
-            if (page != null && page.PageType == PageType.Folder)
+            if (page != null && page.PageType.IsFolder())
             {
                 _bookHub.RequestLoad(sender, page.ArchiveEntry.SystemPath, null, BookLoadOption.IsBook | BookLoadOption.SkipSamePlace, true);
             }

NeeView/Page/ArchivePageContent.cs

@@ -13,7 +13,7 @@ public ArchivePageContent(ArchiveEntry archiveEntry, BookMemoryService? bookMemo
         {
         }
 
-        public override PageType PageType => PageType.Folder;
+        public override PageType PageType => ArchiveEntry.IsDirectory ? PageType.Folder : PageType.Archive;
 
         public override bool IsFileContent => true;
 

NeeView/Page/PageContent.cs

@@ -64,7 +64,7 @@ public PageContentState State
 
         public virtual PageType PageType => PageType.File;
 
-        public virtual bool IsBook => PageType == PageType.Folder;
+        public virtual bool IsBook => PageType.IsFolder();
 
         public virtual bool IsFileContent => false;
 

NeeView/Page/PageType.cs

@@ -3,7 +3,16 @@
     public enum PageType
     {
         Folder,
+        Archive,
         File,
         Empty,
     }
+
+    public static class PageTypeExtensions
+    {
+        public static bool IsFolder(this PageType pageType)
+        {
+            return pageType == PageType.Folder || pageType == PageType.Archive;
+        }
+    }
 }

NeeView/PageViewHistory/PageViewRecorder.cs

@@ -68,6 +68,9 @@ private void WritePageViewedRecord(DateTime now)
                         case PageType.Folder:
                             _writeBuffer.Append("Folder");
                             break;
+                        case PageType.Archive:
+                            _writeBuffer.Append("Archive");
+                            break;
                         case PageType.File:
                             _writeBuffer.Append("File");
                             break;

NeeView/SidePanels/PageList/PageListBox.xaml.cs

@@ -300,7 +300,7 @@ private void PageList_KeyDown(object? sender, KeyEventArgs e)
                 else if (key == Key.Down)
                 {
                     // 選択ブックに移動
-                    if (page != null && page.PageType == PageType.Folder)
+                    if (page != null && page.PageType.IsFolder())
                     {
                         BookHub.Current.RequestLoad(this, page.ArchiveEntry.SystemPath, null, BookLoadOption.IsBook | BookLoadOption.SkipSamePlace, true);
                     }
@@ -394,7 +394,7 @@ private void PageListItem_MouseLeftButtonUp(object? sender, MouseButtonEventArgs
         // 項目ダブルクリック
         private void PageListItem_MouseDoubleClick(object? sender, MouseButtonEventArgs e)
         {
-            if ((sender as ListBoxItem)?.Content is Page page && page.PageType == PageType.Folder)
+            if ((sender as ListBoxItem)?.Content is Page page && page.PageType.IsFolder())
             {
                 BookHub.Current.RequestLoad(this, page.ArchiveEntry.SystemPath, null, BookLoadOption.IsBook | BookLoadOption.SkipSamePlace, true);
                 e.Handled = true;
@@ -577,7 +577,7 @@ public class ArchivePageToVisibilityConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return (value is Page page && page.PageType == PageType.Folder) ? Visibility.Visible : Visibility.Collapsed;
+            return (value is Page page && page.PageType.IsFolder()) ? Visibility.Visible : Visibility.Collapsed;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -595,7 +595,7 @@ public class ArchivePageToFolderImageSourceConverter : IValueConverter
 
         public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is Page page && page.PageType == PageType.Folder)
+            if (value is Page page && page.PageType.IsFolder())
             {
                 if (page.ArchiveEntry.IsDirectory)
                 {

docs/en-us/changelog.md

@@ -61,7 +61,8 @@ Context menu registration to Explorer is done in the settings window, just like
 - View: Fixed a bug (#1821) where a white line would sometimes appear on the edge when changing from full screen to maximized window.
 - Panel: Fixed HOME/END key behavior when panel thumbnails are displayed (#1817)
 - Bookmarks: Fixed a bug where renaming in the bookmark panel was sometimes not possible. Renaming in the bookmark panel no longer opens a book (#1811)
-- Page List: Fixed a bug where page list thumbnails sometimes did not load (#1816)
+- PageList: Fixed a bug where page list thumbnails sometimes did not load (#1816)
+- PageList: Fixed an issue where folders and compressed files were not distinguished (#1868)
 - History: Fixed a bug where history information was not updated when opening a book from history (#1818)
 
 

docs/ja-jp/changelog.md

@@ -62,6 +62,7 @@
 - パネル：パネルサムネイル表示時のHOME/ENDキーの挙動を修正 (#1817)
 - ブックマーク：ブックマークパネルで名前変更できないことがある不具合修正。ブックマークパネルでは名前変更でブックを開かないようにした (#1811)
 - ページリスト：ページリストのサムネイルが読み込まれないことがある不具合修正 (#1816)
+- ページリスト：フォルダーと圧縮ファイルの区別がされていない不具合修正 (#1868)
 - 履歴：履歴からブックを開いた場合、履歴情報が更新されないことがある不具合修正 (#1818)