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

Make UID lowercase

Browse source
This commit is contained in:
Vic 2022-10-20 16:31:26 +08:00
parent 81d295498b
commit c85af888f9
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Plugins/Flow.Launcher.Plugin.Program/Programs/IProgram.cs
View file

@ -6,7 +6,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
{
List<Result> ContextMenus(IPublicAPI api);
Result Result(string query, IPublicAPI api);
string UniqueIdentifier { get; set; }
string UniqueIdentifier { get; set; } // get should guarantee lowercase
string Name { get; }
string Location { get; }
bool Enabled { get; }

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

@ -298,7 +298,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
public class Application : IProgram
{
public string AppListEntry { get; set; }
public string UniqueIdentifier { get; set; }
public string UniqueIdentifier { get => _uid; set => _uid = value.ToLowerInvariant(); }
public string DisplayName { get; set; }
public string Description { get; set; }
public string UserModelId { get; set; }
@ -317,6 +317,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
public Application() { }
private string _uid = string.Empty;
public Result Result(string query, IPublicAPI api)
{

20
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
View file

@ -17,6 +17,7 @@ using System.Diagnostics;
using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Channels;
using Flow.Launcher.Plugin.Program.Views.Models;
namespace Flow.Launcher.Plugin.Program.Programs
{
@ -24,9 +25,16 @@ namespace Flow.Launcher.Plugin.Program.Programs
public class Win32 : IProgram, IEquatable<Win32>
{
public string Name { get; set; }
public string UniqueIdentifier { get; set; }
public string UniqueIdentifier { get => _uid; set => _uid = value.ToLowerInvariant(); }
public string IcoPath { get; set; }
public string FullPath { get; set; }
public string FullPath {
get => _fullPath;
set
{
_fullPath = value;
_uid = value.ToLowerInvariant();
}
}
public string LnkResolvedPath { get; set; }
public string ParentDirectory { get; set; }
public string ExecutableName { get; set; }
@ -37,6 +45,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
private const string ShortcutExtension = "lnk";
private const string ExeExtension = "exe";
private string _uid = string.Empty;
private string _fullPath = string.Empty;
private static readonly Win32 Default = new Win32()
{
@ -47,7 +57,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
LnkResolvedPath = null,
ParentDirectory = string.Empty,
ExecutableName = null,
UniqueIdentifier = string.Empty,
//UniqueIdentifier = string.Empty,
Valid = false,
Enabled = false
};
@ -208,7 +218,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
Name = Path.GetFileNameWithoutExtension(path),
IcoPath = path,
FullPath = path,
UniqueIdentifier = path,
//UniqueIdentifier = path,
ParentDirectory = Directory.GetParent(path).FullName,
Description = string.Empty,
Valid = true,
@ -333,7 +343,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
}
}
private static IEnumerable<Win32> UnregisteredPrograms(List<Settings.ProgramSource> sources, string[] suffixes)
private static IEnumerable<Win32> UnregisteredPrograms(List<ProgramSource> sources, string[] suffixes)
{
var paths = ExceptDisabledSource(sources.Where(s => Directory.Exists(s.Location) && s.Enabled)
.SelectMany(s => ProgramPaths(s.Location, suffixes)), x => x)