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

Try to find in Assets\ if logo doesn't exist

Browse source
This commit is contained in:
Vic 2022-10-21 01:01:07 +08:00
parent f806c23e57
commit d533c5ee93
1 changed files with 85 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -603,109 +603,112 @@ namespace Flow.Launcher.Plugin.Program.Programs
string path = Path.Combine(Package.Location, uri);
// TODO: NOT sure why we needed this? Maybe for Windows 8?
//if (uri.Contains("\\"))
//{
// path = Path.Combine(Package.Location, uri);
//}
//else
//{
// // for C:\Windows\MiracastView etc
// path = Path.Combine(Package.Location, "Assets", uri);
//}
var extension = Path.GetExtension(path);
if (extension != null)
var logoPath = TryToFindLogo(uri, path);
if (String.IsNullOrEmpty(logoPath))
{
if (File.Exists(path))
// TODO: Don't know why, just keep it at the moment
// Maybe on older version of Windows 10?
// for C:\Windows\MiracastView etc
return TryToFindLogo(uri, Path.Combine(Package.Location, "Assets", uri));
}
return logoPath;
string TryToFindLogo(string uri, string path)
{
var extension = Path.GetExtension(path);
if (extension != null)
{
return path; // shortcut, avoid enumerating files
}
if (File.Exists(path))
{
return path; // shortcut, avoid enumerating files
}
var logoNamePrefix = Path.GetFileNameWithoutExtension(uri); // e.g Square44x44
var logoDir = Path.GetDirectoryName(path); // e.g ..\..\Assets
if (String.IsNullOrEmpty(logoNamePrefix) || String.IsNullOrEmpty(logoDir) || !Directory.Exists(logoDir))
{
// Known issue: Edge always triggers it since logo is not at uri
ProgramLogger.LogException($"|UWP|LogoPathFromUri|{Package.Location}" +
$"|{UserModelId} can't find logo uri for {uri} in package location (logo name or directory not found): {Package.Location}", new FileNotFoundException());
return string.Empty;
}
var logoNamePrefix = Path.GetFileNameWithoutExtension(uri); // e.g Square44x44
var logoDir = Path.GetDirectoryName(path); // e.g ..\..\Assets
if (String.IsNullOrEmpty(logoNamePrefix) || String.IsNullOrEmpty(logoDir) || !Directory.Exists(logoDir))
{
// Known issue: Edge always triggers it since logo is not at uri
ProgramLogger.LogException($"|UWP|LogoPathFromUri|{Package.Location}" +
$"|{UserModelId} can't find logo uri for {uri} in package location (logo name or directory not found): {Package.Location}", new FileNotFoundException());
return string.Empty;
}
var files = Directory.EnumerateFiles(logoDir);
var files = Directory.EnumerateFiles(logoDir);
// Just ignore all qulifiers
// select like logo[xxx].png
// https://learn.microsoft.com/en-us/windows/uwp/app-resources/tailor-resources-lang-scale-contrast
var selected = files.FirstOrDefault(file =>
Path.GetFileName(file).StartsWith(logoNamePrefix) && extension == Path.GetExtension(file)
);
// Currently we don't care which one to choose
// Just ignore all qualifiers
// select like logo.[xxx_yyy].png
// https://learn.microsoft.com/en-us/windows/uwp/app-resources/tailor-resources-lang-scale-contrast
var selected = files.FirstOrDefault(file =>
Path.GetFileName(file).StartsWith(logoNamePrefix) && extension == Path.GetExtension(file)
);
//var scaleFactors = new Dictionary<PackageVersion, List<int>>
//{
// // scale factors on win10: https://docs.microsoft.com/en-us/windows/uwp/controls-and-patterns/tiles-and-notifications-app-assets#asset-size-tables,
// {
// PackageVersion.Windows10, new List<int>
// {
// 100,
// 125,
// 150,
// 200,
// 400
// }
// },
// {
// PackageVersion.Windows81, new List<int>
// {
// 100,
// 120,
// 140,
// 160,
// 180
// }
// },
// {
// PackageVersion.Windows8, new List<int>
// {
// 100
// }
// }
//};
//var scaleFactors = new Dictionary<PackageVersion, List<int>>
//{
// // scale factors on win10: https://docs.microsoft.com/en-us/windows/uwp/controls-and-patterns/tiles-and-notifications-app-assets#asset-size-tables,
// {
// PackageVersion.Windows10, new List<int>
// {
// 100,
// 125,
// 150,
// 200,
// 400
// }
// },
// {
// PackageVersion.Windows81, new List<int>
// {
// 100,
// 120,
// 140,
// 160,
// 180
// }
// },
// {
// PackageVersion.Windows8, new List<int>
// {
// 100
// }
// }
//};
//if (scaleFactors.ContainsKey(Package.Version))
//{
// foreach (var factor in scaleFactors[Package.Version])
// {
// // https://learn.microsoft.com/en-us/windows/uwp/app-resources/tailor-resources-lang-scale-contrast
// suffixes.Add($"scale-{factor}{extension}"); // MS don't require scale as the last
// }
//}
//if (scaleFactors.ContainsKey(Package.Version))
//{
// foreach (var factor in scaleFactors[Package.Version])
// {
// // https://learn.microsoft.com/en-us/windows/uwp/app-resources/tailor-resources-lang-scale-contrast
// suffixes.Add($"scale-{factor}{extension}"); // MS don't require scale as the last
// }
//}
if (!string.IsNullOrEmpty(selected))
{
return selected;
if (!string.IsNullOrEmpty(selected))
{
return selected;
}
else
{
ProgramLogger.LogException($"|UWP|LogoPathFromUri|{Package.Location}" +
$"|{UserModelId} can't find logo uri for {uri} in package location (can't find specified logo): {Package.Location}", new FileNotFoundException());
return string.Empty;
}
}
else
{
ProgramLogger.LogException($"|UWP|LogoPathFromUri|{Package.Location}" +
$"|{UserModelId} can't find logo uri for {uri} in package location (can't find specified logo): {Package.Location}", new FileNotFoundException());
$"|Unable to find extension from {uri} for {UserModelId} " +
$"in package location {Package.Location}", new FileNotFoundException());
return string.Empty;
}
}
else
{
ProgramLogger.LogException($"|UWP|LogoPathFromUri|{Package.Location}" +
$"|Unable to find extension from {uri} for {UserModelId} " +
$"in package location {Package.Location}", new FileNotFoundException());
return string.Empty;
}
}
public ImageSource Logo()
{
var logo = ImageFromPath(LogoPath);
var plated = PlatedImage(logo);
var plated = PlatedImage(logo); // TODO: maybe get plated directly from app package?
// todo magic! temp fix for cross thread object
plated.Freeze();