Merge pull request #17 from Shikakiben/test

Test

Author: Shikakiben

README.md

@@ -1,52 +1,59 @@
-<p align="center">
-  <img src="https://github.com/Shikakiben/AM-GUI/blob/main/AM-GUI.png?raw=true" width="128" /> 
-</p>
-
-
-
-# AM-GUI
-
+<div align="center">
+  <img src="https://github.com/Shikakiben/AM-GUI/blob/main/AM-GUI.png?raw=true" width="60">
+  <h1 align="center">AM-GUI</h1>
+  <p align="center">A simple graphical frontend to easily install, update, and manage AppImage and other portable formats on Linux, powered by <a href="https://github.com/ivan-hc/AM">AM</a>.</p>
+  
 [![GitHub Downloads](https://img.shields.io/github/downloads/Shikakiben/AM-GUI/total?logo=github&label=GitHub%20Downloads)](https://github.com/Shikakiben/AM-GUI/releases/latest)
 [![CI Build Status](https://github.com//Shikakiben/AM-GUI/actions/workflows/appimage.yml/badge.svg)](https://github.com/Shikakiben/AM-GUI/releases/latest)
 
+<br>
+  
+  <img src="screenshots/light.png" width="800"/>
 
+</div>
+<br>
+<br>
+<br>
 
-* [Latest Stable Release](https://github.com/Shikakiben/AM-GUI/releases/latest)  AppImage , Beta , it will be helpfull to reporte  issues , Alpine linux need more testing 
-
+  
+* [Latest Stable Release](https://github.com/Shikakiben/AM-GUI/releases/latest)  AppImage, Beta,it will be helpful to report issues. Alpine Linux needs more testing.
+<br>
+<br>
+  
 
 
 ---
 
-**AM-GUI** is an Electron-based application that serves as a graphical Front for [AM](https://github.com/ivan-hc/AM). “AM”/“AppMan” is a set of scripts and modules for installing, updating, and managing AppImage packages and other portable formats on Linux.
+
 
 ⚠️ **This project is under development and some features may not work or may be incomplete.**
 
-   **ALL credit goes to [Ivan](https://github.com/ivan-hc) for his amazing work! I only handel the GUI, learning how to proprely yell at gpt-4.1, to make sur that this little f$@¤=# does not mess that much with the code.**
+  **ALL credit goes to [Ivan](https://github.com/ivan-hc) for his amazing work! I only handle the GUI, learning how to properly yell at gpt-4.1, to make sure that this little f$@¤=# does not mess that much with the code.**
 
 ---
 
 
-## developemen installation
+## Development installation
 
-- requirement:
+- Requirements:
 
   [Node.js](https://nodejs.org/) (>=20, 22 recommended)
 
-if you d'ont have it on your package manager see: https://nodejs.org/fr/download
+If you don't have it in your package manager, see: https://nodejs.org/fr/download
 
-  you may need to install the following build tools 
+&nbsp;you may need to install the following build tools:
 
- *Debian/Ubuntu*:
+*Debian/Ubuntu*:
    ```bash
    sudo apt install build-essential python3 make gcc g++
    ```
- *Fedora*:
+*Fedora*:
    ```bash
    sudo dnf install @development-tools python3
    ```
 
 
-- Clone repository and install:
+- Clone the repository and install:
 
 ```bash
 git clone https://github.com/Shikakiben/AM-GUI.git

index.html

@@ -167,8 +167,8 @@ <h2 class="panel-heading-sm centered" data-i18n="advanced.title">Mode avancé</h
         <span class="cmd-desc" data-i18n="advanced.cmd.remove">supprimer une app</span>
       </li>
       <li class="cmd-row">
-        <button type="button" class="copy-cmd" data-copy="am -e &lt;git-url&gt; &lt;appname&gt; [keyword]">am -e &lt;git-url&gt; &lt;appname&gt; [keyword]</button>
-        <button type="button" class="copy-cmd" data-copy="appman -e &lt;git-url&gt; &lt;appname&gt; [keyword]">appman -e &lt;git-url&gt; &lt;appname&gt; [keyword]</button>
+        <button type="button" class="copy-cmd" data-copy="am -e &lt;git-url&gt; &lt;appname&gt;">am -e &lt;git-url&gt; &lt;appname&gt;</button>
+        <button type="button" class="copy-cmd" data-copy="appman -e &lt;git-url&gt; &lt;appname&gt;">appman -e &lt;git-url&gt; &lt;appname&gt;</button>
         <span class="cmd-desc" data-i18n="advanced.cmd.extra">installer une app personnalisée depuis GitHub</span>
       </li>
       <li class="cmd-row">

screenshots/dark.png

@@ -1496,6 +1496,7 @@ let updatesTerminalFallbackMode = false;
 let updatesTerminalExpanded = false;
 let updateSpinnerBusy = false;
 let activeUpdateStreamId = null;
+let updatesStreamBuffer = ''; // Buffer pour accumuler la sortie du streaming
 const updateStreamWaiters = new Map();
 const updatesPanel = document.getElementById('updatesPanel');
 const advancedPanel = document.getElementById('advancedPanel');
@@ -2911,21 +2912,26 @@ window.electronAPI?.onUpdatesProgress?.((msg) => {
   switch (msg.kind) {
     case 'start':
       activeUpdateStreamId = msg.id;
+      updatesStreamBuffer = ''; // Reset le buffer au début
       revealUpdatesTerminal();
       resetUpdatesTerminal();
       appendUpdatesTerminalChunk(`\x1b[36m${t('updates.logHeader') || 'am -u'}\x1b[0m\r\n`);
       break;
     case 'data':
-      appendUpdatesTerminalChunk(typeof msg.chunk === 'string' ? msg.chunk : '');
+      if (typeof msg.chunk === 'string') {
+        updatesStreamBuffer += msg.chunk; // Accumule la sortie
+        appendUpdatesTerminalChunk(msg.chunk);
+      }
       break;
     case 'done':
       appendUpdatesTerminalChunk(`\r\n\x1b[32m${t('updates.logCompleted') || 'Terminé'} (code ${typeof msg.code === 'number' ? msg.code : 0})\x1b[0m\r\n`);
-      resolveUpdateWaiter(msg, false);
+      // Passe la sortie accumulée dans le message résolu
+      resolveUpdateWaiter({ ...msg, output: updatesStreamBuffer }, false);
       activeUpdateStreamId = null;
       break;
     case 'error':
       appendUpdatesTerminalChunk(`\r\n\x1b[31m${msg.message || (t('updates.error') || 'Erreur')}\x1b[0m\r\n`);
-      resolveUpdateWaiter(msg, true);
+      resolveUpdateWaiter({ ...msg, output: updatesStreamBuffer }, true);
       activeUpdateStreamId = null;
       break;
   }
@@ -2971,17 +2977,35 @@ function parseUpdatedApps(res){
 
 function handleUpdateCompletion(fullText){
   const sanitized = stripAnsiSequences(fullText || '');
+  // Map pour stocker les nouvelles versions extraites du log
+  const newVersions = new Map();
   // Chercher la section "The following apps have been updated:" dans le log
   let filteredUpdated = null;
   const match = sanitized && sanitized.match(/The following apps have been updated:[^\n]*\n([\s\S]*?)\n[-=]{5,}/i);
   if (match) {
-    // Extraire les noms d'apps de cette section
+    // Extraire les noms d'apps et leurs nouvelles versions de cette section
     filteredUpdated = new Set();
     const lines = match[1].split(/\r?\n/).map(l=>l.trim()).filter(Boolean);
     for (const line of lines) {
       // ligne du type: ◆ citron-nightly 8f38c83a2
-      const m = line.match(/^◆\s*([A-Za-z0-9._-]+)/);
-      if (m) filteredUpdated.add(m[1].toLowerCase());
+      const m = line.match(/^◆\s*([A-Za-z0-9._-]+)\s+(.+)?/);
+      if (m) {
+        const appName = m[1].toLowerCase();
+        filteredUpdated.add(appName);
+        if (m[2]) newVersions.set(appName, m[2].trim());
+      }
+    }
+  }
+  // Parser aussi les lignes du type: appname (oldversion -> newversion)
+  const lines = sanitized.split(/\r?\n/);
+  for (const raw of lines) {
+    const line = raw.trim();
+    // Format: appname (1.0 -> 2.0) ou appname (old -> new)
+    const arrowMatch = line.match(/^([A-Za-z0-9._-]+)\s*\([^)]*->\s*([^)]+)\)/);
+    if (arrowMatch) {
+      const appName = arrowMatch[1].toLowerCase();
+      const newVer = arrowMatch[2].trim();
+      if (newVer && !newVersions.has(appName)) newVersions.set(appName, newVer);
     }
   }
   const updated = parseUpdatedApps(sanitized);
@@ -3001,10 +3025,11 @@ function handleUpdateCompletion(fullText){
       toShow.forEach(nameLower => {
         const wrapper = document.createElement('div'); wrapper.className = 'updated-item';
         const img = document.createElement('img');
-        // nameLower comes from parsed output (lowercased). Try to find matching app object for proper casing and version
+        // nameLower comes from parsed output (lowercased). Try to find matching app object for proper casing
         const appObj = state.allApps.find(a => String(a.name).toLowerCase() === String(nameLower).toLowerCase());
         const displayName = appObj ? (appObj.name) : nameLower;
-        const displayVersion = appObj && appObj.version ? appObj.version : null;
+        // Utiliser la nouvelle version extraite du log, sinon fallback sur l'ancienne
+        const displayVersion = newVersions.get(nameLower) || (appObj && appObj.version ? appObj.version : null);
         img.src = getIconUrl(displayName);
         img.alt = displayName;
         img.onerror = () => { img.src = 'https://raw.githubusercontent.com/Portable-Linux-Apps/Portable-Linux-Apps.github.io/main/icons/blank.png'; };