From 19805f06c5e1efd9bdd5d27efde07ddeedd9579b Mon Sep 17 00:00:00 2001 From: ema Date: Thu, 25 Dec 2025 18:48:23 +0800 Subject: [PATCH] Move archive viewer files to ArchiveFile namespace 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. --- .../{ => ArchiveFile}/ArchiveFileEntry.cs | 4 ++-- .../{ => ArchiveFile}/ArchiveFileListView.xaml | 4 ++-- .../{ => ArchiveFile}/ArchiveFileListView.xaml.cs | 3 ++- .../{ => ArchiveFile}/ArchiveInfoPanel.xaml | 4 ++-- .../{ => ArchiveFile}/ArchiveInfoPanel.xaml.cs | 8 ++++---- .../{ => ArchiveFile}/ChardetReaderOptions.cs | 2 +- .../{ => ArchiveFile}/Converters.cs | 2 +- .../{ => ArchiveFile}/Extensions.cs | 4 ++-- .../{ => ArchiveFile}/IconManager.cs | 2 +- QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs | 3 ++- 10 files changed, 19 insertions(+), 17 deletions(-) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/ArchiveFileEntry.cs (96%) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/ArchiveFileListView.xaml (99%) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/ArchiveFileListView.xaml.cs (94%) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/ArchiveInfoPanel.xaml (97%) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/ArchiveInfoPanel.xaml.cs (99%) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/ChardetReaderOptions.cs (96%) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/Converters.cs (98%) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/Extensions.cs (95%) rename QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/{ => ArchiveFile}/IconManager.cs (99%) diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileEntry.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileEntry.cs similarity index 96% rename from QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileEntry.cs rename to QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileEntry.cs index 155de96..b294110 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileEntry.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileEntry.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace QuickLook.Plugin.ArchiveViewer; +namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile; public class ArchiveFileEntry : IComparable { @@ -36,7 +36,7 @@ public class ArchiveFileEntry : IComparable _parent?.Children.Add(this, false); } - public SortedList Children { get; set; } = new SortedList(); + public SortedList Children { get; set; } = []; public string Name { get; set; } public bool Encrypted { get; set; } diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileListView.xaml b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileListView.xaml similarity index 99% rename from QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileListView.xaml rename to QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileListView.xaml index a570910..a4ebca1 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileListView.xaml +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveFileListView.xaml @@ -1,8 +1,8 @@ -. +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/ArchiveInfoPanel.xaml b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveInfoPanel.xaml similarity index 97% rename from QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveInfoPanel.xaml rename to QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveInfoPanel.xaml index 81ee3de..6ef035a 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveInfoPanel.xaml +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ArchiveInfoPanel.xaml @@ -1,8 +1,8 @@ -. -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.Runtime.CompilerServices; 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/ChardetReaderOptions.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ChardetReaderOptions.cs similarity index 96% rename from QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ChardetReaderOptions.cs rename to QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ChardetReaderOptions.cs index 6be1fee..f287bdf 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ChardetReaderOptions.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/ChardetReaderOptions.cs @@ -21,7 +21,7 @@ using System; 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/Converters.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Converters.cs similarity index 98% rename from QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Converters.cs rename to QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Converters.cs index 949d2be..7bcc5b2 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Converters.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Converters.cs @@ -21,7 +21,7 @@ using System.Globalization; 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/Extensions.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Extensions.cs similarity index 95% rename from QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Extensions.cs rename to QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Extensions.cs index 062bcec..85f4fa9 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Extensions.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/Extensions.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; 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 class Extensions public static T GetDescendantByType(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/IconManager.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/IconManager.cs similarity index 99% rename from QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/IconManager.cs rename to QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/IconManager.cs index 3d5801d..26ab0e5 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/IconManager.cs +++ b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFile/IconManager.cs @@ -25,7 +25,7 @@ using System.Windows.Interop; using System.Windows.Media; using System.Windows.Media.Imaging; -namespace QuickLook.Plugin.ArchiveViewer; +namespace QuickLook.Plugin.ArchiveViewer.ArchiveFile; /// /// Internals are mostly from here: diff --git a/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs index 62fc169..ba709a4 100644 --- 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 . 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;