prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix xpath issue

Browse source
This commit is contained in:
Vic 2022-11-29 17:49:36 +08:00
parent 713c586b9f
commit a2d57c14bf
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
View file

@ -75,25 +75,26 @@ namespace Flow.Launcher.Plugin.Program.Programs
} }
var namespaceManager = new XmlNamespaceManager(xmlDoc.NameTable); var namespaceManager = new XmlNamespaceManager(xmlDoc.NameTable);
namespaceManager.AddNamespace("", "http://schemas.microsoft.com/appx/manifest/foundation/windows10"); namespaceManager.AddNamespace("d", "http://schemas.microsoft.com/appx/manifest/foundation/windows10"); // still need a name
namespaceManager.AddNamespace("rescap", "http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"); namespaceManager.AddNamespace("rescap", "http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities");
namespaceManager.AddNamespace("uap10", "http://schemas.microsoft.com/appx/manifest/uap/windows10/10"); namespaceManager.AddNamespace("uap10", "http://schemas.microsoft.com/appx/manifest/uap/windows10/10");
var allowElevationNode = xmlRoot.SelectSingleNode("//*[name()='rescap:Capability' and @Name='allowElevation']", namespaceManager); var allowElevationNode = xmlRoot.SelectSingleNode("//rescap:Capability[@Name='allowElevation']", namespaceManager);
bool packageCanElevate = allowElevationNode != null; bool packageCanElevate = allowElevationNode != null;
var appsNode = xmlRoot.SelectSingleNode("//*[name()='Applications']", namespaceManager); var appsNode = xmlRoot.SelectSingleNode("d:Applications", namespaceManager);
foreach (var app in Apps) foreach (var app in Apps)
{ {
// According to https://learn.microsoft.com/windows/apps/desktop/modernize/grant-identity-to-nonpackaged-apps#create-a-package-manifest-for-the-sparse-package // According to https://learn.microsoft.com/windows/apps/desktop/modernize/grant-identity-to-nonpackaged-apps#create-a-package-manifest-for-the-sparse-package
// and https://learn.microsoft.com/uwp/schemas/appxpackage/uapmanifestschema/element-application#attributes // and https://learn.microsoft.com/uwp/schemas/appxpackage/uapmanifestschema/element-application#attributes
var id = app.UserModelId.Split('!')[1]; var id = app.UserModelId.Split('!')[1];
var appNode = appsNode?.SelectSingleNode($"//*[name()='Application' and @Id='{id}']", namespaceManager); var appNode = appsNode?.SelectSingleNode($"d:Application[@Id='{id}']", namespaceManager);
if (appNode != null) if (appNode != null)
{ {
app.CanRunElevated = packageCanElevate || Application.IfAppCanRunElevated(appNode, namespaceManager); app.CanRunElevated = packageCanElevate || Application.IfAppCanRunElevated(appNode);
var visualElement = appNode.SelectSingleNode($"//*[name()='uap:VisualElements']", namespaceManager); // local name to fit all versions
var visualElement = appNode.SelectSingleNode($"*[local-name()='VisualElements']", namespaceManager);
var logoUri = visualElement?.Attributes[logoName]?.Value; var logoUri = visualElement?.Attributes[logoName]?.Value;
app.LogoPath = app.LogoPathFromUri(logoUri, (32, 32)); app.LogoPath = app.LogoPathFromUri(logoUri, (32, 32));
var previewUri = visualElement?.Attributes[bigLogoName]?.Value; var previewUri = visualElement?.Attributes[bigLogoName]?.Value;
@ -131,8 +132,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
} }
} }
/// http://www.hanselman.com/blog/GetNamespacesFromAnXMLDocumentWithXPathDocumentAndLINQToXML.aspx private PackageVersion GetPackageVersionFromManifest(XmlNode xmlRoot)
private PackageVersion GetPackageVersionFromManifest(XmlElement xmlRoot)
{ {
if (xmlRoot != null) if (xmlRoot != null)
{ {
@ -483,16 +483,13 @@ namespace Flow.Launcher.Plugin.Program.Programs
Main.StartProcess(Process.Start, info); Main.StartProcess(Process.Start, info);
} }
internal static bool IfAppCanRunElevated(XmlNode appNode, XmlNamespaceManager namespaceManager) internal static bool IfAppCanRunElevated(XmlNode appNode)
{ {
// According to https://learn.microsoft.com/windows/apps/desktop/modernize/grant-identity-to-nonpackaged-apps#create-a-package-manifest-for-the-sparse-package // According to https://learn.microsoft.com/windows/apps/desktop/modernize/grant-identity-to-nonpackaged-apps#create-a-package-manifest-for-the-sparse-package
// and https://learn.microsoft.com/uwp/schemas/appxpackage/uapmanifestschema/element-application#attributes // and https://learn.microsoft.com/uwp/schemas/appxpackage/uapmanifestschema/element-application#attributes
var entryPointNode = appNode.SelectSingleNode($"//*[local-name()='Application' and @EntryPoint]", namespaceManager); return appNode?.Attributes["EntryPoint"]?.Value == "Windows.FullTrustApplication" ||
var trustLevelNode = appNode.SelectSingleNode($"//*[local-name()='Application' and @uap10:TrustLevel]", namespaceManager); appNode?.Attributes["uap10:TrustLevel"]?.Value == "mediumIL";
return entryPointNode?.Attributes["EntryPoint"]?.Value == "Windows.FullTrustApplication" ||
trustLevelNode?.Attributes["uap10:TrustLevel"]?.Value == "mediumIL";
} }
internal string LogoPathFromUri(string uri, (int, int) desiredSize) internal string LogoPathFromUri(string uri, (int, int) desiredSize)