Move archive viewer files to ArchiveFile namespace

emako · emako · commit 19805f06c5e1 · 2025-12-25T18:48:23.000+08:00
Renamed and reorganized ArchiveViewer files into a new ArchiveFile subfolder and namespace for better code structure. Updated all relevant namespaces and references accordingly. Minor code cleanups were also applied, such as using collection initializers and default keyword.
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileEntry.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileEntry.cs
@@ -19,7 +19,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace QuickLook.Plugin.ArchiveViewer;
+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 
 public class ArchiveFileEntry : IComparable<ArchiveFileEntry>
 {
@@ -36,7 +36,7 @@ public ArchiveFileEntry(string name, bool isFolder, ArchiveFileEntry parent = nu
         _parent?.Children.Add(this, false);
     }
 
-    public SortedList<ArchiveFileEntry, bool> Children { get; set; } = new SortedList<ArchiveFileEntry, bool>();
+    public SortedList<ArchiveFileEntry, bool> Children { get; set; } = [];
 
     public string Name { get; set; }
     public bool Encrypted { get; set; }
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileListView.xaml b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileListView.xaml
@@ -1,8 +1,8 @@
-﻿<UserControl x:Class="QuickLook.Plugin.ArchiveViewer.ArchiveFileListView"
+﻿<UserControl x:Class="QuickLook.Plugin.ArchiveViewer.ArchiveFile.ArchiveFileListView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:QuickLook.Plugin.ArchiveViewer"
+             xmlns:local="clr-namespace:QuickLook.Plugin.ArchiveViewer.ArchiveFile"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              d:DesignHeight="300"
              d:DesignWidth="300"
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileListView.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileListView.xaml.cs
@@ -15,10 +15,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 using System;
 using System.Windows.Controls;
 
-namespace QuickLook.Plugin.ArchiveViewer;
+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 
 public partial class ArchiveFileListView : UserControl, IDisposable
 {
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveInfoPanel.xaml b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveInfoPanel.xaml
@@ -1,8 +1,8 @@
-﻿<UserControl x:Class="QuickLook.Plugin.ArchiveViewer.ArchiveInfoPanel"
+﻿<UserControl x:Class="QuickLook.Plugin.ArchiveViewer.ArchiveFile.ArchiveInfoPanel"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:QuickLook.Plugin.ArchiveViewer"
+             xmlns:local="clr-namespace:QuickLook.Plugin.ArchiveViewer.ArchiveFile"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              x:Name="infoPanel"
              d:DesignHeight="600"
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveInfoPanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveInfoPanel.xaml.cs
@@ -15,12 +15,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using QuickLook.Common.Annotations;
-using QuickLook.Common.ExtensionMethods;
-using QuickLook.Common.Helpers;
 using PureSharpCompress.Archives;
 using PureSharpCompress.Common;
 using PureSharpCompress.Readers;
+using QuickLook.Common.Annotations;
+using QuickLook.Common.ExtensionMethods;
+using QuickLook.Common.Helpers;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -30,7 +30,7 @@
 using System.Threading.Tasks;
 using System.Windows.Controls;
 
-namespace QuickLook.Plugin.ArchiveViewer;
+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 
 public partial class ArchiveInfoPanel : UserControl, IDisposable, INotifyPropertyChanged
 {
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ChardetReaderOptions.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ChardetReaderOptions.cs
@@ -21,7 +21,7 @@
 using System.Text;
 using UtfUnknown;
 
-namespace QuickLook.Plugin.ArchiveViewer;
+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 
 internal class ChardetReaderOptions : ReaderOptions
 {
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Converters.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Converters.cs
@@ -21,7 +21,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace QuickLook.Plugin.ArchiveViewer;
+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 
 public sealed class Percent100ToVisibilityVisibleConverter : DependencyObject, IValueConverter
 {
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Extensions.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Extensions.cs
@@ -20,7 +20,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace QuickLook.Plugin.ArchiveViewer;
+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 
 public static class Extensions
 {
@@ -33,7 +33,7 @@ public static void ForEach<T>(this IEnumerable<T> enumeration, Action<T> action)
     public static T GetDescendantByType<T>(this Visual element) where T : class
     {
         if (element == null)
-            return default(T);
+            return default;
         if (element.GetType() == typeof(T))
             return element as T;
 
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/IconManager.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/IconManager.cs
@@ -25,7 +25,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace QuickLook.Plugin.ArchiveViewer;
+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 
 /// <summary>
 /// Internals are mostly from here:
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs
@@ -16,6 +16,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using QuickLook.Common.Plugin;
+using QuickLook.Plugin.ArchiveViewer.ArchiveFile;
 using System;
 using System.IO;
 using System.Linq;
@@ -53,7 +54,7 @@ public class Plugin : IViewer
         //".eif",     // QQ emoji file (Compound File Binary format)
     ];
 
-    private ArchiveInfoPanel _panel;
+    private IDisposable _panel;
 
     public int Priority => -5;
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`using System.Collections.Generic;`
`20`	`20`	`using System.Linq;`
`21`	`21`
`22`		`-namespace QuickLook.Plugin.ArchiveViewer;`
	`22`	`+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;`
`23`	`23`
`24`	`24`	`public class ArchiveFileEntry : IComparable<ArchiveFileEntry>`
`25`	`25`	`{`
`@@ -36,7 +36,7 @@ public ArchiveFileEntry(string name, bool isFolder, ArchiveFileEntry parent = nu`
`36`	`36`	`_parent?.Children.Add(this, false);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public SortedList<ArchiveFileEntry, bool> Children { get; set; } = new SortedList<ArchiveFileEntry, bool>();`
	`39`	`+ public SortedList<ArchiveFileEntry, bool> Children { get; set; } = [];`
`40`	`40`
`41`	`41`	`public string Name { get; set; }`
`42`	`42`	`public bool Encrypted { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`using System.Text;`
`22`	`22`	`using UtfUnknown;`
`23`	`23`
`24`		`-namespace QuickLook.Plugin.ArchiveViewer;`
	`24`	`+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;`
`25`	`25`
`26`	`26`	`internal class ChardetReaderOptions : ReaderOptions`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`using System.Windows;`
`21`	`21`	`using System.Windows.Media;`
`22`	`22`
`23`		`-namespace QuickLook.Plugin.ArchiveViewer;`
	`23`	`+namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile;`
`24`	`24`
`25`	`25`	`public static class Extensions`
`26`	`26`	`{`
`@@ -33,7 +33,7 @@ public static void ForEach<T>(this IEnumerable<T> enumeration, Action<T> action)`
`33`	`33`	`public static T GetDescendantByType<T>(this Visual element) where T : class`
`34`	`34`	`{`
`35`	`35`	`if (element == null)`
`36`		`- return default(T);`
	`36`	`+ return default;`
`37`	`37`	`if (element.GetType() == typeof(T))`
`38`	`38`	`return element as T;`
`39`	`39`