fix: auto-install AppImage dans ~/.local/bin au premier lancement Linux

Au démarrage, si l'AppImage ne tourne pas depuis ~/.local/bin/farm-tracker.AppImage,
elle s'y copie automatiquement — plus besoin d'installation manuelle.
Les mises à jour suivantes y atterrissent toujours (fix update Linux).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

install-desktop-entry.sh

@@ -1,37 +1,46 @@
 #!/usr/bin/env bash
-# Installe (ou met à jour) l'entrée de menu "Farm Tracker" pointant vers l'AppImage déjà construit.
+# Installation initiale de Farm Tracker (AppImage + entrée de menu).
-set -e
+# À lancer une seule fois. Les mises à jour suivantes sont automatiques.
+set -euo pipefail
 
-APPDIR="/home/shamiiow/GitHub/farm-tracker-app/dist"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-APPIMAGE=$(ls "$APPDIR"/*.AppImage 2>/dev/null | head -n1)
+DIST_DIR="$SCRIPT_DIR/dist"
 
-if [ -z "$APPIMAGE" ]; then
+# Trouve l'AppImage dans dist/
-  echo "Aucun fichier .AppImage trouvé dans : $APPDIR"
+APPIMAGE_SRC=$(ls "$DIST_DIR"/*.AppImage 2>/dev/null | head -n1)
-  echo "Lance d'abord (depuis le dossier du projet) : npm run dist"
+if [ -z "$APPIMAGE_SRC" ]; then
+  echo "Aucun .AppImage trouvé dans dist/. Lance d'abord : npm run dist"
   exit 1
 fi
 
-chmod +x "$APPIMAGE"
+# Chemin stable — indépendant de la version
+INSTALL_DIR="$HOME/.local/bin"
+STABLE_PATH="$INSTALL_DIR/farm-tracker.AppImage"
 
+mkdir -p "$INSTALL_DIR"
+cp "$APPIMAGE_SRC" "$STABLE_PATH"
+chmod +x "$STABLE_PATH"
+
+# Entrée de menu
 DESKTOP_DIR="$HOME/.local/share/applications"
 mkdir -p "$DESKTOP_DIR"
-DESKTOP_FILE="$DESKTOP_DIR/farm-tracker.desktop"
 
-cat > "$DESKTOP_FILE" << INNEREOF
+cat > "$DESKTOP_DIR/farm-tracker.desktop" << EOF
 [Desktop Entry]
 Type=Application
 Name=Farm Tracker
 Comment=Suivi de loot Minecraft en direct
-Exec="$APPIMAGE" %U
+Exec="$STABLE_PATH" %U
 Icon=applications-games
 Terminal=false
 Categories=Game;Utility;
 StartupWMClass=farm-tracker
-INNEREOF
+EOF
 
-chmod +x "$DESKTOP_FILE"
+chmod +x "$DESKTOP_DIR/farm-tracker.desktop"
 update-desktop-database "$DESKTOP_DIR" >/dev/null 2>&1 || true
 
-echo "Entrée installée : $DESKTOP_FILE"
+echo "Installé dans  : $STABLE_PATH"
-echo "AppImage détecté : $APPIMAGE"
+echo "Entrée de menu : $DESKTOP_DIR/farm-tracker.desktop"
-echo "Cherche \"Farm Tracker\" dans ton menu d'applications (déconnexion/reconnexion parfois nécessaire selon le bureau)."
+echo ""
+echo "Les prochaines mises à jour s'installeront automatiquement sans rien retoucher."

main.js

@@ -103,6 +103,85 @@ function resolveAssetUrl(release) {
   return asset ? asset.browser_download_url : null;
 }
 
+function sendUpdateProgress(percent, status, error) {
+  if (mainWindow && !mainWindow.isDestroyed())
+    mainWindow.webContents.send('update-progress', { percent, status, error });
+}
+
+function downloadFileWithProgress(url, destPath, onProgress) {
+  return new Promise((resolve, reject) => {
+    const follow = (currentUrl, redirects) => {
+      if (redirects > 5) return reject(new Error('Trop de redirections'));
+      const mod = currentUrl.startsWith('https') ? require('https') : require('http');
+      const req = mod.get(currentUrl, { timeout: 120000, headers: { 'User-Agent': 'farm-tracker-updater' } }, (res) => {
+        if ([301, 302, 307, 308].includes(res.statusCode))
+          return follow(res.headers.location, redirects + 1);
+        if (res.statusCode !== 200)
+          return reject(new Error(`HTTP ${res.statusCode}`));
+        const total = parseInt(res.headers['content-length'] || '0', 10);
+        let downloaded = 0;
+        const file = fs.createWriteStream(destPath);
+        res.on('data', chunk => {
+          downloaded += chunk.length;
+          file.write(chunk);
+          if (total > 0 && onProgress) onProgress(Math.round(downloaded / total * 100));
+        });
+        res.on('end', () => file.close(() => resolve(destPath)));
+        res.on('error', err => { file.close(); try { fs.unlinkSync(destPath); } catch (_) {} reject(err); });
+      });
+      req.on('error', reject);
+      req.on('timeout', () => { req.destroy(); reject(new Error('Timeout')); });
+    };
+    follow(url, 0);
+  });
+}
+
+async function downloadAndInstall(downloadUrl, version) {
+  if (!app.isPackaged) {
+    dialog.showMessageBox(mainWindow, {
+      type: 'info', title: 'Mode développement',
+      message: 'Auto-install non disponible en mode dev.',
+      buttons: ['OK']
+    });
+    return;
+  }
+  const ext = process.platform === 'win32' ? '.exe' : '.AppImage';
+  const tmpPath = path.join(app.getPath('temp'), `farm-tracker-${version}${ext}`);
+  try {
+    sendUpdateProgress(0, 'downloading');
+    await downloadFileWithProgress(downloadUrl, tmpPath, pct => sendUpdateProgress(pct, 'downloading'));
+    sendUpdateProgress(100, 'installing');
+    if (process.platform === 'linux') {
+      fs.chmodSync(tmpPath, 0o755);
+      const stablePath = path.join(require('os').homedir(), '.local', 'bin', 'farm-tracker.AppImage');
+      try {
+        fs.mkdirSync(path.dirname(stablePath), { recursive: true });
+        fs.copyFileSync(tmpPath, stablePath);
+        fs.chmodSync(stablePath, 0o755);
+        fs.unlinkSync(tmpPath);
+        app.relaunch({ execPath: stablePath });
+      } catch (_) {
+        // fallback: remplace l'AppImage courant si la copie vers bin/ échoue
+        const fallback = process.env.APPIMAGE;
+        if (fallback) {
+          fs.copyFileSync(tmpPath, fallback);
+          fs.unlinkSync(tmpPath);
+          app.relaunch({ execPath: fallback });
+        } else {
+          app.relaunch({ execPath: tmpPath });
+        }
+      }
+      app.exit(0);
+    } else if (process.platform === 'win32') {
+      const { spawn } = require('child_process');
+      spawn(tmpPath, ['/S'], { detached: true, stdio: 'ignore' }).unref();
+      app.quit();
+    }
+  } catch (e) {
+    sendUpdateProgress(0, 'error', e.message);
+  }
+}
+
 async function showUpdateDialog(version, downloadUrl, ignoreSnooze = false) {
   const current = app.getVersion();
   if (!isNewerVersion(version, current)) return false;
@@ -117,14 +196,14 @@ async function showUpdateDialog(version, downloadUrl, ignoreSnooze = false) {
     type: 'info',
     title: 'Mise à jour disponible',
     message: `Version ${version} disponible`,
-    detail: `Version actuelle : ${current}`,
+    detail: `Version actuelle : ${current}\nL'application se relancera automatiquement après la mise à jour.`,
-    buttons: ['Télécharger', 'Me rappeler dans...'],
+    buttons: ['Installer maintenant', 'Me rappeler dans...'],
     defaultId: 0,
     cancelId: 1
   });
 
   if (response === 0) {
-    shell.openExternal(downloadUrl);
+    downloadAndInstall(downloadUrl, version);
     return true;
   }
 
@@ -181,7 +260,21 @@ function createWindow() {
   mainWindow.loadFile(path.join(__dirname, 'renderer', 'index.html'));
 }
 
+function selfInstallLinux() {
+  if (process.platform !== 'linux' || !app.isPackaged) return;
+  const appImagePath = process.env.APPIMAGE;
+  if (!appImagePath) return;
+  const stablePath = path.join(require('os').homedir(), '.local', 'bin', 'farm-tracker.AppImage');
+  if (appImagePath === stablePath) return;
+  try {
+    fs.mkdirSync(path.dirname(stablePath), { recursive: true });
+    fs.copyFileSync(appImagePath, stablePath);
+    fs.chmodSync(stablePath, 0o755);
+  } catch (_) {}
+}
+
 app.whenReady().then(() => {
+  selfInstallLinux();
   createWindow();
   setTimeout(() => checkForUpdates(false), 5000);
 });

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "farm-tracker",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "farm-tracker",
-      "version": "1.0.0",
+      "version": "1.0.3",
       "license": "ISC",
       "dependencies": {
         "dist": "^0.1.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farm-tracker",
-  "version": "1.0.0",
+  "version": "1.0.5",
   "description": "Suivi de loot Minecraft en direct, avec sauvegarde automatique des stats et des chances de drop.",
   "main": "main.js",
   "scripts": {

preload.js

@@ -24,5 +24,6 @@ contextBridge.exposeInMainWorld('api', {
   loadSessionHistory: () => ipcRenderer.invoke('load-session-history'),
   saveSessionHistory: (obj) => ipcRenderer.invoke('save-session-history', obj),
 
-  checkUpdateManual: () => ipcRenderer.invoke('check-update-manual')
+  checkUpdateManual: () => ipcRenderer.invoke('check-update-manual'),
+  onUpdateProgress: (cb) => ipcRenderer.on('update-progress', (_, data) => cb(data))
 });

renderer/index.html

@@ -528,6 +528,21 @@
         <p class="hero-number" id="histTotalTime">0h 00m</p>
         <p class="hero-sub" id="histAvgTime">moy. 0h / session</p>
       </div>
+      <div class="hero-stat">
+        <p class="eyebrow">Kills/min moyen</p>
+        <p class="hero-number" id="histAvgRate">0</p>
+        <p class="hero-sub" id="histBestRate">meilleur 0/min</p>
+      </div>
+      <div class="hero-stat">
+        <p class="eyebrow">Exp totale</p>
+        <p class="hero-number" id="histTotalExp">0</p>
+        <p class="hero-sub" id="histAvgExp">moy. 0 / session</p>
+      </div>
+      <div class="hero-stat">
+        <p class="eyebrow">Kamas totaux</p>
+        <p class="hero-number" id="histTotalKamas">0</p>
+        <p class="hero-sub" id="histAvgKamas">moy. 0 / session</p>
+      </div>
     </div>
 
     <div id="histEmptyState">
@@ -552,7 +567,7 @@
 
       <div class="charts-2col" style="margin-bottom:14px;">
         <div class="panel">
-          <h2>Kills / heure</h2>
+          <h2>Kills / min</h2>
           <div class="chart-wrap" id="chartRate"></div>
           <div class="chart-label-row" id="chartRateLabels"></div>
         </div>
@@ -577,10 +592,13 @@
               <th>Date</th>
               <th class="r">Durée</th>
               <th class="r">Kills</th>
-              <th class="r">Kills/h</th>
+              <th class="r">K/min</th>
               <th class="r">Exp</th>
-              <th class="r">Cols kill</th>
+              <th class="r">Exp/min</th>
+              <th class="r">Kamas</th>
+              <th class="r">Cols/min</th>
               <th>Mob principal</th>
+              <th>Top item</th>
             </tr>
           </thead>
           <tbody id="histSessionsBody"></tbody>
@@ -1834,8 +1852,15 @@
     histEmpty.hidden=true; histHero.hidden=false; histCharts.hidden=false; histPanel.hidden=false;
     const totalKills=sessions.reduce((s,x)=>s+x.totalKills,0);
     const totalMs=sessions.reduce((s,x)=>s+x.durationMs,0);
+    const totalExp=sessions.reduce((s,x)=>s+(x.totalExp||0),0);
+    const totalKamas=sessions.reduce((s,x)=>s+(x.sellTotal||0),0);
     const avgKills=Math.round(totalKills/sessions.length);
     const avgMs=totalMs/sessions.length;
+    const avgExp=Math.round(totalExp/sessions.length);
+    const avgKamas=Math.round(totalKamas/sessions.length);
+    const ratesPerMin=sessions.filter(s=>s.durationMs>0).map(s=>s.totalKills/(s.durationMs/60000));
+    const avgRate=ratesPerMin.length?ratesPerMin.reduce((a,b)=>a+b,0)/ratesPerMin.length:0;
+    const bestRate=ratesPerMin.length?Math.max(...ratesPerMin):0;
     $('histTotalSessions').textContent=fmt(sessions.length);
     $('histTotalKills').textContent=fmt(totalKills);
     $('histAvgKills').textContent='moy. '+fmt(avgKills)+' / session';
@@ -1843,12 +1868,18 @@
     $('histTotalTime').textContent=tH+'h '+String(tM).padStart(2,'0')+'m';
     const aH=Math.floor(avgMs/3600000),aM=Math.floor((avgMs%3600000)/60000);
     $('histAvgTime').textContent='moy. '+(aH>0?aH+'h ':'')+String(aM).padStart(2,'0')+'m / session';
+    $('histAvgRate').textContent=fmt(avgRate,1)+'/min';
+    $('histBestRate').textContent='meilleur '+fmt(bestRate,1)+'/min';
+    $('histTotalExp').textContent=fmtShort(totalExp);
+    $('histAvgExp').textContent='moy. '+fmtShort(avgExp)+' / session';
+    $('histTotalKamas').textContent=fmtShort(totalKamas);
+    $('histAvgKamas').textContent='moy. '+fmtShort(avgKamas)+' / session';
     const kAvgEl=$('histKillsAvgLabel');
     if (kAvgEl) kAvgEl.textContent='moy. '+fmt(avgKills)+' kills';
     renderSvgChart($('chartKills'),sessions,s=>s.totalKills,'#9B5DE5',null,$('chartKillsLabels'));
     renderSvgChart($('chartRate'),sessions,s=>{
-      const h=s.durationMs/3600000; return h>0?Math.round(s.totalKills/h):0;
+      const min=s.durationMs/60000; return min>0?Math.round(s.totalKills/min*10)/10:0;
-    },'#5DB7E5',v=>fmtShort(v)+'/h',$('chartRateLabels'));
+    },'#5DB7E5',v=>fmt(v,1)+'/min',$('chartRateLabels'));
     renderSvgChart($('chartExp'),sessions,s=>s.totalExp,'#F2C94C',v=>fmtShort(v),$('chartExpLabels'));
     const tbody=$('histSessionsBody');
     tbody.innerHTML='';
@@ -1859,16 +1890,23 @@
         +' '+d.toLocaleTimeString('fr-FR',{hour:'2-digit',minute:'2-digit'});
       const dH=Math.floor(s.durationMs/3600000),dM=Math.floor((s.durationMs%3600000)/60000);
       const durStr=dH>0?dH+'h'+String(dM).padStart(2,'0')+'m':dM+'min';
-      const killsPerH=s.durationMs>0?Math.round(s.totalKills/(s.durationMs/3600000)):0;
+      const minElapsed=s.durationMs/60000;
+      const killsPerMin=minElapsed>0?Math.round(s.totalKills/minElapsed*10)/10:0;
+      const expPerMin=minElapsed>0?Math.round(s.totalExp/minElapsed):0;
+      const colsPerMin=minElapsed>0?Math.round((s.killCols||0)/minElapsed*10)/10:0;
+      const topItemName=s.topItems&&s.topItems.length?s.topItems[0].name+' ×'+s.topItems[0].qty:'—';
       const tr=document.createElement('tr');
       tr.innerHTML=
         '<td>'+escHtml(dateStr)+'</td>'+
         '<td class="r mono">'+escHtml(durStr)+'</td>'+
         '<td class="r hl">'+fmt(s.totalKills)+'</td>'+
-        '<td class="r mono">'+fmt(killsPerH)+'/h</td>'+
+        '<td class="r mono">'+fmt(killsPerMin,1)+'/min</td>'+
-        '<td class="r mono">'+fmt(s.totalExp)+'</td>'+
+        '<td class="r mono">'+fmtShort(s.totalExp)+'</td>'+
-        '<td class="r mono">'+fmt(s.killCols)+'</td>'+
+        '<td class="r mono">'+fmtShort(expPerMin)+'/min</td>'+
-        '<td class="dim">'+escHtml(s.topMob||'—')+'</td>';
+        '<td class="r mono">'+(s.sellTotal?fmtShort(Math.round(s.sellTotal)):'—')+'</td>'+
+        '<td class="r mono">'+fmt(colsPerMin,1)+'/min</td>'+
+        '<td class="dim">'+escHtml(s.topMob||'—')+'</td>'+
+        '<td class="dim" title="'+escHtml(topItemName)+'">'+escHtml(topItemName.length>22?topItemName.slice(0,20)+'…':topItemName)+'</td>';
       tbody.appendChild(tr);
     }
   }
@@ -2002,6 +2040,35 @@
   })();
 
 })();
+
+  // ---------- Progression de mise à jour ----------
+  if (window.api && window.api.onUpdateProgress) {
+    const overlay = document.createElement('div');
+    overlay.id = 'updateOverlay';
+    overlay.style.cssText = 'position:fixed;inset:0;background:rgba(11,15,12,0.94);z-index:9999;display:none;align-items:center;justify-content:center;flex-direction:column;gap:18px;';
+    overlay.innerHTML =
+      '<div style="font-family:var(--font-mono);color:var(--text);font-size:14px;letter-spacing:.04em;" id="updateOverlayText">Téléchargement de la mise à jour…</div>' +
+      '<div style="width:320px;height:5px;background:var(--bg-panel-2);border:1px solid var(--border);">' +
+        '<div id="updateProgressBar" style="height:100%;background:var(--corrupt);width:0%;transition:width .25s;"></div>' +
+      '</div>' +
+      '<div style="font-family:var(--font-mono);color:var(--text-dim);font-size:12px;" id="updateOverlayPct">0%</div>';
+    document.body.appendChild(overlay);
+
+    window.api.onUpdateProgress(({ percent, status, error }) => {
+      const bar = document.getElementById('updateProgressBar');
+      const pct = document.getElementById('updateOverlayPct');
+      const txt = document.getElementById('updateOverlayText');
+      if (status === 'error') {
+        overlay.style.display = 'none';
+        return;
+      }
+      overlay.style.display = 'flex';
+      bar.style.width = percent + '%';
+      pct.textContent = percent + '%';
+      txt.textContent = status === 'installing' ? 'Installation… l\'application va redémarrer.' : 'Téléchargement de la mise à jour…';
+    });
+  }
+
 </script>
 </body>
 </html>

tools/release.js

@@ -21,7 +21,9 @@ const VERSION = pkg.version;
 const TAG     = `v${VERSION}`;
 
 const DIST = path.join(__dirname, '..', 'dist');
-const ASSETS = fs.readdirSync(DIST).filter(f => f.endsWith('.AppImage') || (f.endsWith('.exe') && !f.endsWith('.blockmap')));
+const ASSETS = fs.readdirSync(DIST).filter(f =>
+  (f.endsWith('.AppImage') || (f.endsWith('.exe') && !f.endsWith('.blockmap'))) && f.includes(VERSION)
+);
 
 if (!ASSETS.length) {
   console.error('Aucun binaire trouvé dans dist/. Lance "npm run dist" et "npm run dist:win" d\'abord.');

tools/release.sh

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+cd "$(dirname "$0")/.."
+
+# ---------- Token ----------
+TOKEN="${GITEA_TOKEN:-}"
+if [ -z "$TOKEN" ] && [ -f ".gitea-token" ]; then
+  TOKEN=$(tr -d '[:space:]' < .gitea-token)
+fi
+if [ -z "$TOKEN" ]; then
+  read -rsp "Token Gitea : " TOKEN
+  echo
+fi
+
+# ---------- Version ----------
+CURRENT=$(node -p "require('./package.json').version")
+if [ -n "${1:-}" ]; then
+  VERSION="$1"
+else
+  echo "Version actuelle : v$CURRENT"
+  read -rp "Nouvelle version [patch / minor / major / X.Y.Z] : " VERSION
+fi
+
+npm version "$VERSION" --no-git-tag-version --silent
+NEW=$(node -p "require('./package.json').version")
+echo "→ v$NEW"
+
+# ---------- Build ----------
+echo ""
+echo "Nettoyage des anciens binaires..."
+find dist -maxdepth 1 \( -name "*.AppImage" -o -name "*.exe" -o -name "*.blockmap" \) -delete 2>/dev/null || true
+
+echo "Build Linux (AppImage)..."
+npm run dist --silent
+
+if command -v wine &>/dev/null; then
+  echo "Build Windows (exe)..."
+  npm run dist:win --silent
+else
+  echo "(Wine non trouvé — build Windows ignoré)"
+fi
+
+# ---------- Release Gitea ----------
+echo ""
+GITEA_TOKEN="$TOKEN" node tools/release.js
+
+# ---------- Git ----------
+git add package.json package-lock.json
+git commit -m "chore: release v$NEW" --quiet
+git remote set-url origin "https://shamiiow:${TOKEN}@git.shamiiow.com/shamiiow/farm-tracker-sao.git"
+git push --quiet
+git remote set-url origin "https://git.shamiiow.com/shamiiow/farm-tracker-sao.git"
+
+echo ""
+echo "Release v$NEW publiée."