Compare commits

...

9 Commits

Author SHA1 Message Date
copilot-swe-agent[bot]
d6de335da5 Add trailing newline to ExtensionFilterHelper.cs
Co-authored-by: emako <24737061+emako@users.noreply.github.com>
2025-11-26 21:23:11 +00:00
copilot-swe-agent[bot]
eade320211 Address code review: optimize directory checks and use static separator array
Co-authored-by: emako <24737061+emako@users.noreply.github.com>
2025-11-26 21:21:36 +00:00
copilot-swe-agent[bot]
f54f037b01 Address code review feedback: improve docs and remove redundant I/O
Co-authored-by: emako <24737061+emako@users.noreply.github.com>
2025-11-26 21:16:22 +00:00
copilot-swe-agent[bot]
15ec6b4749 Add ExtensionFilterHelper to main QuickLook project
Co-authored-by: emako <24737061+emako@users.noreply.github.com>
2025-11-26 21:14:29 +00:00
copilot-swe-agent[bot]
0d9e80eb36 Add ExtensionFilterHelper and integrate with ViewWindowManager
Co-authored-by: emako <24737061+emako@users.noreply.github.com>
2025-11-26 21:12:50 +00:00
copilot-swe-agent[bot]
b0dae69889 Initial plan 2025-11-26 21:06:21 +00:00
ema
76dfa34928 Update NuGet package versions in project files
Some checks failed
MSBuild / build (push) Has been cancelled
MSBuild / publish (push) Has been cancelled
Upgraded several NuGet dependencies across multiple csproj files, including Microsoft.Web.WebView2, Google.Protobuf, MsgReader, bblanchon.PDFiumV8.Win32, and Lib.Harmony. This ensures compatibility with the latest features and bug fixes from upstream packages.
2025-11-26 01:07:28 +08:00
Copilot
bf7de3bd8e Add ShowInTaskbar setting to display window in taskbar (#1818) 2025-11-26 00:52:12 +08:00
Copilot
1adb7ce980 Add option to disable automatic update check at startup (#1819) 2025-11-26 00:45:15 +08:00
11 changed files with 223 additions and 10 deletions

View File

@@ -73,7 +73,7 @@
<ItemGroup>
<PackageReference Include="FreeTypeSharp" Version="3.0.1" />
<PackageReference Include="QuickLook.Typography.OpenFont" Version="1.0.1" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3537.50">
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3595.46">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

View File

@@ -61,7 +61,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3537.50">
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3595.46">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

View File

@@ -62,10 +62,10 @@
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.9.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3537.50">
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3595.46">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Google.Protobuf" Version="3.33.0">
<PackageReference Include="Google.Protobuf" Version="3.33.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Memory" Version="4.6.3">

View File

@@ -55,7 +55,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MsgReader" Version="6.0.5" />
<PackageReference Include="MsgReader" Version="6.0.6" />
</ItemGroup>
<ItemGroup>

View File

@@ -61,7 +61,7 @@
<ItemGroup>
<PackageReference Include="UTF.Unknown" Version="2.6.0" />
<Reference Include="WindowsBase" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3537.50">
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3595.46">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

View File

@@ -64,7 +64,7 @@
<ItemGroup>
<PackageReference Include="PdfiumViewer.Updated" Version="2.14.5" />
<PackageReference Include="bblanchon.PDFiumV8.Win32" Version="143.0.7497" />
<PackageReference Include="bblanchon.PDFiumV8.Win32" Version="144.0.7543" />
<Reference Include="WindowsBase" />
</ItemGroup>

View File

@@ -259,6 +259,9 @@ public partial class App : Application
private void CheckUpdate()
{
if (SettingHelper.Get("DisableAutoUpdateCheck", false))
return;
if (DateTime.Now.Ticks - SettingHelper.Get<long>("LastUpdateTicks") < TimeSpan.FromDays(30).Ticks)
return;

View File

@@ -0,0 +1,198 @@
// Copyright © 2017-2025 QL-Win Contributors
//
// This file is part of QuickLook program.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// 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.Helpers;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace QuickLook.Helpers;
/// <summary>
/// Helper class for managing file extension allowlist/blocklist filtering.
/// <para>
/// <b>Blocklist mode (default):</b> All extensions are allowed except those in the blocklist.
/// If the blocklist is empty, all files are allowed.
/// </para>
/// <para>
/// <b>Allowlist mode:</b> Only extensions in the allowlist can be previewed.
/// If the allowlist is empty in allowlist mode, all files are allowed (no filtering).
/// </para>
/// <para>
/// Directories and files without extensions are always allowed regardless of the mode.
/// </para>
/// </summary>
public static class ExtensionFilterHelper
{
private const string AllowlistKey = "ExtensionAllowlist";
private const string BlocklistKey = "ExtensionBlocklist";
private const string UseAllowlistModeKey = "UseExtensionAllowlistMode";
private static readonly char[] ExtensionSeparators = [';', ','];
private static HashSet<string> _allowlistCache;
private static HashSet<string> _blocklistCache;
private static bool? _useAllowlistModeCache;
/// <summary>
/// Gets or sets whether to use allowlist mode.
/// When true, only extensions in the allowlist can be previewed.
/// When false (default), extensions in the blocklist are blocked from preview.
/// </summary>
public static bool UseAllowlistMode
{
get
{
_useAllowlistModeCache ??= SettingHelper.Get(UseAllowlistModeKey, false);
return _useAllowlistModeCache.Value;
}
set
{
_useAllowlistModeCache = value;
SettingHelper.Set(UseAllowlistModeKey, value);
}
}
/// <summary>
/// Gets the current allowlist of file extensions.
/// Extensions should be in the format ".ext" (with leading dot).
/// </summary>
public static HashSet<string> Allowlist
{
get
{
if (_allowlistCache == null)
{
var list = SettingHelper.Get(AllowlistKey, string.Empty);
_allowlistCache = ParseExtensionList(list);
}
return _allowlistCache;
}
}
/// <summary>
/// Gets the current blocklist of file extensions.
/// Extensions should be in the format ".ext" (with leading dot).
/// </summary>
public static HashSet<string> Blocklist
{
get
{
if (_blocklistCache == null)
{
var list = SettingHelper.Get(BlocklistKey, string.Empty);
_blocklistCache = ParseExtensionList(list);
}
return _blocklistCache;
}
}
/// <summary>
/// Sets the allowlist of file extensions.
/// </summary>
/// <param name="extensions">Collection of extensions in the format ".ext" (with leading dot).</param>
public static void SetAllowlist(IEnumerable<string> extensions)
{
var normalized = NormalizeExtensions(extensions);
_allowlistCache = normalized;
SettingHelper.Set(AllowlistKey, string.Join(";", normalized));
}
/// <summary>
/// Sets the blocklist of file extensions.
/// </summary>
/// <param name="extensions">Collection of extensions in the format ".ext" (with leading dot).</param>
public static void SetBlocklist(IEnumerable<string> extensions)
{
var normalized = NormalizeExtensions(extensions);
_blocklistCache = normalized;
SettingHelper.Set(BlocklistKey, string.Join(";", normalized));
}
/// <summary>
/// Checks if a file path is allowed for preview based on the current filter settings.
/// </summary>
/// <param name="path">The file path to check.</param>
/// <returns>True if the file is allowed for preview, false if it should be blocked.</returns>
public static bool IsExtensionAllowed(string path)
{
if (string.IsNullOrEmpty(path))
return true;
var extension = Path.GetExtension(path);
// Files without extensions are always allowed (includes directories)
if (string.IsNullOrEmpty(extension))
return true;
extension = extension.ToLowerInvariant();
if (UseAllowlistMode)
{
// In allowlist mode: only allow if extension is in the allowlist
// If allowlist is empty, allow all (no filtering)
return Allowlist.Count == 0 || Allowlist.Contains(extension);
}
else
{
// In blocklist mode: block if extension is in the blocklist
return !Blocklist.Contains(extension);
}
}
/// <summary>
/// Clears the cached settings, forcing a reload from the config file.
/// </summary>
public static void ClearCache()
{
_allowlistCache = null;
_blocklistCache = null;
_useAllowlistModeCache = null;
}
private static HashSet<string> ParseExtensionList(string list)
{
if (string.IsNullOrWhiteSpace(list))
return new HashSet<string>(StringComparer.OrdinalIgnoreCase);
return new HashSet<string>(
list.Split(ExtensionSeparators, StringSplitOptions.RemoveEmptyEntries)
.Select(NormalizeExtension)
.Where(e => !string.IsNullOrEmpty(e)),
StringComparer.OrdinalIgnoreCase);
}
private static HashSet<string> NormalizeExtensions(IEnumerable<string> extensions)
{
return new HashSet<string>(
extensions.Select(NormalizeExtension).Where(e => !string.IsNullOrEmpty(e)),
StringComparer.OrdinalIgnoreCase);
}
private static string NormalizeExtension(string ext)
{
if (string.IsNullOrWhiteSpace(ext))
return null;
ext = ext.Trim().ToLowerInvariant();
if (!ext.StartsWith("."))
ext = "." + ext;
return ext;
}
}

View File

@@ -105,7 +105,7 @@
<PackageReference Include="WPF-UI.Violeta" Version="4.0.3.6">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Lib.Harmony" Version="2.4.1">
<PackageReference Include="Lib.Harmony" Version="2.4.2">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="UnblockZoneIdentifier" Version="1.0.0">

View File

@@ -151,10 +151,15 @@ public class ViewWindowManager : IDisposable
if (_viewerWindow.IsVisible && path == _invokedPath)
return;
if (!Directory.Exists(path) && !File.Exists(path))
var isDirectory = Directory.Exists(path);
if (!isDirectory && !File.Exists(path))
if (!path.StartsWith("::")) // CLSID
return;
// Check extension filtering before proceeding (skip for directories)
if (!isDirectory && !ExtensionFilterHelper.IsExtensionAllowed(path))
return;
_invokedPath = path;
RunFocusMonitor();
@@ -172,7 +177,12 @@ public class ViewWindowManager : IDisposable
if (string.IsNullOrEmpty(path))
return;
if (!Directory.Exists(path) && !File.Exists(path))
var isDirectory = Directory.Exists(path);
if (!isDirectory && !File.Exists(path))
return;
// Check extension filtering before proceeding (skip for directories)
if (!isDirectory && !ExtensionFilterHelper.IsExtensionAllowed(path))
return;
RunFocusMonitor();

View File

@@ -64,6 +64,8 @@ public partial class ViewerWindow : Window
Topmost = SettingHelper.Get("Topmost", false);
buttonTop.Tag = Topmost ? "Top" : "Auto";
ShowInTaskbar = SettingHelper.Get("ShowInTaskbar", false);
buttonTop.Click += (_, _) =>
{
Topmost = !Topmost;