eva-md 0.6.1 → 0.7.3

package/eva.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * EVA.md v0.6.1 — EVA Media Downloader by .maxon
+ * EVA.md v0.7.3 — 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.
  *
@@ -22,12 +22,12 @@
  *     --write-subs               Download subtitles file
  *     --embed-subs               Embed subtitles into media container
  *     --write-thumbnail          Save thumbnail as a separate image file
- *   File Naming & Archive (Именование файлов):
+ *   File Naming (Именование файлов — во вкладке Settings):
  *     -o "<template>"            Output template (e.g. "%(playlist_index)s. %(title)s.%(ext)s")
- *     --download-archive <file>  Record downloaded track IDs in archive.txt
  *   Playlists (Плейлисты):
  *     --playlist-items <range>   Download specific items (e.g. "1-5")
  *     --playlist-reverse         Download playlist in reverse order
+ *     --download-archive <file>  Record downloaded track IDs in archive.txt
  *   Network & Bypass (Сеть и обход блокировок — во вкладке Settings):
  *     -4                         Force IPv4 connection (fixes DNS issues)
  *     --proxy <url>              Use HTTP/SOCKS proxy (e.g. http://127.0.0.1:8080)
@@ -46,7 +46,7 @@ const { spawn, spawnSync } = require('child_process');
 // Constants & Configuration
 // ---------------------------------------------------------------------------
 
-const APP_VERSION = 'v0.6.1 (Node.js)';
+const APP_VERSION = 'v0.7.3 (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;
@@ -83,14 +83,21 @@ const NAMING_PRESETS = [
 ];
 
 const ASCII_LOGO = [
-  '███████╗██╗   ██╗ █████╗                         ⠀⠨⣔⢺⢿⡿⠟⠛⠋⠩⠥⠄⠀⠌⠉⠝⠻⠿⣿⣿⣷⣿⣿⣳⡀',
-  '██╔════╝██║   ██║██╔══██╗     ███╗ ███╗ ██████╗⠀⠀ ⢳⣭⢯⡆⠁⠠⠀⢀⣠⣤⠀⠀⠈⠀⠀⠈⡑⢬⢻⣿⣿⣿⣿⣧⡂⠌⠀ ',
-  '█████╗  ╚██╗ ██╔╝███████║    ██╔████╔██╗██╔══██╗ ⠈⠲⣽⣻⣽⢦⠀⠠⠝⣿⣷⡀⠀⠶⠂⠀⣸⣿⣟⠕⢼⣿⣿⣿⢿⢦',
-  '██╔══╝   ╚████╔╝ ██╔══██║    ██║╚██╔╝██║██║  ██║   ⢣⣼⣻⣿⣟⢇⠀⡜⠤⠻⢿⣄⣀⣀⠼⢟⡻⣃⠀⠘⣿⣿⠟',
-  '███████╗  ╚██╔╝  ██║  ██║ ██╗██║ ╚═╝ ██║██████╔╝    ⠐⢮⡿⣽⣿⣿⣞⡵⢢⣌⣦⣕⣢⣬⣧⣺⣿⣿⣿⣿⠝',
-  '╚══════╝   ╚═╝   ╚═╝  ╚═╝ ╚═╝╚═╝     ╚═╝╚═════╝        ⠲⠕⠻⢿⣿⡻⣿⢯⢟⡿⢯⠟⠛⠻⠝⠋',
+  '      :::::::::: :::     :::     :::         ⡌⣔⣥⣔⣪⣯⣿⣿⣮⣳⣾⣻⣾⣽⢮⣷⢿⣦',
+  '     :+:        :+:     :+:   :+: :+:     ⠨⣔⢺⢿⡿⠟⠛⠋⠩⠥⠄⠀⠌⠉⠝⠻⠿⣿⣿⣷⣿⣿⣳',
+  '    +:+        +:+     +:+  +:+   +:+      ⢳⣭⢯⡆⠁⠠⠀⢀⣠⣤⠀⠀⠈⠀⠀⠈⡑⢬⢻⣿⣿⣿⣿⣧',
+  '   +#++:++#   +#+     +:+ +#++:++#++:     ⠈⠲⣽⣻⣽⢦⠀⠠⠝⣿⣷⡀⠀⠶⠂⠀⣸⣿⣟⠕⢼⣿⣿⣿⢿',
+  "  +#+         +#+   +#+  +#+     +#+       ⢣⣼⣻⣿⣟⢇⠀⡜⠤⠻⢿⣄⣀⣀⠼⢟⡻⣃⠀⠘⣿⣿⠟",
+  ' #+#          #+#+#+#   #+#     #+#        ⠐⢮⡿⣽⣿⣿⣞⡵⢢⣌⣦⣕⣢⣬⣧⣺⣿⣿⣿⣿⠝',
+  "##########      ##     ###     ###             ⠲⠕⠻⢿⣿⡻⣿⢯⢟⡿⢯⠟⠛⠻⠝⠋",
 ];
 
+const STRETCHED_ASCII_LOGO = ASCII_LOGO.map((line) => {
+  const chars = Array.from(line);
+  const width = Math.round(chars.length * 1.2);
+  return Array.from({ length: width }, (_, index) => chars[Math.floor(index / 1.2)]).join('');
+});
+
 // ANSI Styling Helpers
 const CSI = '\x1b[';
 const ANSI = {
@@ -152,6 +159,16 @@ function formatBytesToMB(bytes) {
   return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
 }
 
+function formatEta(eta) {
+  const parts = String(eta || '').split(':');
+  if (!parts.length || parts.length > 3 || parts.some((part) => !/^\d+$/.test(part))) return '00:00';
+
+  const seconds = parts.reduce((total, part) => total * 60 + Number(part), 0);
+  const minutes = Math.floor(seconds / 60);
+  const remainingSeconds = seconds % 60;
+  return `${String(minutes).padStart(2, '0')}:${String(remainingSeconds).padStart(2, '0')}`;
+}
+
 function sanitizeLogLine(line) {
   return String(line)
     .replace(ANSI_ESCAPE_RE, '')
@@ -344,15 +361,11 @@ function buildYtdlpArgs(opts, targetUrl = null) {
   if (opts.embedSubs) args.push('--embed-subs');
   if (opts.writeThumbnail) args.push('--write-thumbnail');
 
-  // File Naming & Archive
+  // File Naming
   const outDir = resolveOutputDir(opts.outputDir);
   const tpl = opts.usePlaylistTemplate ? opts.outputTemplate : '%(title)s.%(ext)s';
   args.push('-o', path.join(outDir, tpl));
 
-  if (opts.useDownloadArchive && opts.archiveFile.trim()) {
-    args.push('--download-archive', path.join(outDir, opts.archiveFile.trim()));
-  }
-
   // Playlists
   if (opts.usePlaylistItems && opts.playlistItems.trim()) {
     args.push('--playlist-items', opts.playlistItems.trim());
@@ -360,6 +373,9 @@ function buildYtdlpArgs(opts, targetUrl = null) {
   if (opts.playlistReverse) {
     args.push('--playlist-reverse');
   }
+  if (opts.useDownloadArchive && opts.archiveFile.trim()) {
+    args.push('--download-archive', path.join(outDir, opts.archiveFile.trim()));
+  }
 
   // Network & Bypass
   if (opts.forceIpv4) {
@@ -405,6 +421,71 @@ function detectSource(url, defaultId = 1) {
   return { id: found.id, name: found.name };
 }
 
+function isVideoUrl(url) {
+  try {
+    const parsed = new URL(url);
+    const host = parsed.hostname.toLowerCase().replace(/^www\./, '');
+    const pathname = parsed.pathname.toLowerCase();
+
+    if (/\.(mp4|m4v|mkv|mov|webm|avi)$/i.test(pathname)) return true;
+    if (host === 'youtu.be') return pathname.length > 1;
+    if (host === 'youtube.com' || host.endsWith('.youtube.com')) {
+      if (host === 'music.youtube.com') return false;
+      return (
+        (pathname === '/watch' && parsed.searchParams.has('v')) ||
+        /^\/(shorts|live|embed|v)\//.test(pathname)
+      );
+    }
+    if (host === 'vkvideo.ru') return /^\/video/.test(pathname);
+    if (host === 'vk.com') return /^\/video/.test(pathname) || pathname === '/video_ext.php';
+    return false;
+  } catch (_) {
+    return false;
+  }
+}
+
+function isAudioUrl(url) {
+  try {
+    const parsed = new URL(url);
+    const host = parsed.hostname.toLowerCase().replace(/^www\./, '');
+    const pathname = parsed.pathname.toLowerCase();
+
+    if (/\.(mp3|m4a|m4b|m4p|aac|flac|wav|ogg|opus|oga|wma)$/i.test(pathname)) return true;
+    if (host === 'music.youtube.com') return true;
+    if (
+      host === 'bandcamp.com' ||
+      host.endsWith('.bandcamp.com') ||
+      host === 'soundcloud.com' ||
+      host.endsWith('.soundcloud.com') ||
+      host === 'mixcloud.com' ||
+      host.endsWith('.mixcloud.com') ||
+      host === 'audiomack.com' ||
+      host.endsWith('.audiomack.com') ||
+      host === 'audius.co' ||
+      host.endsWith('.audius.co')
+    ) {
+      return true;
+    }
+    return host === 'vk.com' && /^\/audio/.test(pathname);
+  } catch (_) {
+    return false;
+  }
+}
+
+function applyVideoModeForUrl(opts, url) {
+  if (!isVideoUrl(url)) return false;
+  opts.bestVideoMerge = true;
+  opts.extractAudio = false;
+  return true;
+}
+
+function applyAudioModeForUrl(opts, url) {
+  if (!isAudioUrl(url)) return false;
+  opts.bestVideoMerge = false;
+  opts.extractAudio = true;
+  return true;
+}
+
 function isYouTubePlaylistUrl(url) {
   try {
     const parsed = new URL(url);
@@ -1065,6 +1146,9 @@ class EvaNodeTUI {
     this.selectedLibraryFile = null;
     this.lastLibraryClick = null;
     this.statusBanner = '';
+    this.cliMarqueeTimer = null;
+    this.cliMarqueeText = '';
+    this.cliMarqueeOffset = 0;
 
     this.modal = null;
   }
@@ -1087,10 +1171,51 @@ class EvaNodeTUI {
   }
 
   quit() {
+    if (this.cliMarqueeTimer) {
+      clearInterval(this.cliMarqueeTimer);
+      this.cliMarqueeTimer = null;
+    }
     process.stdout.write(ANSI.mouseOff + ANSI.showCursor + ANSI.altScreenOff + ANSI.reset + '\n');
     process.exit(0);
   }
 
+  _stopCliMarquee() {
+    if (this.cliMarqueeTimer) {
+      clearInterval(this.cliMarqueeTimer);
+      this.cliMarqueeTimer = null;
+    }
+  }
+
+  _renderCliPreview(scr, x, y, width, text) {
+    if (text !== this.cliMarqueeText) {
+      this.cliMarqueeText = text;
+      this.cliMarqueeOffset = 0;
+    }
+
+    if (text.length <= width) {
+      this._stopCliMarquee();
+      scr.putStr(y, x, text, ANSI.fgYellow);
+      return;
+    }
+
+    const gap = '   ';
+    const stream = text + gap + text;
+    const loopLength = text.length + gap.length;
+    const start = this.cliMarqueeOffset % loopLength;
+    scr.putStr(y, x, stream.slice(start, start + width).padEnd(width), ANSI.fgYellow);
+
+    if (!this.cliMarqueeTimer && !this.modal) {
+      this.cliMarqueeTimer = setInterval(() => {
+        if (this.activeTab !== 1 || this.modal) {
+          this._stopCliMarquee();
+          return;
+        }
+        this.cliMarqueeOffset = (this.cliMarqueeOffset + 1) % loopLength;
+        this.render();
+      }, 175);
+    }
+  }
+
   registerWidget(scr, id, y, x, label, action, { checked = null, radio = null, isCta = false, maxWidth = 0 } = {}) {
     this.focusOrder.push(id);
     const isFocused = this.focusId === id;
@@ -1144,6 +1269,10 @@ class EvaNodeTUI {
         scr.putStr(y, textX + folderLabelIndex, folderLabel, ANSI.fgWhite);
         const afterFolderIndex = folderLabelIndex + folderLabel.length;
         scr.putStr(y, textX + afterFolderIndex, visibleLabel.slice(afterFolderIndex, editMarkerIndex), style);
+      } else if (id === 'edit_outdir' && visibleLabel.startsWith('🗁')) {
+        const iconLength = '🗁'.length;
+        scr.putStr(y, textX, visibleLabel.slice(0, iconLength), style + ANSI.bold);
+        scr.putStr(y, textX + iconLength, visibleLabel.slice(iconLength, editMarkerIndex), style);
       } else {
         scr.putStr(y, textX, visibleLabel.slice(0, editMarkerIndex), style);
       }
@@ -1186,6 +1315,8 @@ class EvaNodeTUI {
   // -------------------------------------------------------------------------
 
   render() {
+    if (this.activeTab !== 1 || this.modal) this._stopCliMarquee();
+
     if (this.selectedQueueItem) {
       const selectedIndex = this.manager.items.indexOf(this.selectedQueueItem);
       if (selectedIndex >= 0) this.selectedQueueIdx = selectedIndex;
@@ -1220,15 +1351,22 @@ class EvaNodeTUI {
   }
 
   _renderHeader(scr, cols) {
-    ASCII_LOGO.forEach((line, i) => {
+    const logoRight = 2 + Math.max(...STRETCHED_ASCII_LOGO.map((line) => line.length));
+    STRETCHED_ASCII_LOGO.forEach((line, i) => {
       scr.putStr(1 + i, 2, line, ANSI.fgWhite + ANSI.bold);
     });
     scr.putStr(7, 2, 'EVA MEDIA DOWNLOADER', ANSI.fgCyan);
-    scr.putStr(2, cols - APP_VERSION.length - 3, APP_VERSION, ANSI.fgWhite);
+    const versionX = cols - APP_VERSION.length - 3;
+    if (versionX > logoRight + 1) {
+      scr.putStr(2, versionX, APP_VERSION, ANSI.fgWhite);
+    }
     if (cols >= 90) {
       const tagline = 'Music. Videos. Your collection.';
-      scr.putStr(5, cols - tagline.length - 3, tagline, ANSI.fgWhite);
-      scr.putStr(6, cols - tagline.length - 3, '─'.repeat(tagline.length), ANSI.fgCyan);
+      const taglineX = cols - tagline.length - 3;
+      if (taglineX > logoRight + 1) {
+        scr.putStr(5, taglineX, tagline, ANSI.fgWhite);
+        scr.putStr(6, taglineX, '─'.repeat(tagline.length), ANSI.fgCyan);
+      }
     }
   }
 
@@ -1292,17 +1430,10 @@ class EvaNodeTUI {
       const activeItems = items.filter((item) => item.status === 'Downloading');
       const doneCnt = items.filter((i) => i.status === 'Done').length;
 
-      let pct = 0;
-      if (activeItems.length > 0) {
-        const sum = activeItems.reduce((acc, i) => acc + (i.progress || 0), 0);
-        pct = Math.round(sum / activeItems.length);
-      } else if (items.length > 0 && doneCnt === items.length) {
-        pct = 100;
-      }
-
-      const queueStatus = `│ ${activeItems.length}↓ ${doneCnt}✓ ${pct}%`;
+      const eta = formatEta(activeItems[0] && activeItems[0].etaStr);
+      const queueStatus = `│ ${activeItems.length}↓ ${doneCnt}✓ ${eta}`;
       const queueStyle = activeItems.length > 0 ? ANSI.fgGreen + ANSI.bold : ANSI.fgWhite;
-      const queueStartX = cols - queueStatus.length;
+      const queueStartX = cols - queueStatus.length - 1;
       scr.putStr(rows - 1, queueStartX, queueStatus, queueStyle);
 
       const statusX = queueStartX + queueStatus.length + 2;
@@ -1364,96 +1495,95 @@ class EvaNodeTUI {
     y += 7;
 
     // --- Box 2: Download Options & yt-dlp Flags ---
-    const box2H = 11;
+    const box2H = 12;
     scr.clipRight = previousClipRight;
     scr.drawBox(y, x, box2H, w, 'Download Options Flags');
     scr.clipRight = x + w - 2;
     const c1 = x + 2;
 
-    // Row 1: Audio (-x, metadata, thumbnail)
-    scr.putStr(y + 1, c1, 'АУДИО:', ANSI.fgCyan + ANSI.bold);
-    let ax = c1 + 7;
-    ax =
+    const renderAudioFormat = (row) => {
+      scr.putStr(row, c1, 'ФОРМАТ:', ANSI.fgCyan + ANSI.bold);
+      let fx = c1 + 8;
+      AUDIO_FORMATS.forEach((fmt) => {
+        fx =
+          this.registerWidget(
+            scr,
+            `fmt_${fmt}`,
+            row,
+            fx,
+            fmt,
+            () => {
+              this.opts.audioFormat = fmt;
+              this.opts.extractAudio = true;
+              this.opts.bestVideoMerge = false;
+              this.statusBanner = `Формат: --audio-format ${fmt}`;
+              this.render();
+            },
+            { radio: this.opts.audioFormat === fmt }
+          ) + 2;
+      });
+    };
+
+    const renderAudioQuality = (row) => {
+      scr.putStr(row, c1, 'БИТРЕЙТ:', ANSI.fgCyan + ANSI.bold);
+      let qx = c1 + 9;
+      AUDIO_QUALITIES.forEach((q) => {
+        qx =
+          this.registerWidget(
+            scr,
+            `qual_${q.val}`,
+            row,
+            qx,
+            q.label,
+            () => {
+              this.opts.audioQuality = q.val;
+              this.statusBanner = `Качество: --audio-quality ${q.val}`;
+              this.render();
+            },
+            { radio: this.opts.audioQuality === q.val }
+          ) + 2;
+      });
+    };
+
+    {
+      const videoX = c1 + Math.floor((w - 4) / 2);
+      const videoRight = x + w - 2;
+
+      scr.putStr(y + 1, c1, 'АУДИО:', ANSI.fgCyan + ANSI.bold);
       this.registerWidget(
         scr,
         'flag_x',
         y + 1,
-        ax,
+        c1 + 7,
         'Только аудио',
         () => this._toggle('extractAudio'),
-        { checked: this.opts.extractAudio }
-      ) + 2;
-    ax =
+        { checked: this.opts.extractAudio, maxWidth: videoX - c1 - 8 }
+      );
+      this.registerWidget(
+        scr,
+        'flag_thumb',
+        y + 2,
+        c1 + 7,
+        'Встроить обложку',
+        () => this._toggle('embedThumbnail'),
+        { checked: this.opts.embedThumbnail, maxWidth: videoX - c1 - 8 }
+      );
       this.registerWidget(
         scr,
         'flag_meta',
-        y + 1,
-        ax,
+        y + 3,
+        c1 + 7,
         'Встроить метаданные',
         () => this._toggle('embedMetadata'),
-        { checked: this.opts.embedMetadata }
-      ) + 2;
-    this.registerWidget(
-      scr,
-      'flag_thumb',
-      y + 1,
-      ax,
-      'Встроить обложку',
-      () => this._toggle('embedThumbnail'),
-      { checked: this.opts.embedThumbnail, maxWidth: x + w - ax - 2 }
-    );
-
-    // Row 2: Format (--audio-format)
-    scr.putStr(y + 2, c1, 'ФОРМАТ:', ANSI.fgCyan + ANSI.bold);
-    let fx = c1 + 8;
-    AUDIO_FORMATS.forEach((fmt) => {
-      fx =
-        this.registerWidget(
-          scr,
-          `fmt_${fmt}`,
-          y + 2,
-          fx,
-          fmt,
-          () => {
-            this.opts.audioFormat = fmt;
-            this.opts.extractAudio = true;
-            this.opts.bestVideoMerge = false;
-            this.statusBanner = `Формат: --audio-format ${fmt}`;
-            this.render();
-          },
-          { radio: this.opts.audioFormat === fmt }
-        ) + 2;
-    });
-
-    // Row 3: Quality (--audio-quality)
-    scr.putStr(y + 3, c1, 'БИТРЕЙТ:', ANSI.fgCyan + ANSI.bold);
-    let qx = c1 + 9;
-    AUDIO_QUALITIES.forEach((q) => {
-      qx =
-        this.registerWidget(
-          scr,
-          `qual_${q.val}`,
-          y + 3,
-          qx,
-          q.label,
-          () => {
-            this.opts.audioQuality = q.val;
-            this.statusBanner = `Качество: --audio-quality ${q.val}`;
-            this.render();
-          },
-          { radio: this.opts.audioQuality === q.val }
-        ) + 2;
-    });
+        { checked: this.opts.embedMetadata, maxWidth: videoX - c1 - 8 }
+      );
 
-    // Row 4: Video quality and subtitle file
-    scr.putStr(y + 4, c1, 'ВИДЕО:', ANSI.fgCyan + ANSI.bold);
-    let vx = c1 + 7;
-    vx =
+      scr.putStr(y + 1, videoX, 'ВИДЕО:', ANSI.fgCyan + ANSI.bold);
       this.registerWidget(
         scr,
         'flag_bvbab',
-        y + 4,
-        vx,
+        y + 1,
+        videoX + 7,
         'Видео+Аудио',
         () => {
           this.opts.bestVideoMerge = !this.opts.bestVideoMerge;
@@ -1461,123 +1591,116 @@ class EvaNodeTUI {
           this.statusBanner = this.opts.bestVideoMerge ? 'Режим видео -f "bv*+ba/b"' : 'Режим аудио -x';
           this.render();
         },
-        { checked: this.opts.bestVideoMerge }
-      ) + 2;
-    vx =
-      this.registerWidget(scr, 'flag_wsubs', y + 4, vx, 'Файл субтитров', () => this._toggle('writeSubs'), {
-        checked: this.opts.writeSubs,
-      }) + 2;
-    let mediaOptionsX =
-      this.registerWidget(scr, 'flag_esubs', y + 5, c1 + 7, 'Встроить субтитры', () => this._toggle('embedSubs'), {
-        checked: this.opts.embedSubs,
-      }) + 2;
-    this.registerWidget(scr, 'flag_wthumb', y + 5, mediaOptionsX, 'Скачать обложку', () => this._toggle('writeThumbnail'), {
-      checked: this.opts.writeThumbnail,
-      maxWidth: x + w - mediaOptionsX - 2,
-    });
-
-    // Row 6: Naming & Archive (-o & --download-archive)
-    scr.putStr(y + 6, c1, 'ФАЙЛЫ:', ANSI.fgCyan + ANSI.bold);
-    const rowRight = x + w - 2;
-    const templateX = c1 + 9;
-    const rowWidth = rowRight - templateX + 1;
-    const templateMaxWidth = Math.max(4, 4 + Math.floor(Math.max(0, rowWidth - 24) / 2));
-    const templateEnd = this.registerWidget(
-      scr,
-      'flag_otpl',
-      y + 6,
-      templateX,
-      `-o "${this.opts.outputTemplate}"`,
-      () => this._toggle('usePlaylistTemplate'),
-      {
-        checked: this.opts.usePlaylistTemplate,
-        maxWidth: templateMaxWidth,
-      }
-    );
-    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 });
+        { checked: this.opts.bestVideoMerge, maxWidth: videoRight - videoX - 6 }
+      );
+      this.registerWidget(
+        scr,
+        'flag_wthumb',
+        y + 2,
+        videoX + 7,
+        'Скачать обложку',
+        () => this._toggle('writeThumbnail'),
+        { checked: this.opts.writeThumbnail, maxWidth: videoRight - videoX - 6 }
+      );
+      this.registerWidget(
+        scr,
+        'flag_wsubs',
+        y + 3,
+        videoX + 7,
+        'Файл субтитров',
+        () => this._toggle('writeSubs'),
+        { checked: this.opts.writeSubs, maxWidth: videoRight - videoX - 6 }
+      );
+      this.registerWidget(
+        scr,
+        'flag_esubs',
+        y + 4,
+        videoX + 7,
+        'Встроить субтитры',
+        () => this._toggle('embedSubs'),
+        { checked: this.opts.embedSubs, maxWidth: videoRight - videoX - 6 }
+      );
 
-    const archiveX = templateEditEnd + 2;
-    const archiveMaxWidth = Math.max(4, rowRight - archiveX - '[✎ ]'.length);
-    const archiveEnd = this.registerWidget(
-      scr,
-      'flag_archive',
-      y + 6,
-      archiveX,
-      `История загрузки ${this.opts.archiveFile}`,
-      () => this._toggle('useDownloadArchive'),
-      {
-        checked: this.opts.useDownloadArchive,
-        maxWidth: archiveMaxWidth,
-      }
-    );
-    this.registerWidget(scr, 'edit_archive', y + 6, archiveEnd + 1, '[✎ ]', () => {
-      return this.openPrompt('Файл архива (--download-archive)', this.opts.archiveFile, (v) => {
-        this.opts.archiveFile = v || 'archive.txt';
-      });
-    }, { maxWidth: 6 });
+      renderAudioQuality(y + 5);
+      renderAudioFormat(y + 6);
+    }
 
-    // Row 7: Playlists (--playlist-items & --playlist-reverse)
-    scr.putStr(y + 7, c1, 'ПЛЕЙЛИСТ:', ANSI.fgCyan + ANSI.bold);
+    // Row 8: Playlists (--playlist-items, --playlist-reverse & --download-archive)
+    scr.putStr(y + 8, c1, 'ПЛЕЙЛИСТ:', ANSI.fgCyan + ANSI.bold);
+    const rowRight = x + w - 2;
     let px =
       this.registerWidget(
         scr,
         'flag_plitems',
-        y + 7,
-        c1 + 9,
-        `Выбрать файлы ${this.opts.playlistItems}`,
+        y + 8,
+        c1 + 10,
+        `Скачать № ${this.opts.playlistItems}`,
         () => this._toggle('usePlaylistItems'),
-        { checked: this.opts.usePlaylistItems }
+        { checked: this.opts.usePlaylistItems, maxWidth: 18 }
       ) + 1;
     px =
-      this.registerWidget(scr, 'edit_plitems', y + 7, px, '[✎ ]', () =>
+      this.registerWidget(scr, 'edit_plitems', y + 8, px, '[✎ ]', () =>
         this.openPrompt('Номера треков (--playlist-items, напр. 1-5)', this.opts.playlistItems, (v) => {
           this.opts.playlistItems = v || '1-5';
         })
-      ) + 3;
+      ) + 2;
 
-    this.registerWidget(
+    px =
+      this.registerWidget(
+        scr,
+        'flag_plrev',
+        y + 8,
+        px,
+        'С конца',
+        () => this._toggle('playlistReverse'),
+        { checked: this.opts.playlistReverse, maxWidth: Math.max(5, rowRight - px - 1) }
+      ) + 2;
+
+    const archiveEditWidth = '[✎ ]'.length;
+    const archiveFlagWidth = Math.max(5, rowRight - px - archiveEditWidth);
+    const archiveEnd = this.registerWidget(
       scr,
-      'flag_plrev',
-      y + 7,
+      'flag_archive',
+      y + 8,
       px,
-      'Загрузить плейлист с конца',
-      () => this._toggle('playlistReverse'),
-      { checked: this.opts.playlistReverse, maxWidth: x + w - px - 2 }
+      `История ${this.opts.archiveFile}`,
+      () => this._toggle('useDownloadArchive'),
+      { checked: this.opts.useDownloadArchive, maxWidth: archiveFlagWidth }
     );
+    if (archiveEnd + 1 <= rowRight) {
+      this.registerWidget(scr, 'edit_archive', y + 8, archiveEnd + 1, '[✎ ]', () => {
+        return this.openPrompt('Файл архива (--download-archive)', this.opts.archiveFile, (v) => {
+          this.opts.archiveFile = v || 'archive.txt';
+        });
+      }, { maxWidth: Math.min(6, rowRight - archiveEnd) });
+    }
 
-    // Row 9: Output directory & Add to Queue CTA button
+    // Keep the output controls on the last inner row of the options box.
+    const outputControlsRow = y + box2H - 2;
     const maxDirLen = Math.max(16, w - 48);
     const shortDir =
       this.opts.outputDir.length > maxDirLen
         ? '…' + 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', outputControlsRow, c1, `📁: ${shortDir} [✎ ]`, () =>
         this.openPrompt('Папка сохранения', this.opts.outputDir, (v) => {
           this.opts.outputDir = v || path.join(os.homedir(), 'Downloads');
         })
       ) + 3;
 
-    const ctaLabel = 'Скачать (Enter / a)';
+    const ctaLabel = '[A] Скачать';
     const ctaX = Math.max(dx, x + w - ctaLabel.length - 3);
-    this.registerWidget(scr, 'btn_add_queue', y + 9, ctaX, ctaLabel, () => this._actionAddToQueue(), {
+    this.registerWidget(scr, 'btn_add_queue', outputControlsRow, ctaX, ctaLabel, () => this._actionAddToQueue(), {
       isCta: true,
     });
 
     y += box2H;
     scr.clipRight = previousClipRight;
 
-    // Word-wrapped CLI Preview Lines (never overflows the window width)
+    // Scroll long command previews horizontally so they remain readable in compact windows.
     const fullCliText = `CLI: ${buildCommandPreview(this.opts)}`;
-    const wrappedCli = wrapTextByWords(fullCliText, w - 2);
-    const availCliRows = Math.max(1, rows - 2 - y);
-    wrappedCli.slice(0, availCliRows).forEach((line, idx) => {
-      scr.putStr(y + idx, x + 1, line, ANSI.fgYellow);
-    });
+    this._renderCliPreview(scr, x + 1, y, w - 2, fullCliText);
   }
 
   // -------------------------------------------------------------------------
@@ -1914,7 +2037,28 @@ class EvaNodeTUI {
       this.render();
     }, { isCta: true });
 
-    scr.putStr(15, c1, 'ШАБЛОНЫ ИМЕНОВАНИЯ ФАЙЛОВ (-o):', ANSI.fgCyan + ANSI.bold);
+    const namingHeading = 'ШАБЛОНЫ ИМЕНОВАНИЯ ФАЙЛОВ';
+    scr.putStr(15, c1, namingHeading, ANSI.fgCyan + ANSI.bold);
+    const namingTemplateX = c1 + namingHeading.length + 1;
+    const namingRight = x + w - 2;
+    const namingTemplateEnd = this.registerWidget(
+      scr,
+      'flag_otpl',
+      15,
+      namingTemplateX,
+      `-o "${this.opts.outputTemplate}"`,
+      () => this._toggle('usePlaylistTemplate'),
+      {
+        checked: this.opts.usePlaylistTemplate,
+        maxWidth: Math.max(5, namingRight - namingTemplateX - '[✎ ]'.length),
+      }
+    );
+    this.registerWidget(scr, 'edit_otpl', 15, namingTemplateEnd + 1, '[✎ ]', () => {
+      return this.openPrompt('Шаблон имени (-o)', this.opts.outputTemplate, (v) => {
+        this.opts.outputTemplate = v || '%(title)s.%(ext)s';
+      });
+    }, { maxWidth: 6 });
+
     NAMING_PRESETS.forEach((p, idx) => {
       this.registerWidget(
         scr,
@@ -1992,8 +2136,8 @@ class EvaNodeTUI {
       'Интегрированные флаги yt-dlp:',
       '  • Аудио: -x, --audio-format (mp3/flac/m4a/wav), --audio-quality 0, --embed-metadata, --embed-thumbnail',
       '  • Видео: -f "bv*+ba/b", --write-subs, --embed-subs, --write-thumbnail, --merge-output-format mp4',
-      '  • Файлы: -o "%(playlist_index)s. %(title)s.%(ext)s", --download-archive archive.txt',
-      '  • Плейлисты: --playlist-items 1-5, --playlist-reverse',
+      '  • Файлы (вкладка Settings): -o "%(playlist_index)s. %(title)s.%(ext)s"',
+      '  • Плейлисты: --playlist-items 1-5, --playlist-reverse, --download-archive archive.txt',
       '  • Сеть (вкладка Settings): -4, --proxy http://127.0.0.1:8080, --cookies-from-browser chrome',
       `  `,
       `  `,
@@ -2026,11 +2170,17 @@ class EvaNodeTUI {
   _setUrl(val) {
     this.opts.url = val;
     if (val) {
+      const videoMode = applyVideoModeForUrl(this.opts, val);
+      const audioMode = !videoMode && applyAudioModeForUrl(this.opts, val);
       const detected = detectSource(val, this.opts.sourceId);
       if (this.opts.sourceId !== 1) {
         this.opts.sourceId = detected.id;
       }
-      this.statusBanner = `URL (${detected.name})`;
+      this.statusBanner = videoMode
+        ? `Видео+Аудио (${detected.name})`
+        : audioMode
+          ? `Только аудио (${detected.name})`
+          : `URL (${detected.name})`;
     }
     this.render();
   }
@@ -2228,7 +2378,10 @@ function main() {
   const urlArg = argv.find((a) => !a.startsWith('-')) || '';
 
   const opts = loadSavedOptions();
-  if (urlArg) opts.url = urlArg;
+  if (urlArg) {
+    opts.url = urlArg;
+    if (!applyVideoModeForUrl(opts, urlArg)) applyAudioModeForUrl(opts, urlArg);
+  }
 
   if (isPrintCmd) {
     console.log(buildCommandPreview(opts));
@@ -2283,11 +2436,16 @@ module.exports = {
   buildPlaylistDiscoveryArgs,
   buildCommandPreview,
   detectSource,
+  isVideoUrl,
+  isAudioUrl,
+  applyVideoModeForUrl,
+  applyAudioModeForUrl,
   isYouTubePlaylistUrl,
   playlistEntryUrl,
   ScreenBuffer,
   DownloadManager,
   formatBytesToMB,
+  formatEta,
   fitTextToCellWidth,
   wrapTextByWords,
 };

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "eva-md",
-	"version": "0.6.1",
-	"description": "EVA Media Downloader CLI",
+	"version": "0.7.3",
+	"description": "Eva Media Downloader CLI",
 	"main": "eva.js",
 	"bin": {
-		"eva": "./eva.js"
+		"eva": "eva.js"
 	},
 	"files": [
 		"eva.js",