Revert "feat: Added UWP Discovery, Created Custom App from existing one, and Launch it from Context Menu (#373)"

This reverts commit a44d6dc.

Undoing UWP commit containing broken code.

Author: waffles-dev

guest_server/scripts/apps.ps1

@@ -131,112 +131,83 @@ function Get-ApplicationName {
     return $appName
 }
 
-function Get-PrettifyName {
-    param (
-        [string]$Name
-    )
-
-    if ($Name -match '\.([^\.]+)$') {
-        $ProductName = $Matches[1]
-    } else {
-        # If no period is found, use the whole name.
-        $ProductName = $Name
-    }
-    
-    $PrettyName = ($ProductName -creplace  '([A-Z\W_]|\d+)(?<![a-z])',' $&').trim()
-
-    return $PrettyName
-}
-
 # Gets the display name for a UWP app.
 function Get-UWPApplicationName {
     param (
+        [string]$exePath, # The resolved executable path
         $app # The AppxPackage object
     )
+
     # UWP properties are usually the best source
-    if ($app.DisplayName) { 
-        return $app.DisplayName.Trim()
-        #Write-Host($app)
+    if ($app.DisplayName) { return $app.DisplayName.Trim() }
+    if ($app.Name) { return $app.Name.Trim() } # Often the package name, less ideal but a fallback
+
+    # If UWP properties fail, try standard name extraction on the EXE
+    if (Test-Path $exePath -PathType Leaf) {
+        return Get-ApplicationName -targetPath $exePath
     }
-    if ($app.Name) { 
-        return Get-PrettifyName -Name $app.Name
-    } # Often the package name, less ideal but a fallback
 
     return $null # Failed to get a name
 }
 
-function Get-ParseUWP {
+# Parses the AppxManifest.xml to find the primary executable path for a UWP app.
+function Get-UWPExecutablePath {
     param ([string]$instLoc) # InstallLocation from Get-AppxPackage
 
     $manifestPath = Join-Path -Path $instLoc -ChildPath "AppxManifest.xml"
     if (-not (Test-Path $manifestPath -PathType Leaf)) {
         return $null # Manifest doesn't exist or isn't a file
     }
 
-    $xmlContent = Get-Content $manifestPath -Raw -Encoding Default -ErrorAction Stop
-    
-    $appId = "App" # Default, as it works for most packages.
-    if ($xmlContent -match '<Application[^>]*Id\s*=\s*"([^"]+)"') {
-        $appId = $Matches[1]
-    }
-
-    $logoMatch = [regex]::Match($xmlContent, '<Properties.*?>.*?<Logo>(.*?)</Logo>.*?</Properties>', [System.Text.RegularExpressions.RegexOptions]::Singleline)
-    if ($logoMatch.Success) {
-        $logo = $logoMatch.Groups[1].Value
-    }
+    try {
+        # Read manifest content, default encoding often works
+        $xmlContent = Get-Content $manifestPath -Raw -Encoding Default -ErrorAction Stop
+
+        # Remove known namespace prefixes and xmlns attributes to simplify XML parsing
+        $prefixesToRemove = 'uap10', 'uap', 'desktop', 'rescap', 'com' # Common prefixes
+        $cleanedXml = $xmlContent
+        foreach ($prefix in $prefixesToRemove) {
+            # Regex to remove 'prefix:' from start/end tags and self-closing tags
+            $cleanedXml = $cleanedXml -replace "(</?)$prefix`:", '$1' `
+                                     -replace "<$prefix`:([^>\s]+?)\s*/>", "<$1 />"
+        }
+        # Remove the xmlns declarations themselves
+        $cleanedXml = $cleanedXml -replace 'xmlns(:\w+)?="[^"]+"', ''
 
-    return $logo, $appId
-}
+        # Attempt to parse the cleaned XML
+        [xml]$manifest = $cleanedXml
 
-function Get-UWPBase64Logo {
-    param([string]$logo, [string]$instLoc)
+        # Find the first <Application> node
+        $appNode = $manifest.Package.Applications.Application | Select-Object -First 1
+        if (-not $appNode) { return $null } # No application defined
 
-    $logoPath = Join-Path -Path $instLoc -ChildPath $logo
+        # Get the 'Executable' attribute value
+        $exeRelPath = $appNode.Executable
+        if (-not $exeRelPath) { return $null } # No executable attribute
 
-    if (-not (Test-Path $logoPath)) {
-        # if base file not exist, attempt to find scaled version.
-        $scaledVersions = @("scale-100", "scale-200", "scale-400")
-        foreach ($scale in $scaledVersions) {
-            $scaledLogoPath = $logoPath -replace '\.png$', ".$scale.png"
-            if (Test-Path $scaledLogoPath) {
-                $logoPath = $scaledLogoPath
-                break
+        # Handle special $targetnametoken$.exe case by finding the first EXE in the root
+        if ($exeRelPath -like '*$targetnametoken$.exe*') {
+            $candidateExe = Get-ChildItem -Path $instLoc -Filter *.exe -File -ErrorAction SilentlyContinue | Select-Object -First 1
+            if ($candidateExe -and (Test-Path $candidateExe.FullName -PathType Leaf)) {
+                return $candidateExe.FullName
+            }
+        } else {
+            # Handle regular relative path
+            $fullPath = Join-Path -Path $instLoc -ChildPath $exeRelPath
+            if (Test-Path $fullPath -PathType Leaf) {
+                return $fullPath
             }
         }
-
-        # null if no valid file found.
-        if (-not (Test-Path $logoPath)) {
-            return $null
-        }
-    }
-
-    try {
-        $image = [System.Drawing.Image]::FromFile($logoPath)
-
-        # resize to 32x32
-        $resizedBmp = New-Object System.Drawing.Bitmap(32, 32)
-        $graphics = [System.Drawing.Graphics]::FromImage($resizedBmp)
-        $graphics.InterpolationMode = [System.Drawing.Drawing2D.InterpolationMode]::HighQualityBicubic
-        $graphics.DrawImage($image, 0, 0, 32, 32)
-
-        # Save as PNG to memory stream
-        $stream = New-Object System.IO.MemoryStream
-        $resizedBmp.Save($stream, [System.Drawing.Imaging.ImageFormat]::Png)
-
-        $base64 = [Convert]::ToBase64String($stream.ToArray())
-
-        # Clean up
-        $stream.Dispose()
-        $graphics.Dispose()
-        $resizedBmp.Dispose()
-        $image.Dispose()
-
-        return $base64
     } catch {
+        # Ignore any parsing errors and return null
         return $null
     }
+
+    # Default return if no valid path found
+    return $null
 }
 
+
 # --- Main Application Logic ---
 
 # Use efficient List and HashSet for collection and deduplication
@@ -249,45 +220,14 @@ function Add-AppToListIfValid {
     param(
         [string]$Name,
         [string]$InputPath, # The path discovered (can be relative or contain variables)
-        [string]$Source,     # Source type (e.g., 'system', 'winreg', 'startmenu')
-
-        [string]$logoBase64,  # Optional base64 logo, mainly for UWP logo discover system
-        [string]$launchArg # optional arg
+        [string]$Source     # Source type (e.g., 'system', 'winreg', 'startmenu')
     )
 
     $resolved = $null
     $fullPath = $null
     $normalizedPathKey = $null
 
-    # Step 1, handle UWP app.
-    if ($Source -eq "uwp") {
-        if (-not $launchArg) {
-            return # launching UWP app requires Arg
-        }
-        
-        $normalizedPathKey = $InputPath.ToLowerInvariant() + $launchArg.ToLowerInvariant()
-        if ($addedPaths.Contains($normalizedPathKey)) {
-            return # Already added this app
-        }
-
-        $icon = $null
-        if ($logoBase64) {
-            $icon = $logoBase64
-        }
-
-        # UWP object
-        $apps.Add([PSCustomObject]@{
-            Name   = $Name
-            Path   = $InputPath
-            Args   = $launchArg
-            Icon   = $icon
-            Source = 'uwp'
-        })
-        $addedPaths.Add($normalizedPathKey) | Out-Null
-        return
-    }
-
-    # 2. Resolve and Validate Path Other
+    # 1. Resolve and Validate Path
     try {
         $resolved = Resolve-Path -Path $InputPath -ErrorAction SilentlyContinue
     } catch { return } # Ignore if path resolution throws error
@@ -301,29 +241,28 @@ function Add-AppToListIfValid {
         return # Skip if path doesn't resolve to a valid file
     }
 
-    # 3. Validate Name (Basic Check)
+    # 2. Validate Name (Basic Check)
     if (-not $Name -or $Name.Trim().Length -eq 0 -or $Name -like 'Microsoft? Windows? Operating System*') {
         return # Skip if name is empty, invalid, or generic OS name
     }
 
-    # 4. Check for Duplicates using normalized path
+    # 3. Check for Duplicates using normalized path
     if ($addedPaths.Contains($normalizedPathKey)) {
         return # Skip if this exact executable path has already been added
     }
 
-    # 5. Get Icon
+    # 4. Get Icon
     $icon = Get-ApplicationIcon -targetPath $fullPath
 
-    # 6. Add the Application Object (matching WinApp type)
+    # 5. Add the Application Object (matching WinApp type)
     $apps.Add([PSCustomObject]@{
         Name   = $Name
         Path   = $fullPath # Use the resolved, non-normalized path for output
-        Args    = ""
         Icon   = $icon
         Source = $Source
     })
 
-    # 7. Mark Path as Added
+    # 6. Mark Path as Added
     $addedPaths.Add($normalizedPathKey) | Out-Null
 }
 
@@ -513,9 +452,9 @@ if ($lnkFiles) {
 
 
 # 4. UWP Apps
-if (Get-Command Get-AppxPackage -AllUsers -ErrorAction SilentlyContinue) {
+if (Get-Command Get-AppxPackage -ErrorAction SilentlyContinue) {
     try {
-        Get-AppxPackage -AllUsers -ErrorAction SilentlyContinue |
+        Get-AppxPackage -ErrorAction SilentlyContinue |
             Where-Object {
                 $_.IsFramework -eq $false -and
                 $_.IsResourcePackage -eq $false -and
@@ -524,18 +463,14 @@ if (Get-Command Get-AppxPackage -AllUsers -ErrorAction SilentlyContinue) {
             } |
             ForEach-Object {
                 $app = $_
-                $pathValue = "explorer.exe"
-
-                # Attempt to find logo and executable using Appxmanifest.xml
-                $logo, $appId = Get-ParseUWP -instLoc $app.InstallLocation
-                $launchArgs = "shell:AppsFolder\" + $app.PackageFamilyName + '!' + $appId
+                # Attempt to find the executable path using the manifest
+                $exePath = Get-UWPExecutablePath -instLoc $app.InstallLocation
 
-                if ($appId) { # check if we have appId
+                if ($exePath) { # Function already validates path is a file
                     # Get the best display name (UWP properties preferred)
                     $name = Get-UWPApplicationName -exePath $exePath -app $app
                     if ($name) {
-                        $base64 = Get-UWPBase64Logo -logo $logo -instLoc $app.InstallLocation
-                        Add-AppToListIfValid -Name $name -InputPath $pathValue -Source "uwp" -logoBase64 $base64 -launchArg $launchArgs
+                        Add-AppToListIfValid -Name $name -InputPath $exePath -Source "uwp"
                     }
                 }
             }
@@ -632,7 +567,4 @@ if ($scoopDir) {
 
 # Convert the final list of application objects to a compressed JSON string.
 # This is the only output sent to the standard output stream.
-
-$apps | ConvertTo-Json -Depth 5 -Compress
-
-
+$apps | ConvertTo-Json -Depth 5 -Compress

src/renderer/components/WBContextMenu.vue

@@ -5,7 +5,7 @@
 -->
 <template>
     <!-- Invisible trigger area that covers the parent element -->
-    <!-- div v-if="hasTrigger" ref="triggerRef" class="wb-contextmenu-trigger" @contextmenu.prevent="showMenu"></div> -->
+    <div v-if="hasTrigger" ref="triggerRef" class="wb-contextmenu-trigger" @contextmenu.prevent="showMenu"></div>
 
     <!-- Context menu popup -->
     <teleport to="body">
@@ -65,15 +65,13 @@ const showMenu = (event: MouseEvent) => {
     emit("show");
 
     // Close on next tick to allow menu to render
-    adjustPosition();
-    document.addEventListener("click", hideMenu);
-    document.addEventListener("contextmenu", hideMenu);
-    window.addEventListener("scroll", hideMenu);
-    window.addEventListener("resize", hideMenu);
-    
     nextTick(() => {
         adjustPosition();
-    })
+        document.addEventListener("click", hideMenu);
+        document.addEventListener("contextmenu", hideMenu);
+        window.addEventListener("scroll", hideMenu);
+        window.addEventListener("resize", hideMenu);
+    });
 };
 
 const handleMenuClick = (event: MouseEvent) => {