1.8.4

Codectory · Codectory · commit 159bcc88f18a · 2021-12-23T01:25:44.000+01:00
[Bug fixes]
- Lost data of UWP apps after updates
- Icons of UWP apps are missing after update
diff --git a/Source/AutoHDR/Applications/ApplicationItem.cs b/Source/AutoHDR/Applications/ApplicationItem.cs
@@ -1,4 +1,5 @@
-﻿using CodectoryCore.UI.Wpf;
+﻿using AutoHDR.UWP;
+using CodectoryCore.UI.Wpf;
 using CodectoryCore.Windows;
 using CodectoryCore.Windows.FileSystem;
 using CodectoryCore.Windows.Icons;
@@ -28,6 +29,7 @@ public class ApplicationItem : BaseViewModel, IEquatable<ApplicationItem>
         private string _applicationName;
         private System.Drawing.Bitmap icon = null;
         //private bool _restartProcess = false;
+        private string _uwpFullPackageName = string.Empty;
         private string _uwpFamilyPackageName = string.Empty;
         private string _uwpApplicationID = string.Empty;
         private string _uwpIconPath = string.Empty;
@@ -38,22 +40,37 @@ public class ApplicationItem : BaseViewModel, IEquatable<ApplicationItem>
         public string DisplayName { get => displayName; set { displayName = value; OnPropertyChanged(); } }
         [JsonProperty]
         public string ApplicationName { get => _applicationName; set { _applicationName = value; OnPropertyChanged(); } }
-        [JsonProperty]
-        public string ApplicationFilePath { get => _applicationFilePath; set { _applicationFilePath = value;  try { Icon = IconHelper.GetFileIcon(value); } catch { } OnPropertyChanged(); } }
+        [JsonProperty(Order = 1)]
+        public string ApplicationFilePath {
+            get => _applicationFilePath; 
+            set { _applicationFilePath = value;  try {  if (!IsUWP && !IsUWPWepApp)  Icon = IconHelper.GetFileIcon(value); } catch { } OnPropertyChanged(); } }
         // public bool RestartProcess { get => _restartProcess; set { _restartProcess = value; OnPropertyChanged(); } }
-        [JsonProperty]
+        [JsonProperty(Order =0)]
         public bool IsUWP { get => _isUWP; set { _isUWP = value; OnPropertyChanged(); } }
-        [JsonProperty]
+        [JsonProperty(Order = 0)]
         public bool IsUWPWepApp { get => _isUWPWebApp; set { _isUWPWebApp = value; OnPropertyChanged(); } }
         public Bitmap Icon { get => icon; set { icon = value; OnPropertyChanged(); } }
-        [JsonProperty]
-        public string UWPFamilyPackageName { get => _uwpFamilyPackageName; set { _uwpFamilyPackageName = value; OnPropertyChanged(); } }
-        [JsonProperty]
-        public string UWPApplicationID { get => _uwpApplicationID; set { _uwpApplicationID = value; OnPropertyChanged(); } }
-        [JsonProperty]
-        public string UWPIconPath { get => _uwpIconPath; set { _uwpIconPath = value; try { Icon = new Bitmap(Bitmap.FromFile(value)); } catch { }OnPropertyChanged(); } }
+        [JsonProperty(Order = 1)]
+        public string UWPFullPackageName { 
+            get => _uwpFullPackageName; 
+            set { _uwpFullPackageName = value;  OnPropertyChanged(); LoadUWPData(); } 
+        }
+
+        [JsonProperty(Order = 0)]
+        public string UWPFamilyPackageName
+        {
+            get => _uwpFamilyPackageName;
+            set { _uwpFamilyPackageName = value; OnPropertyChanged(); }
+        }
+
+        [JsonProperty(Order = 2)]
+        public string UWPApplicationID { 
+            get => _uwpApplicationID; 
+            set { _uwpApplicationID = value; OnPropertyChanged(); if (string.IsNullOrEmpty(UWPFullPackageName)) LoadUWPData(); } }
+        public string UWPIconPath { 
+            get => _uwpIconPath; 
+            set { _uwpIconPath = value; try { if (IsUWP ||IsUWPWepApp) Icon = new Bitmap(Bitmap.FromFile(value)); } catch { }OnPropertyChanged(); } }
        
-        [JsonProperty]
         public string UWPIdentity { get => _uwpIdentity; set { _uwpIdentity = value; OnPropertyChanged(); } }
 
         private ApplicationItem()
@@ -67,12 +84,31 @@ public ApplicationItem(string displayName, string applicationFilePath)
             ApplicationName = new FileInfo(ApplicationFilePath).Name.Replace(".exe", "");
         }
 
-        public ApplicationItem(UWP.UWPApp uwpApp) : this(uwpApp.Name, uwpApp.ExecutablePath)
+        public ApplicationItem(UWPApp uwpApp) : this(uwpApp.Name, uwpApp.ExecutablePath)
         {
             IsUWP = true;
             IsUWPWepApp = true;
             UWPFamilyPackageName = uwpApp.FamilyPackageName;
-            UWPApplicationID = uwpApp.ApplicationID;
+            _uwpFullPackageName = uwpApp.FullPackageName;
+            _uwpApplicationID = uwpApp.ApplicationID;
+            UWPIconPath = uwpApp.IconPath;
+            UWPIdentity = uwpApp.Identity;
+        }
+
+       private void LoadUWPData()
+        {
+            if (!IsUWP && !IsUWPWepApp)
+                return;
+            UWPApp uwpApp;
+            //Compatibility for old UWP handling
+            if (string.IsNullOrEmpty(UWPFullPackageName))
+                uwpApp = UWPAppsManager.GetUWPApp(UWPFamilyPackageName, UWPApplicationID);
+            else
+                uwpApp = UWPAppsManager.GetUWPApp(UWPFullPackageName);
+
+            UWPFamilyPackageName = uwpApp.FamilyPackageName;
+            _uwpFullPackageName = uwpApp.FullPackageName;
+            _uwpApplicationID = uwpApp.ApplicationID;
             UWPIconPath = uwpApp.IconPath;
             UWPIdentity = uwpApp.Identity;
         }
diff --git a/Source/AutoHDR/Properties/AssemblyInfo.cs b/Source/AutoHDR/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.2.0")]
-[assembly: AssemblyFileVersion("1.8.2.0")]
+[assembly: AssemblyVersion("1.8.4.0")]
+[assembly: AssemblyFileVersion("1.8.4.0")]
diff --git a/Source/AutoHDR/UWP/UWPApp.cs b/Source/AutoHDR/UWP/UWPApp.cs
@@ -34,9 +34,10 @@ public string ExecutablePath
         public bool IsWebApp  { get; private set; } = false;
         public string InstallLocation { get; private set; } = string.Empty;
         public string FamilyPackageName { get; private set; } = string.Empty;
+        public string FullPackageName { get; private set; } = string.Empty;
+
         public string ApplicationID { get; private set; } = string.Empty;
         public string Identity { get; private set; } = string.Empty;
-
         public string IconPath { get; private set; } = string.Empty;
 
 
@@ -70,6 +71,7 @@ private void ReadAppxManifest(Package package)
                 {
                     XmlSerializer serializer = new XmlSerializer(typeof(AppxManifest));
                     AppxManifest appxManifest = (AppxManifest)serializer.Deserialize(reader);
+                    if (appxManifest.Applications==null)
                     Name = ((XmlNode[])appxManifest.Properties.DisplayName)[0].Value;
                     if (Name.Contains("ms-resource:"))
                     {
@@ -81,7 +83,8 @@ private void ReadAppxManifest(Package package)
                     if (Executable == null)
                         IsWebApp = true;
                     FamilyPackageName = package.Id.FamilyName;
-                    ApplicationID = appxManifest.Applications.Application.Id;
+                    FullPackageName = package.Id.FullName;
+                    ApplicationID = appxManifest.Applications?.Application.Id;
                     Identity = appxManifest.Identity.Name;
                     IconPath = GetIconPath(Path.Combine(InstallLocation, ((XmlNode[])(appxManifest.Properties.Logo))[0].Value));
                 }
diff --git a/Source/AutoHDR/UWP/UWPAppsManager.cs b/Source/AutoHDR/UWP/UWPAppsManager.cs
@@ -15,17 +15,42 @@ namespace AutoHDR.UWP
 {
     public static class UWPAppsManager
     {
+        static PackageManager manager = new PackageManager();
+
 
         private const string xboxPassAppFN = "Microsoft.GamingApp_8wekyb3d8bbwe";
 
 
+        public static UWPApp GetUWPApp(string packageNameOrFamilyPackageName, string applicationID = "")
+        {
+            var package = manager.FindPackageForUser(WindowsIdentity.GetCurrent().User.Value, packageNameOrFamilyPackageName);
+            if (package == null)
+                return GetUWPAppCompatible(packageNameOrFamilyPackageName, applicationID);
+            return new UWPApp(package);
+        }
+
+        private static UWPApp GetUWPAppCompatible(string familyPackageName, string applicationID)
+        {
+            foreach (var package in manager.FindPackagesForUser(WindowsIdentity.GetCurrent().User.Value))
+            {
+                try
+                {
+                    UWPApp uwpApp = new UWPApp(package);
+                    if (uwpApp.FamilyPackageName.Equals(familyPackageName) && uwpApp.ApplicationID.Equals(applicationID))
+                        return uwpApp;
+                }
+                catch {}
+            }
+            return null;
+        }
+
+
         public static List<ApplicationItem> GetUWPApps()
         {
 
             Globals.Logs.Add($"Retrieving UWP apps...", false);
 
             List<ApplicationItem> uwpApps = new List<ApplicationItem>();
-            var manager = new PackageManager();
             IEnumerable<Package> packages = manager.FindPackagesForUser(WindowsIdentity.GetCurrent().User.Value);
             try
             {
@@ -51,8 +76,10 @@ public static List<ApplicationItem> GetUWPApps()
 
                     try
                     {
-                        uwpApps.Add(new ApplicationItem(new UWPApp(package)));
-                  }
+                        UWPApp uwpApp = new UWPApp(package);
+                        if (!string.IsNullOrEmpty(uwpApp.ApplicationID))
+                            uwpApps.Add(new ApplicationItem(uwpApp));
+                    }
                     catch
                     {
                         continue;
