Skip to content

Commit c25b927

Browse files
dcog989dcog989
authored
Merge branch 'Flow-Launcher:dev' into build-script-fixed-+-enhanced
2 parents 92286f3 + 09425e1 commit c25b927

File tree

11 files changed

+139
-20
lines changed

11 files changed

+139
-20
lines changed

‎Flow.Launcher.Core/packages.lock.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@
8383
"resolved": "1.0.0",
8484
"contentHash": "nwbZAYd+DblXAIzlnwDSnl0CiCm8jWLfHSYnoN4wYhtIav6AegB3+T/vKzLbU2IZlPB8Bvl8U3NXpx3eaz+N5w=="
8585
},
86+
"ini-parser": {
87+
"type": "Transitive",
88+
"resolved": "2.5.2",
89+
"contentHash": "hp3gKmC/14+6eKLgv7Jd1Z7OV86lO+tNfOXr/stQbwmRhdQuXVSvrRAuAe7G5+lwhkov0XkqZ8/bn1PYWMx6eg=="
90+
},
8691
"InputSimulator": {
8792
"type": "Transitive",
8893
"resolved": "1.0.4",
@@ -263,7 +268,8 @@
263268
"NLog.OutputDebugString": "[6.0.4, )",
264269
"SharpVectors.Wpf": "[1.8.5, )",
265270
"System.Drawing.Common": "[7.0.0, )",
266-
"ToolGood.Words.Pinyin": "[3.1.0.3, )"
271+
"ToolGood.Words.Pinyin": "[3.1.0.3, )",
272+
"ini-parser": "[2.5.2, )"
267273
}
268274
},
269275
"flow.launcher.plugin": {

‎Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<PrivateAssets>all</PrivateAssets>
6161
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6262
</PackageReference>
63+
<PackageReference Include="ini-parser" Version="2.5.2" />
6364
<PackageReference Include="InputSimulator" Version="1.0.4" />
6465
<PackageReference Include="MemoryPack" Version="1.21.4" />
6566
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.14.15" />

‎Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs‎

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
using System;
2-
using System.Runtime.InteropServices;
32
using System.IO;
3+
using System.Runtime.InteropServices;
44
using System.Windows;
55
using System.Windows.Interop;
66
using System.Windows.Media.Imaging;
7+
using IniParser;
78
using Windows.Win32;
89
using Windows.Win32.Foundation;
9-
using Windows.Win32.UI.Shell;
1010
using Windows.Win32.Graphics.Gdi;
11+
using Windows.Win32.UI.Shell;
1112

1213
namespace Flow.Launcher.Infrastructure.Image
1314
{
@@ -35,9 +36,32 @@ public class WindowsThumbnailProvider
3536

3637
private static readonly HRESULT S_PATHNOTFOUND = (HRESULT)0x8004B205;
3738

39+
private const string UrlExtension = ".url";
40+
41+
/// <summary>
42+
/// Obtains a BitmapSource thumbnail for the specified file.
43+
/// </summary>
44+
/// <remarks>
45+
/// If the file is a Windows URL shortcut (".url"), the method attempts to resolve the shortcut's icon and use that for the thumbnail; otherwise it requests a thumbnail for the file path. The native HBITMAP used to create the BitmapSource is always released to avoid native memory leaks.
46+
/// </remarks>
47+
/// <param name="fileName">Path to the file (can be a regular file or a ".url" shortcut).</param>
48+
/// <param name="width">Requested thumbnail width in pixels.</param>
49+
/// <param name="height">Requested thumbnail height in pixels.</param>
50+
/// <param name="options">Thumbnail extraction options (flags) controlling fallback and caching behavior.</param>
51+
/// <returns>A BitmapSource representing the requested thumbnail.</returns>
3852
public static BitmapSource GetThumbnail(string fileName, int width, int height, ThumbnailOptions options)
3953
{
40-
HBITMAP hBitmap = GetHBitmap(Path.GetFullPath(fileName), width, height, options);
54+
HBITMAP hBitmap;
55+
56+
var extension = Path.GetExtension(fileName);
57+
if (string.Equals(extension, UrlExtension, StringComparison.OrdinalIgnoreCase))
58+
{
59+
hBitmap = GetHBitmapForUrlFile(fileName, width, height, options);
60+
}
61+
else
62+
{
63+
hBitmap = GetHBitmap(Path.GetFullPath(fileName), width, height, options);
64+
}
4165

4266
try
4367
{
@@ -50,6 +74,21 @@ public static BitmapSource GetThumbnail(string fileName, int width, int height,
5074
}
5175
}
5276

77+
/// <summary>
78+
/// Obtains a native HBITMAP for the specified file at the requested size using the Windows Shell image factory.
79+
/// </summary>
80+
/// <remarks>
81+
/// If <paramref name="options"/> is <see cref="ThumbnailOptions.ThumbnailOnly"/> and thumbnail extraction fails
82+
/// due to extraction errors or a missing path, the method falls back to requesting an icon (<see cref="ThumbnailOptions.IconOnly"/>).
83+
/// The returned HBITMAP is a raw GDI handle; the caller is responsible for releasing it (e.g., via DeleteObject) to avoid native memory leaks.
84+
/// </remarks>
85+
/// <param name="fileName">Path to the file to thumbnail.</param>
86+
/// <param name="width">Requested thumbnail width in pixels.</param>
87+
/// <param name="height">Requested thumbnail height in pixels.</param>
88+
/// <param name="options">Thumbnail request flags that control behavior (e.g., ThumbnailOnly, IconOnly).</param>
89+
/// <returns>An HBITMAP handle containing the image. Caller must free the handle when finished.</returns>
90+
/// <exception cref="COMException">If creating the shell item fails (HRESULT returned by SHCreateItemFromParsingName).</exception>
91+
/// <exception cref="InvalidOperationException">If the shell item does not expose IShellItemImageFactory or if an unexpected error occurs while obtaining the image.</exception>
5392
private static unsafe HBITMAP GetHBitmap(string fileName, int width, int height, ThumbnailOptions options)
5493
{
5594
var retCode = PInvoke.SHCreateItemFromParsingName(
@@ -108,5 +147,44 @@ private static unsafe HBITMAP GetHBitmap(string fileName, int width, int height,
108147

109148
return hBitmap;
110149
}
150+
151+
/// <summary>
152+
/// Obtains an HBITMAP for a Windows .url shortcut by resolving its IconFile entry and delegating to GetHBitmap.
153+
/// </summary>
154+
/// <remarks>
155+
/// The method parses the .url file as an INI, looks in the "InternetShortcut" section for the "IconFile" entry,
156+
/// and requests a bitmap for that icon path. If no IconFile is present or any error occurs while reading or
157+
/// resolving the icon, it falls back to requesting a thumbnail for the .url file itself.
158+
/// </remarks>
159+
/// <param name="fileName">Path to the .url shortcut file.</param>
160+
/// <param name="width">Requested thumbnail width (pixels).</param>
161+
/// <param name="height">Requested thumbnail height (pixels).</param>
162+
/// <param name="options">ThumbnailOptions flags controlling extraction behavior.</param>
163+
/// <returns>An HBITMAP containing the requested image; callers are responsible for freeing the native handle.</returns>
164+
private static unsafe HBITMAP GetHBitmapForUrlFile(string fileName, int width, int height, ThumbnailOptions options)
165+
{
166+
HBITMAP hBitmap;
167+
168+
try
169+
{
170+
var parser = new FileIniDataParser();
171+
var data = parser.ReadFile(fileName);
172+
var urlSection = data["InternetShortcut"];
173+
174+
var iconPath = urlSection?["IconFile"];
175+
if (!File.Exists(iconPath))
176+
{
177+
// If the IconFile is missing, throw exception to fallback to the default icon
178+
throw new FileNotFoundException("Icon file not specified in Internet shortcut (.url) file.");
179+
}
180+
hBitmap = GetHBitmap(Path.GetFullPath(iconPath), width, height, options);
181+
}
182+
catch
183+
{
184+
hBitmap = GetHBitmap(Path.GetFullPath(fileName), width, height, options);
185+
}
186+
187+
return hBitmap;
188+
}
111189
}
112190
}

‎Flow.Launcher.Infrastructure/packages.lock.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
"resolved": "6.9.3",
3030
"contentHash": "1CUGgFdyECDKgi5HaUBhdv6k+VG9Iy4OCforGfHyar3xQXAJypZkzymgKtWj/4SPd6nSG0Qi7NH71qHrDSZLaA=="
3131
},
32+
"ini-parser": {
33+
"type": "Direct",
34+
"requested": "[2.5.2, )",
35+
"resolved": "2.5.2",
36+
"contentHash": "hp3gKmC/14+6eKLgv7Jd1Z7OV86lO+tNfOXr/stQbwmRhdQuXVSvrRAuAe7G5+lwhkov0XkqZ8/bn1PYWMx6eg=="
37+
},
3238
"InputSimulator": {
3339
"type": "Direct",
3440
"requested": "[1.0.4, )",

‎Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,16 @@ public static bool FileExists(this string filePath)
150150
return File.Exists(filePath);
151151
}
152152

153+
/// <summary>
154+
/// Checks if a file or directory exists
155+
/// </summary>
156+
/// <param name="path"></param>
157+
/// <returns></returns>
158+
public static bool FileOrLocationExists(this string path)
159+
{
160+
return LocationExists(path) || FileExists(path);
161+
}
162+
153163
/// <summary>
154164
/// Open a directory window (using the OS's default handler, usually explorer)
155165
/// </summary>

‎Flow.Launcher/Languages/en.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@
590590
<system:String x:Key="errorTitle">Error</system:String>
591591
<system:String x:Key="folderOpenError">An error occurred while opening the folder. {0}</system:String>
592592
<system:String x:Key="browserOpenError">An error occurred while opening the URL in the browser. Please check your Default Web Browser configuration in the General section of the settings window</system:String>
593+
<system:String x:Key="fileNotFoundError">File or directory not found: {0}</system:String>
593594

594595
<!-- General Notice -->
595596
<system:String x:Key="pleaseWait">Please wait...</system:String>

‎Flow.Launcher/PublicAPIInstance.cs‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Concurrent;
33
using System.Collections.Generic;
44
using System.Collections.Specialized;
@@ -74,7 +74,6 @@ public void ChangeQuery(string query, bool requery = false)
7474
_mainVM.ChangeQueryText(query, requery);
7575
}
7676

77-
[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "<Pending>")]
7877
public void RestartApp()
7978
{
8079
_mainVM.Hide();
@@ -179,7 +178,7 @@ public async void CopyToClipboard(string stringToCopy, bool directCopy = false,
179178

180179
Clipboard.SetFileDropList(paths);
181180
});
182-
181+
183182
if (exception == null)
184183
{
185184
if (showDefaultNotification)
@@ -218,7 +217,7 @@ public async void CopyToClipboard(string stringToCopy, bool directCopy = false,
218217
{
219218
LogException(nameof(PublicAPIInstance), "Failed to copy text to clipboard", exception);
220219
ShowMsgError(GetTranslation("failedToCopy"));
221-
}
220+
}
222221
}
223222
}
224223

@@ -327,7 +326,7 @@ public void SavePluginSettings()
327326

328327
((PluginJsonStorage<T>)_pluginJsonStorages[type]).Save();
329328
}
330-
329+
331330
public void OpenDirectory(string directoryPath, string fileNameOrFilePath = null)
332331
{
333332
try
@@ -412,6 +411,12 @@ public void OpenDirectory(string directoryPath, string fileNameOrFilePath = null
412411

413412
private void OpenUri(Uri uri, bool? inPrivate = null, bool forceBrowser = false)
414413
{
414+
if (uri.IsFile && !FilesFolders.FileOrLocationExists(uri.LocalPath))
415+
{
416+
ShowMsgError(GetTranslation("errorTitle"), string.Format(GetTranslation("fileNotFoundError"), uri.LocalPath));
417+
return;
418+
}
419+
415420
if (forceBrowser || uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
416421
{
417422
var browserInfo = _settings.CustomBrowser;
@@ -441,13 +446,19 @@ private void OpenUri(Uri uri, bool? inPrivate = null, bool forceBrowser = false)
441446
}
442447
else
443448
{
444-
Process.Start(new ProcessStartInfo()
449+
try
445450
{
446-
FileName = uri.AbsoluteUri,
447-
UseShellExecute = true
448-
})?.Dispose();
449-
450-
return;
451+
Process.Start(new ProcessStartInfo()
452+
{
453+
FileName = uri.AbsoluteUri,
454+
UseShellExecute = true
455+
})?.Dispose();
456+
}
457+
catch (Exception e)
458+
{
459+
LogException(ClassName, $"Failed to open: {uri.AbsoluteUri}", e);
460+
ShowMsgError(GetTranslation("errorTitle"), e.Message);
461+
}
451462
}
452463
}
453464

@@ -481,7 +492,7 @@ public void OpenAppUri(Uri appUri)
481492
OpenUri(appUri);
482493
}
483494

484-
public void ToggleGameMode()
495+
public void ToggleGameMode()
485496
{
486497
_mainVM.ToggleGameMode();
487498
}

‎Flow.Launcher/packages.lock.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@
204204
"resolved": "1.11.42",
205205
"contentHash": "LDc1bEfF14EY2DZzak4xvzWvbpNXK3vi1u0KQbBpLUN4+cx/VrvXhgCAMSJhSU5vz0oMfW9JZIR20vj/PkDHPA=="
206206
},
207+
"ini-parser": {
208+
"type": "Transitive",
209+
"resolved": "2.5.2",
210+
"contentHash": "hp3gKmC/14+6eKLgv7Jd1Z7OV86lO+tNfOXr/stQbwmRhdQuXVSvrRAuAe7G5+lwhkov0XkqZ8/bn1PYWMx6eg=="
211+
},
207212
"InputSimulator": {
208213
"type": "Transitive",
209214
"resolved": "1.0.4",
@@ -863,7 +868,8 @@
863868
"NLog.OutputDebugString": "[6.0.4, )",
864869
"SharpVectors.Wpf": "[1.8.5, )",
865870
"System.Drawing.Common": "[7.0.0, )",
866-
"ToolGood.Words.Pinyin": "[3.1.0.3, )"
871+
"ToolGood.Words.Pinyin": "[3.1.0.3, )",
872+
"ini-parser": "[2.5.2, )"
867873
}
868874
},
869875
"flow.launcher.plugin": {

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>

‎Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>

0 commit comments

Comments
 (0)