fix: Windows Integration progress bar

Author: justdevw

bin/index.js

@@ -286,6 +286,13 @@ const instance = windows ? new JSSC() : {
     compressLargeToBase64, compressToBase64, decompressFromBase64
 };
 
+function getInpName(inp) {
+    let inpPath = path.parse(inp);
+	let inpName = inpPath.name + inpPath.ext;
+	if (inpName.length > 27) inpName = inpName.slice(0, 24) + '...';
+    return inpName;
+}
+
 (async (inp, out, cfg) => {
     const inpF = await collectFiles(inp);
     const isFile = !str ? inpF != null : !str;
@@ -387,11 +394,15 @@ const instance = windows ? new JSSC() : {
 
         let total = 0;
         let all = 0;
+        let last = 0;
         if (windows) {
-            WinUIWait = winUIWait('Compressing "' + path.parse(inp).name + '"...');
+            WinUIWait = winUIWait('Compressing "' + getInpName(inp) + '"...');
             instance.events.onCompressProgress = (percentage) => {
-                WinUIWait.stdin.write(((total + percentage / 100) / all) * 100 + "\n");
+                const p = Math.max(Math.floor(((total + percentage / 100) / all) * 100), last);
+                last = p;
+                if (WinUIWait) WinUIWait.stdin.write(p + "\n");
             };
+            setInterval(()=>{if(WinUIWait){WinUIWait.stdin.write(last + "\n")}}, 50); /* ping ui to avoid ui lag */
         }
 
         config.stringify = undefined;
@@ -470,7 +481,7 @@ const instance = windows ? new JSSC() : {
             exit(1, e);
         }
         if (windows) {
-            WinUIWait = winUIWait('Decompressing "' + path.parse(inp).name + '"...');
+            WinUIWait = winUIWait('Decompressing "' + getInpName(inp) + '"...');
         }
 
         const raw = isFile ? fs.readFileSync(input[0]) : input[0];

bin/windows/ui/wait.ps1

@@ -6,48 +6,88 @@ param (
 
 Add-Type -AssemblyName System.Windows.Forms
 Add-Type -AssemblyName System.Drawing
+Add-Type -AssemblyName PresentationFramework
+Add-Type -AssemblyName WindowsFormsIntegration
 
 [Windows.Forms.Application]::EnableVisualStyles()
 
 $form = New-Object Windows.Forms.Form
 $form.Text = $Name
-$form.Size = New-Object Drawing.Size(400, 120)
+$form.Size = New-Object Drawing.Size(400, 100)
 $form.StartPosition = "CenterScreen"
 $form.FormBorderStyle = "FixedDialog"
 $form.MaximizeBox = $false
 $form.MinimizeBox = $false
 $form.ControlBox = $false
 $form.TopMost = $true
 
+$Icon = Join-Path $PSScriptRoot "..\..\..\..\jssc.ico"
+$Icon = [System.IO.Path]::GetFullPath($Icon)
+Add-Type -Path "$PSScriptRoot\process.cs"
+if (Test-Path $Icon) {
+    [Taskbar]::SetCurrentProcessExplicitAppUserModelID("JSSC.Compress") | Out-Null
+    $form.Icon = New-Object System.Drawing.Icon($Icon)
+}
+
 $label = New-Object Windows.Forms.Label
 $label.Text = "$Text ($Progress%)"
-$label.Location = New-Object Drawing.Point(20, 15)
+$label.Location = New-Object Drawing.Point(20, 5)
 $label.AutoSize = $true
 $label.Font = New-Object System.Drawing.Font('Microsoft JhengHei',10)
 
-$progressBar = New-Object Windows.Forms.ProgressBar
-$progressBar.Location = New-Object Drawing.Point(20, 50)
-$progressBar.Size = New-Object Drawing.Size(340, 20)
-$progressBar.Minimum = 0
-$progressBar.Maximum = 100
-$progressBar.Value = $Progress
+$wpfProgress = New-Object System.Windows.Controls.ProgressBar
+$wpfProgress.Minimum = 0
+$wpfProgress.Maximum = 100
+$wpfProgress.Value = $Progress
+$wpfProgress.Height = 20
+$wpfProgress.Width = 340
+$wpfProgress.Margin = '0'
+$wpfProgress.Resources["ProgressBarCornerRadius"] = 10
+$wpfProgress.IsIndeterminate = $true
+$wpfProgress.Foreground = [System.Windows.Media.SolidColorBrush]::new(
+    [System.Windows.Media.Color]::FromArgb(150, 81, 90, 218)
+)
+$wpfProgress.Background = [System.Windows.Media.SolidColorBrush]::new(
+    [System.Windows.Media.Color]::FromArgb(150, 239, 213, 255)
+)
 
 $form.Controls.Add($label)
-$form.Controls.Add($progressBar)
+
+$elhost = New-Object System.Windows.Forms.Integration.ElementHost
+$elhost.Location = New-Object Drawing.Point(20, 30)
+$elhost.Size = New-Object Drawing.Size(340, 20)
+$elhost.Child = $wpfProgress
+$elhost.BackColor = [System.Drawing.Color]::Transparent
+
+$form.Controls.Add($elhost)
 
 $timer = New-Object Windows.Forms.Timer
 $timer.Interval = 100
 
-$timer.Add_Tick({
-    while ([Console]::In.Peek() -ne -1) {
-        $line = [Console]::In.ReadLine()
-        if ($line -ne $null) {
-            $value = [int]$line
-            if ($value -ge 0 -and $value -le 100) {
-                $progressBar.Value = $value
-                $label.Text = "$Text ($value%)"
-            }
+$idleTicks = 0
+function Idle {
+    $idleTicks++
+    $timeout = New-Object Windows.Forms.Timer
+    $timeout.Interval = 3000
+    $timeout.Add_Tick({
+        if ($idleTicks -ge 0) {
+            $wpfProgress.IsIndeterminate = $true
+        } else {
+            $timeout.Stop()
         }
+    })
+    $timeout.Start()
+}
+
+$timer.Add_Tick({
+    Idle
+    $line = [Console]::In.ReadLine()
+    $newValue = [int]$line
+    if ($newValue -ne $wpfProgress.Value) {
+        $idleTicks = 0
+        $wpfProgress.Value = $newValue
+        $wpfProgress.IsIndeterminate = $false
+        $label.Text = "$Text ($newValue%)"
     }
 })
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "strc",
-  "version": "2.1.1-f",
+  "version": "2.1.1-g",
   "description": "JavaScript String Compressor - lossless string compression algorithm",
   "main": "dist/jssc.cjs",
   "repository": {