Merge branch 'master' of https://github.com/tjackenpacken/taskbar-groups

Author: tjackenpacken

main/Classes/handleWindowsApp.cs

@@ -4,22 +4,22 @@
 using System.Linq;
 using System.Xml;
 using System.Collections.Generic;
-using System.Management.Automation;
-using System.Collections.ObjectModel;
+using Windows.Management.Deployment;
 
 namespace client.Classes
 {
     class handleWindowsApp
     {
         public static Dictionary<string, string> fileDirectoryCache = new Dictionary<string, string>();
 
+        private static PackageManager pkgManger = new PackageManager();
         public static Image getWindowsAppIcon(String file, bool alreadyAppID = false)
         {
             // Get the app's ID from its shortcut target file (Ex. 4DF9E0F8.Netflix_mcm4njqhnhss8!Netflix.app)
             String microsoftAppName = (!alreadyAppID) ? GetLnkTarget(file) : file;
 
             // Split the string to get the app name from the beginning (Ex. 4DF9E0F8.Netflix)
-            String subAppName = microsoftAppName.Split('_')[0];
+            String subAppName = microsoftAppName.Split('!')[0];
 
             // Loop through each of the folders with the app name to find the one with the manifest + logos
             String appPath = findWindowsAppsFolder(subAppName);
@@ -33,14 +33,14 @@ public static Image getWindowsAppIcon(String file, bool alreadyAppID = false)
 
             String logoLocation = (appManifest.SelectSingleNode("/sm:Package/sm:Properties/sm:Logo", appManifestNamespace).InnerText).Replace("\\", @"\");
 
+
+
             if (logoLocation != null)
             {
                 // Get the last instance or usage of \ to cut out the path of the logo just to have the path leading to the general logo folder
                 logoLocation = logoLocation.Substring(0, logoLocation.LastIndexOf(@"\"));
                 String logoLocationFullPath = Path.GetFullPath(appPath + "\\" + logoLocation);
 
-                String logoPath = "";
-
                 // Search for all files with 150x150 in its name and use the first result
                 DirectoryInfo logoDirectory = new DirectoryInfo(logoLocationFullPath);
                 FileInfo[] filesInDir = getLogoFolder("StoreLogo", logoDirectory);
@@ -106,27 +106,12 @@ public static string findWindowsAppsFolder(string subAppName)
             {
                 try
                 {
+                    IEnumerable<Windows.ApplicationModel.Package> packages = pkgManger.FindPackagesForUser("", subAppName);
 
-                    using (PowerShell powerShell = PowerShell.Create())
-                    {
-                        powerShell.AddScript($"Get-AppxPackage -name {subAppName}");
-
-                        Collection<PSObject> PSOutput = powerShell.Invoke();
 
-
-                        if (PSOutput[0] != null)
-                        {
-                            String finalPath = Environment.ExpandEnvironmentVariables("%ProgramW6432%") + $@"\WindowsApps\" + PSOutput[0] + @"\";
-                            fileDirectoryCache[subAppName] = finalPath;
-                            return finalPath;
-                        }
-                    }
-
-                    /*
-                    foreach (string folder in Directory.GetDirectories(Environment.ExpandEnvironmentVariables("%ProgramW6432%") + $@"\WindowsApps\"))
-                    {
-                        appDirecList.Add(folder);
-                    }*/
+                    String finalPath = Environment.ExpandEnvironmentVariables("%ProgramW6432%") + $@"\WindowsApps\" + packages.First().InstalledLocation.DisplayName + @"\";
+                    fileDirectoryCache[subAppName] = finalPath;
+                    return finalPath;
                 }
                 catch (UnauthorizedAccessException) { };
                 return "";
@@ -139,7 +124,7 @@ public static string findWindowsAppsFolder(string subAppName)
 
         public static string findWindowsAppsName(string AppName)
         {
-            String subAppName = AppName.Split('_')[0];
+            String subAppName = AppName.Split('!')[0];
             String appPath = findWindowsAppsFolder(subAppName);
 
 

main/Forms/frmClient.Designer.cs

@@ -1,25 +1,28 @@
 using client.Classes;
 using client.User_controls;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Windows.Data.Json;
+using System.Net.Http;
 
 namespace client.Forms
 {
     public partial class frmClient : Form
     {
+        private static readonly HttpClient client = new HttpClient();
         public frmClient()
         {
             System.Runtime.ProfileOptimization.StartProfile("frmClient.Profile");
             InitializeComponent();
             this.MaximumSize = new Size(Screen.PrimaryScreen.WorkingArea.Width, Screen.PrimaryScreen.WorkingArea.Height);
             Reload();
+
+            currentVersion.Text = "v" + System.Reflection.Assembly.GetEntryAssembly().GetName().Version.ToString();
+
+            githubVersion.Text = Task.Run(() => getVersionData()).Result;
         }
         public void Reload()
         {
@@ -96,5 +99,26 @@ public void LeaveControl(object sender, EventArgs e, Control control)
             control.BackColor = Color.FromArgb(3, 3, 3);
         }
 
+        private static async Task<String> getVersionData()
+        {
+            try
+            {
+                HttpClient client = new HttpClient();
+                client.DefaultRequestHeaders.Add("User-Agent", "taskbar-groups");
+                var res = await client.GetAsync("https://api.github.com/repos/tjackenpacken/taskbar-groups/releases");
+                res.EnsureSuccessStatusCode();
+                string responseBody = await res.Content.ReadAsStringAsync();
+
+                JsonArray responseJSON = JsonArray.Parse(responseBody);
+                JsonObject jsonObjectData = responseJSON[0].GetObject();
+
+                return jsonObjectData["tag_name"].GetString();
+            } catch {return "Not found";}
+        }
+
+        private void githubLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://github.com/tjackenpacken/taskbar-groups/releases");
+        }
     }
 }