smart-dev
/
Wox
mirror of https://github.com/Wox-launcher/Wox
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(app): improve unicode handling for shortcut app path on windows. #4236 

* Replaced the previous shortcut resolution method with a PowerShell-based approach for better Unicode support.
* Improved error handling for shortcut resolution.
* Cleaned up unused import statements.
This commit is contained in:
qianlifeng 2025-07-12 21:53:35 +08:00
parent 4750fc92ce
commit fe183f5bf6
No known key found for this signature in database
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wox.core/go.mod
View File

@ -27,7 +27,7 @@ require (
github.com/olahol/melody v1.2.1
github.com/openai/openai-go v0.1.0-beta.6
github.com/otiai10/copy v1.14.0
github.com/parsiya/golnk v0.0.0-20221103095132-740a4c27c4ff
github.com/petermattis/goid v0.0.0-20241025130422-66cb2e6d7274
github.com/robotn/gohook v0.41.0
github.com/rs/cors v1.11.1

42
wox.core/plugin/system/app/app_windows.go
View File

@ -20,7 +20,6 @@ import (
"wox/util/shell"
win "github.com/lxn/win"
lnk "github.com/parsiya/golnk"
)
var (
@ -94,20 +93,16 @@ func (a *WindowsRetriever) ParseAppInfo(ctx context.Context, path string) (appIn
}
func (a *WindowsRetriever) parseShortcut(ctx context.Context, appPath string) (appInfo, error) {
f, lnkErr := lnk.File(appPath)
if lnkErr != nil {
return appInfo{}, lnkErr
// Use PowerShell + COM to resolve shortcut with proper Unicode support
targetPath, resolveErr := a.resolveShortcutWithAPI(ctx, appPath)
if resolveErr != nil {
return appInfo{}, fmt.Errorf("failed to resolve shortcut %s: %v", appPath, resolveErr)
}
var targetPath = ""
if f.LinkInfo.LocalBasePath != "" {
targetPath = f.LinkInfo.LocalBasePath
}
if f.LinkInfo.LocalBasePathUnicode != "" {
targetPath = f.LinkInfo.LocalBasePathUnicode
}
a.api.Log(ctx, plugin.LogLevelInfo, fmt.Sprintf("Resolved shortcut %s -> %s", appPath, targetPath))
if targetPath == "" || !strings.HasSuffix(targetPath, ".exe") {
return appInfo{}, errors.New("no target path found")
return appInfo{}, errors.New("no target path found or not an exe file")
}
// use default icon if no icon is found
@ -226,6 +221,29 @@ func (a *WindowsRetriever) GetAppIcon(ctx context.Context, path string) (image.I
return img, nil
}
// resolveShortcutWithAPI uses Windows API to resolve shortcut target path with proper Unicode support
func (a *WindowsRetriever) resolveShortcutWithAPI(ctx context.Context, shortcutPath string) (string, error) {
// Use PowerShell to resolve the shortcut with proper Unicode handling
powershellCmd := fmt.Sprintf(`
[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
$shell = New-Object -ComObject WScript.Shell
$shortcut = $shell.CreateShortcut('%s')
Write-Output $shortcut.TargetPath
`, shortcutPath)
output, err := shell.RunOutput("powershell", "-Command", powershellCmd)
if err != nil {
return "", fmt.Errorf("failed to resolve shortcut: %v", err)
}
targetPath := strings.TrimSpace(string(output))
if targetPath == "" {
return "", fmt.Errorf("empty target path")
}
return targetPath, nil
}
func (a *WindowsRetriever) GetExtraApps(ctx context.Context) ([]appInfo, error) {
uwpApps := a.GetUWPApps(ctx)
util.GetLogger().Info(ctx, fmt.Sprintf("Found %d UWP apps", len(uwpApps)))