eva-md 0.5.1 → 0.6.1

package/eva.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * EVA.md v0.5.1 — EVA Media Downloader by .maxon
+ * EVA.md v0.6.1 — EVA Media Downloader by .maxon
  * Pure Node.js Interactive TUI (Zero external npm dependencies!)
  * Works just like Gemini CLI (`node eva.js` or `./eva.js`), with full mouse & keyboard support.
  *
@@ -46,11 +46,12 @@ const { spawn, spawnSync } = require('child_process');
 // Constants & Configuration
 // ---------------------------------------------------------------------------
 
-const APP_VERSION = 'v0.5.1 (Node.js)';
+const APP_VERSION = 'v0.6.1 (Node.js)';
 const CONFIG_PATH = path.join(os.homedir(), '.config', 'eva_md', 'config.json');
 const MAX_LOG_LINES = 200;
 const MAX_LOG_LINE_LENGTH = 500;
 const MAX_DOWNLOAD_RETRIES = 3;
+const LIBRARY_DOUBLE_CLICK_MS = 400;
 const ANSI_ESCAPE_RE = /\x1B(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1B\\)|[@-_])/g;
 
 // Strictly 1-cell narrow glyphs (CP437/WGL4 safe) so Windows Terminal / PowerShell NEVER shifts borders!
@@ -78,7 +79,7 @@ const BROWSERS = ['none', 'chrome', 'firefox', 'edge', 'brave', 'opera', 'vivald
 const NAMING_PRESETS = [
   { label: 'Плейлист: 01. Название файла.mp4(формат)', tpl: '%(playlist_index)s. %(title)s.%(ext)s' }, 
   { label: 'Стандарт: Название файла.mp4(формат)', tpl: '%(title)s.%(ext)s' },
-  { label: 'Автор - Название: Автор - Название.mp4(формат)', tpl: '%(uploader)s - %(title)s.%(ext)s' },
+  { label: 'Автор: Автор - Название.mp4(формат)', tpl: '%(uploader)s - %(title)s.%(ext)s' },
 ];
 
 const ASCII_LOGO = [
@@ -1059,6 +1060,10 @@ class EvaNodeTUI {
     this.selectedQueueItem = null;
     this.queueScrollOffset = 0;
     this.queueViewport = null;
+    this.libraryScrollOffset = 0;
+    this.libraryViewport = null;
+    this.selectedLibraryFile = null;
+    this.lastLibraryClick = null;
     this.statusBanner = '';
 
     this.modal = null;
@@ -1103,7 +1108,7 @@ class EvaNodeTUI {
         ? ANSI.bgGray + ANSI.fgWhite + ANSI.bold
         : ANSI.bgWhite + ANSI.fgBlack + ANSI.bold;
     } else if (isCta) {
-      style = id === 'url_input'
+      style = ['url_input', 'edit_proxy', 'cycle_browser'].includes(id)
         ? ANSI.fgWhite + ANSI.bold
         : id === 'btn_add_queue'
           ? ANSI.fgGreen + ANSI.bold
@@ -1129,7 +1134,7 @@ class EvaNodeTUI {
     }
 
     const textX = x + prefix.length;
-    const editMarker = '[ред.]';
+    const editMarker = '[✎ ]';
     const editMarkerIndex = visibleLabel.lastIndexOf(editMarker);
     if (!isFocused && editMarkerIndex >= 0) {
       const folderLabel = 'Папка:';
@@ -1194,6 +1199,7 @@ class EvaNodeTUI {
     this.focusOrder = [];
     this.hitboxes = [];
     this.queueViewport = null;
+    this.libraryViewport = null;
 
     if (rows < 22 || cols < 76) {
       scr.putStr(1, 2, `Окно терминала слишком маленькое (${cols}x${rows}). Минимум: 78x22.`, ANSI.fgRed + ANSI.bold);
@@ -1488,14 +1494,14 @@ class EvaNodeTUI {
         maxWidth: templateMaxWidth,
       }
     );
-    const templateEditEnd = this.registerWidget(scr, 'edit_otpl', y + 6, templateEnd + 1, '[ред.]', () => {
+    const templateEditEnd = this.registerWidget(scr, 'edit_otpl', y + 6, templateEnd + 1, '[✎ ]', () => {
       return this.openPrompt('Шаблон имени (-o)', this.opts.outputTemplate, (v) => {
         this.opts.outputTemplate = v || '%(title)s.%(ext)s';
       });
     }, { maxWidth: 6 });
 
     const archiveX = templateEditEnd + 2;
-    const archiveMaxWidth = Math.max(4, rowRight - archiveX - '[ред.]'.length);
+    const archiveMaxWidth = Math.max(4, rowRight - archiveX - '[✎ ]'.length);
     const archiveEnd = this.registerWidget(
       scr,
       'flag_archive',
@@ -1508,7 +1514,7 @@ class EvaNodeTUI {
         maxWidth: archiveMaxWidth,
       }
     );
-    this.registerWidget(scr, 'edit_archive', y + 6, archiveEnd + 1, '[ред.]', () => {
+    this.registerWidget(scr, 'edit_archive', y + 6, archiveEnd + 1, '[✎ ]', () => {
       return this.openPrompt('Файл архива (--download-archive)', this.opts.archiveFile, (v) => {
         this.opts.archiveFile = v || 'archive.txt';
       });
@@ -1527,7 +1533,7 @@ class EvaNodeTUI {
         { checked: this.opts.usePlaylistItems }
       ) + 1;
     px =
-      this.registerWidget(scr, 'edit_plitems', y + 7, px, '[ред.]', () =>
+      this.registerWidget(scr, 'edit_plitems', y + 7, px, '[✎ ]', () =>
         this.openPrompt('Номера треков (--playlist-items, напр. 1-5)', this.opts.playlistItems, (v) => {
           this.opts.playlistItems = v || '1-5';
         })
@@ -1550,7 +1556,7 @@ class EvaNodeTUI {
         ? '…' + this.opts.outputDir.slice(-(maxDirLen - 1))
         : this.opts.outputDir;
     let dx =
-      this.registerWidget(scr, 'edit_outdir', y + 9, c1, `Папка: ${shortDir} [ред.]`, () =>
+      this.registerWidget(scr, 'edit_outdir', y + 9, c1, `📁: ${shortDir} [✎ ]`, () =>
         this.openPrompt('Папка сохранения', this.opts.outputDir, (v) => {
           this.opts.outputDir = v || path.join(os.homedir(), 'Downloads');
         })
@@ -1754,23 +1760,102 @@ class EvaNodeTUI {
     const nameColW = Math.max(1, contentWidth - numberColW - formatColW - sizeColW - 5);
     const formatX = numberColW + 1 + nameColW + 1;
     const sizeX = formatX + formatColW + 1;
+    const listTop = 11;
+    const listRows = Math.max(1, h - 4);
+    const maxScrollOffset = Math.max(0, files.length - listRows);
+    this.libraryScrollOffset = Math.max(0, Math.min(this.libraryScrollOffset, maxScrollOffset));
+    this.libraryViewport = { x, right: x + w, top: listTop, rows: listRows, count: files.length };
+    scr.putStr(10, x, '├' + '─'.repeat(w - 2) + '┤', ANSI.fgWhite);
     if (files.length === 0) {
-      scr.putStr(10, x + 3, `В папке ${outDir} пока нет скачанных медиафайлов.`.slice(0, w - 6), ANSI.fgWhite);
+      scr.putStr(listTop, x + 3, `No media files found in ${outDir}.`.slice(0, w - 6), ANSI.fgWhite);
     } else {
-      scr.putStr(10, x + 3, '#', ANSI.fgCyan + ANSI.bold);
-      scr.putStr(10, x + 3 + numberColW + 1, 'Имя файла', ANSI.fgCyan + ANSI.bold);
-      scr.putStr(10, x + 3 + formatX, 'Формат', ANSI.fgCyan + ANSI.bold);
-      scr.putStr(10, x + 3 + sizeX, 'Размер', ANSI.fgCyan + ANSI.bold);
-      const visibleFileCount = Math.max(0, Math.min(files.length, rows - 15));
-      files.slice(0, visibleFileCount).forEach((f, i) => {
+      scr.putStr(9, x + 3, '#', ANSI.fgCyan + ANSI.bold);
+      scr.putStr(9, x + 3 + numberColW + 1, 'Title', ANSI.fgCyan + ANSI.bold);
+      scr.putStr(9, x + 3 + formatX, 'Format', ANSI.fgCyan + ANSI.bold);
+      scr.putStr(9, x + 3 + sizeX, 'Size', ANSI.fgCyan + ANSI.bold);
+      files.slice(this.libraryScrollOffset, this.libraryScrollOffset + listRows).forEach((f, rowOffset) => {
+        const fileIndex = this.libraryScrollOffset + rowOffset;
         const mb = formatBytesToMB(f.stat.size);
-        const row = 12 + i;
+        const row = listTop + rowOffset;
         const filename = fitTextToCellWidth(f.name, nameColW);
-        scr.putStr(row, x + 3, String(i + 1).padEnd(numberColW), ANSI.fgWhite);
-        scr.putStrWithin(row, x + 3 + numberColW + 1, filename, nameColW, ANSI.fgWhite);
-        scr.putStrWithin(row, x + 3 + formatX, f.ext.slice(1, formatColW + 1).padEnd(formatColW), formatColW, ANSI.fgWhite);
-        scr.putStrWithin(row, x + 3 + sizeX, mb.slice(0, sizeColW).padStart(sizeColW), sizeColW, ANSI.fgWhite);
+        const isSelected = f.full === this.selectedLibraryFile;
+        const rowStyle = isSelected ? ANSI.bgWhite + ANSI.fgBlack + ANSI.bold : ANSI.fgWhite;
+        if (isSelected) scr.putStr(row, x + 2, ' '.repeat(w - 4), rowStyle);
+        scr.putStr(row, x + 3, String(fileIndex + 1).padEnd(numberColW), rowStyle);
+        scr.putStrWithin(row, x + 3 + numberColW + 1, filename, nameColW, rowStyle);
+        scr.putStrWithin(row, x + 3 + formatX, f.ext.slice(1, formatColW + 1).padEnd(formatColW), formatColW, rowStyle);
+        scr.putStrWithin(row, x + 3 + sizeX, mb.slice(0, sizeColW).padStart(sizeColW), sizeColW, rowStyle);
+        this.hitboxes.push({
+          id: `library_file_${fileIndex}`,
+          y: row,
+          x1: x + 2,
+          x2: x + w - 3,
+          action: () => this._selectLibraryFile(f),
+        });
+      });
+
+      if (files.length > listRows) {
+        const scrollbarX = x + w - 2;
+        const thumbSize = Math.max(1, Math.floor((listRows * listRows) / files.length));
+        const thumbTravel = listRows - thumbSize;
+        const thumbTop = maxScrollOffset > 0
+          ? Math.round((this.libraryScrollOffset / maxScrollOffset) * thumbTravel)
+          : 0;
+        for (let rowOffset = 0; rowOffset < listRows; rowOffset++) {
+          const isThumb = rowOffset >= thumbTop && rowOffset < thumbTop + thumbSize;
+          const scrollbarY = listTop + rowOffset;
+          scr.putStr(scrollbarY, scrollbarX, isThumb ? '█' : '│', isThumb ? ANSI.fgCyan : ANSI.fgGray);
+          this.hitboxes.push({
+            id: 'library_scroll',
+            y: scrollbarY,
+            x1: scrollbarX,
+            x2: scrollbarX,
+            action: () => {
+              const nextThumbTop = Math.max(0, Math.min(thumbTravel, rowOffset - Math.floor(thumbSize / 2)));
+              this.libraryScrollOffset = thumbTravel > 0
+                ? Math.round((nextThumbTop / thumbTravel) * maxScrollOffset)
+                : 0;
+              this.render();
+            },
+          });
+        }
+      }
+    }
+  }
+
+  _selectLibraryFile(file) {
+    const now = Date.now();
+    const isDoubleClick =
+      this.lastLibraryClick &&
+      this.lastLibraryClick.path === file.full &&
+      now - this.lastLibraryClick.time <= LIBRARY_DOUBLE_CLICK_MS;
+
+    this.selectedLibraryFile = file.full;
+    this.lastLibraryClick = isDoubleClick ? null : { path: file.full, time: now };
+    if (isDoubleClick) {
+      this._openLibraryFile(file.full);
+      return;
+    }
+    this.render();
+  }
+
+  _openLibraryFile(filePath) {
+    const opener = process.platform === 'win32'
+      ? 'explorer.exe'
+      : process.platform === 'darwin'
+        ? 'open'
+        : 'xdg-open';
+
+    try {
+      const child = spawn(opener, [filePath], { detached: true, stdio: 'ignore' });
+      child.once('error', (error) => {
+        this.statusBanner = `Не удалось открыть файл: ${error.message}`;
+        this.render();
       });
+      child.unref();
+    } catch (error) {
+      this.statusBanner = `Не удалось открыть файл: ${error.message}`;
+      this.render();
     }
   }
 
@@ -1804,11 +1889,11 @@ class EvaNodeTUI {
         () => this._toggle('useProxy'),
         { checked: this.opts.useProxy }
       ) + 2;
-    this.registerWidget(scr, 'edit_proxy', 12, px, '[изменить прокси]', () =>
-      this.openPrompt('Прокси (--proxy)', this.opts.proxyUrl, (v) => {
+    this.registerWidget(scr, 'edit_proxy', 12, px, '[изменить прокси]', () => {
+      return this.openPrompt('Прокси (--proxy)', this.opts.proxyUrl, (v) => {
         this.opts.proxyUrl = v || 'http://127.0.0.1:8080';
-      })
-    );
+      });
+    }, { isCta: true });
 
     let ckx =
       this.registerWidget(
@@ -1827,7 +1912,7 @@ class EvaNodeTUI {
       this.opts.useCookiesBrowser = nextB !== 'none';
       this.statusBanner = `Cookies браузер: ${nextB}`;
       this.render();
-    });
+    }, { isCta: true });
 
     scr.putStr(15, c1, 'ШАБЛОНЫ ИМЕНОВАНИЯ ФАЙЛОВ (-o):', ANSI.fgCyan + ANSI.bold);
     NAMING_PRESETS.forEach((p, idx) => {
@@ -2030,14 +2115,20 @@ class EvaNodeTUI {
       const mx = parseInt(mouseMatch[2], 10) - 1;
       const my = parseInt(mouseMatch[3], 10) - 1;
       const isPress = mouseMatch[4] === 'M';
-      if (this.activeTab === 2 && (btn === 64 || btn === 65)) {
-        const viewport = this.queueViewport;
+      if ((this.activeTab === 2 || this.activeTab === 3) && (btn === 64 || btn === 65)) {
+        const isQueue = this.activeTab === 2;
+        const viewport = isQueue ? this.queueViewport : this.libraryViewport;
         if (viewport && mx >= viewport.x && mx < viewport.right &&
             my >= viewport.top && my < viewport.top + viewport.rows) {
-          const maxOffset = Math.max(0, this.manager.items.length - viewport.rows);
-          this.queueScrollOffset = Math.max(0, Math.min(maxOffset, this.queueScrollOffset + (btn === 64 ? -1 : 1)));
-          this.selectedQueueIdx = this.queueScrollOffset;
-          this.selectedQueueItem = this.manager.items[this.selectedQueueIdx] || null;
+          if (isQueue) {
+            const maxOffset = Math.max(0, this.manager.items.length - viewport.rows);
+            this.queueScrollOffset = Math.max(0, Math.min(maxOffset, this.queueScrollOffset + (btn === 64 ? -1 : 1)));
+            this.selectedQueueIdx = this.queueScrollOffset;
+            this.selectedQueueItem = this.manager.items[this.selectedQueueIdx] || null;
+          } else {
+            const maxOffset = Math.max(0, viewport.count - viewport.rows);
+            this.libraryScrollOffset = Math.max(0, Math.min(maxOffset, this.libraryScrollOffset + (btn === 64 ? -1 : 1)));
+          }
           this.render();
         }
         return;
@@ -2047,7 +2138,7 @@ class EvaNodeTUI {
           mx >= h.x1 && mx <= h.x2 && (h.y === my || (h.nav && Math.abs(h.y - my) === 1))
         );
         if (hit) {
-          if (hit.id !== 'q_scroll') this.focusId = hit.id;
+          if (hit.id !== 'q_scroll' && hit.id !== 'library_scroll') this.focusId = hit.id;
           hit.action();
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "eva-md",
-	"version": "0.5.1",
+	"version": "0.6.1",
 	"description": "EVA Media Downloader CLI",
 	"main": "eva.js",
 	"bin": {