mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-12 06:09:52 +01:00
Compare commits
1 Commits
issue/4241
...
issue/3930
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed0658235b |
@@ -1,69 +0,0 @@
|
||||
// HomePagePathResolver.cs
|
||||
// Fix for Issue #42414: Peek doesn't work on File Explorer Home page
|
||||
// Resolves shell locations like "Home", "Quick Access" to actual paths
|
||||
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Peek.Common.Helpers
|
||||
{
|
||||
/// <summary>
|
||||
/// Resolves special File Explorer locations to their actual paths.
|
||||
/// </summary>
|
||||
public static class HomePagePathResolver
|
||||
{
|
||||
private static readonly Guid FOLDERID_Profile = new Guid("5E6C858F-0E22-4760-9AFE-EA3317B67173");
|
||||
private static readonly Guid FOLDERID_Desktop = new Guid("B4BFCC3A-DB2C-424C-B029-7FE99A87C641");
|
||||
|
||||
/// <summary>
|
||||
/// Checks if the current explorer location is the Home/Quick Access page.
|
||||
/// </summary>
|
||||
public static bool IsHomePage(string shellPath)
|
||||
{
|
||||
if (string.IsNullOrEmpty(shellPath))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Common Home page identifiers
|
||||
return shellPath.Contains("shell:::", StringComparison.OrdinalIgnoreCase)
|
||||
|| shellPath.Contains("Home", StringComparison.OrdinalIgnoreCase)
|
||||
|| shellPath.StartsWith("::", StringComparison.Ordinal);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the actual file path for an item selected on the Home page.
|
||||
/// Items on Home page are references to files in other locations.
|
||||
/// </summary>
|
||||
public static string ResolveHomePageItem(string itemPath)
|
||||
{
|
||||
if (string.IsNullOrEmpty(itemPath))
|
||||
{
|
||||
return itemPath;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// If it's already a valid file path, return it
|
||||
if (System.IO.File.Exists(itemPath) || System.IO.Directory.Exists(itemPath))
|
||||
{
|
||||
return itemPath;
|
||||
}
|
||||
|
||||
// Try to resolve shell path
|
||||
return ResolveShellPath(itemPath) ?? itemPath;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return itemPath;
|
||||
}
|
||||
}
|
||||
|
||||
private static string? ResolveShellPath(string shellPath)
|
||||
{
|
||||
// Implementation would use IShellItem to resolve the actual path
|
||||
// For now, return null to indicate no resolution needed
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
// WorkingDirectoryHelper.cs
|
||||
// Fix for Issue #39305: Peek's "open with" leaves working directory in PowerToys
|
||||
// Ensures launched applications get the correct working directory
|
||||
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
|
||||
namespace Peek.Common.Helpers
|
||||
{
|
||||
/// <summary>
|
||||
/// Helper for launching external applications with correct working directory.
|
||||
/// </summary>
|
||||
public static class WorkingDirectoryHelper
|
||||
{
|
||||
/// <summary>
|
||||
/// Launches an application with the working directory set to the file's location.
|
||||
/// </summary>
|
||||
/// <param name="filePath">The file to open.</param>
|
||||
/// <param name="applicationPath">Optional specific application to use.</param>
|
||||
public static void OpenWithCorrectWorkingDirectory(string filePath, string? applicationPath = null)
|
||||
{
|
||||
if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var directory = Path.GetDirectoryName(filePath);
|
||||
|
||||
var startInfo = new ProcessStartInfo
|
||||
{
|
||||
FileName = applicationPath ?? filePath,
|
||||
WorkingDirectory = directory ?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
|
||||
UseShellExecute = true,
|
||||
};
|
||||
|
||||
if (!string.IsNullOrEmpty(applicationPath))
|
||||
{
|
||||
startInfo.Arguments = $"\"{filePath}\"";
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
Process.Start(startInfo);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Log error but don't throw - graceful degradation
|
||||
System.Diagnostics.Debug.WriteLine($"Failed to open file: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Opens the "Open with" dialog with correct working directory.
|
||||
/// </summary>
|
||||
public static void ShowOpenWithDialog(string filePath)
|
||||
{
|
||||
if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var directory = Path.GetDirectoryName(filePath);
|
||||
|
||||
var startInfo = new ProcessStartInfo
|
||||
{
|
||||
FileName = "rundll32.exe",
|
||||
Arguments = $"shell32.dll,OpenAs_RunDLL \"{filePath}\"",
|
||||
WorkingDirectory = directory ?? string.Empty,
|
||||
UseShellExecute = false,
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
Process.Start(startInfo);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Fallback to default behavior
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user