Merge pull request 'feat(web): local image packaging — drag-and-drop or folder picker to CBZ' (#2) from feature/upload into main

- Paginate comic grid at 48 per page with smart page number controls
- Bind container port to 0.0.0.0 so Tailscale traffic can reach WSL2

README.md

@@ -1,6 +1,6 @@
 # yoink
 
-A tool for downloading comics from readallcomics.com and packaging them as `.cbz` archives. Available as a CLI command or a self-hosted web application.
+A tool for downloading comics from readallcomics.com and packaging them as `.cbz` archives. Available as a CLI command or a self-hosted web application. The web UI also lets you package local image folders into `.cbz` archives directly from your browser.
 
 ## How it works
 
@@ -59,6 +59,8 @@ The comic title is extracted from the page and used to name the archive. Output
 
 Yoink includes a self-hosted web interface for browsing and downloading comics from your browser.
 
+![Yoink Web UI](Screenshot_01.png)
+
 ### Running directly
 
 ```shell
@@ -90,10 +92,21 @@ The web UI is then available at `http://localhost:8080`.
 ### Features
 
 - **Download queue** — paste a comic URL into the input bar and track download progress in real time
-- **Library grid** — browse your downloaded comics as a 150×300 cover grid
+- **Local packaging** — drag and drop a folder of images (or use the file picker) to package them as a `.cbz` archive and add it to your library without downloading anything
+- **Library grid** — browse your comics as a 150×300 cover grid with title-initial placeholders for missing covers
 - **Filter & sort** — filter by title and sort by newest, oldest, A–Z, or Z–A
 - **One-click download** — click any cover to download the `.cbz` archive directly
 
+#### Packaging local images
+
+Click the upload icon (↑) in the header to open the packaging panel. Enter a title, then either:
+
+- **Drag and drop** a folder or image files onto the drop zone
+- **Select folder** to pick an entire directory at once
+- **Select files** to pick individual images
+
+Images are sorted by filename, the first image is used as the cover, and the result is saved to your library as `<Title>/<Title>.cbz`.
+
 ### Library volume
 
 Downloaded comics are stored at the path set by `YOINK_LIBRARY`. When using Docker, mount this as a volume to persist your library across container restarts:

web/server.go

@@ -1,9 +1,11 @@
 package web
 
 import (
+	"archive/zip"
 	"embed"
 	"encoding/json"
 	"fmt"
+	"io"
 	"io/fs"
 	"net/http"
 	"net/url"
@@ -72,6 +74,7 @@ func (s *Server) Handler() http.Handler {
 
 	// API
 	mux.HandleFunc("/api/download", s.handleDownload)
+	mux.HandleFunc("/api/upload", s.handleUpload)
 	mux.HandleFunc("/api/comics", s.handleComics)
 	mux.HandleFunc("/api/jobs", s.handleJobs)
 	mux.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
@@ -240,6 +243,114 @@ func (s *Server) handleJobs(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(jobs)
 }
 
+func (s *Server) handleUpload(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPost {
+		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+		return
+	}
+
+	// 500 MB limit
+	if err := r.ParseMultipartForm(500 << 20); err != nil {
+		http.Error(w, "request too large", http.StatusRequestEntityTooLarge)
+		return
+	}
+
+	title := strings.TrimSpace(r.FormValue("title"))
+	if title == "" {
+		http.Error(w, "title required", http.StatusBadRequest)
+		return
+	}
+	// Sanitize: no path separators or shell-special characters
+	title = filepath.Base(title)
+	title = strings.Map(func(r rune) rune {
+		if strings.ContainsRune(`/\:*?"<>|`, r) {
+			return '_'
+		}
+		return r
+	}, title)
+
+	fileHeaders := r.MultipartForm.File["images"]
+	if len(fileHeaders) == 0 {
+		http.Error(w, "no images provided", http.StatusBadRequest)
+		return
+	}
+
+	// Sort by original filename so page order is preserved
+	sort.Slice(fileHeaders, func(i, j int) bool {
+		return fileHeaders[i].Filename < fileHeaders[j].Filename
+	})
+
+	dir := filepath.Join(s.libraryPath, title)
+	if err := os.MkdirAll(dir, 0o755); err != nil {
+		http.Error(w, "failed to create directory", http.StatusInternalServerError)
+		return
+	}
+
+	cbzPath := filepath.Join(dir, title+".cbz")
+	cbzFile, err := os.Create(cbzPath)
+	if err != nil {
+		http.Error(w, "failed to create archive", http.StatusInternalServerError)
+		return
+	}
+	defer cbzFile.Close()
+
+	zw := zip.NewWriter(cbzFile)
+	defer zw.Close()
+
+	imageExts := map[string]bool{".jpg": true, ".jpeg": true, ".png": true, ".webp": true}
+	idx := 1
+
+	for _, fh := range fileHeaders {
+		ext := strings.ToLower(filepath.Ext(fh.Filename))
+		if !imageExts[ext] {
+			continue
+		}
+		if ext == ".jpeg" {
+			ext = ".jpg"
+		}
+
+		entryName := fmt.Sprintf("%03d%s", idx, ext)
+
+		src, err := fh.Open()
+		if err != nil {
+			continue
+		}
+
+		// Save first image as cover: "<Title> 001.jpg"
+		if idx == 1 {
+			coverPath := filepath.Join(dir, title+" "+entryName)
+			if cf, err := os.Create(coverPath); err == nil {
+				io.Copy(cf, src)
+				cf.Close()
+				src.Close()
+				src, err = fh.Open()
+				if err != nil {
+					continue
+				}
+			}
+		}
+
+		ze, err := zw.Create(entryName)
+		if err != nil {
+			src.Close()
+			continue
+		}
+		io.Copy(ze, src)
+		src.Close()
+		idx++
+	}
+
+	if idx == 1 {
+		// Nothing was written — no valid images
+		os.RemoveAll(dir)
+		http.Error(w, "no valid images in upload", http.StatusBadRequest)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(map[string]string{"title": title, "status": "complete"})
+}
+
 func Listen(addr string, libraryPath string) error {
 	srv := NewServer(libraryPath)
 	fmt.Printf("Yoink web server listening on %s\n", addr)

web/static/index.html

@@ -39,6 +39,8 @@
       font-family: 'Inter', -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
       font-size: 14px;
       min-height: 100vh;
+      display: flex;
+      flex-direction: column;
     }
 
     /* Subtle dot grid background */
@@ -256,7 +258,7 @@
     .dismiss-btn:hover { color: var(--text); background: var(--border); }
 
     /* ── Main ────────────────────────────────────────────────────────────── */
-    main { padding: 32px 28px; }
+    main { padding: 32px 28px; flex: 1; }
 
     /* ── Library toolbar ─────────────────────────────────────────────────── */
     .library-toolbar {
@@ -400,15 +402,12 @@
     }
 
     /* Download overlay on hover */
-    .comic-card::after {
+    .comic-download-overlay {
-      content: '↓';
       position: absolute;
       inset: 0;
       display: flex;
       align-items: center;
       justify-content: center;
-      font-size: 2.2rem;
-      font-weight: 700;
       color: #fff;
       background: rgba(91, 140, 245, 0.72);
       backdrop-filter: blur(3px);
@@ -418,7 +417,7 @@
       z-index: 3;
     }
 
-    .comic-card:hover::after { opacity: 1; }
+    .comic-card:hover .comic-download-overlay { opacity: 1; }
 
     .comic-cover-placeholder {
       width: 100%;
@@ -431,6 +430,15 @@
 
     .comic-cover-placeholder svg { opacity: 0.2; }
 
+    .comic-cover-placeholder .placeholder-initials {
+      font-size: 3.5rem;
+      font-weight: 800;
+      color: rgba(255,255,255,0.18);
+      line-height: 1;
+      letter-spacing: -0.02em;
+      user-select: none;
+    }
+
     .comic-info {
       position: absolute;
       bottom: 0; left: 0; right: 0;
@@ -450,6 +458,44 @@
       text-shadow: 0 1px 4px rgba(0,0,0,0.8);
     }
 
+    /* ── Pagination ──────────────────────────────────────────────────────── */
+    #pagination {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 4px;
+      margin-top: 36px;
+      padding-bottom: 36px;
+      flex-wrap: wrap;
+    }
+
+    .page-btn {
+      height: 34px;
+      min-width: 34px;
+      padding: 0 12px;
+      background: var(--surface2);
+      border: 1px solid var(--border);
+      border-radius: var(--radius-sm);
+      color: var(--text2);
+      font-family: inherit;
+      font-size: 0.8rem;
+      font-weight: 600;
+      cursor: pointer;
+      transition: border-color 0.12s, color 0.12s, background 0.12s;
+      white-space: nowrap;
+    }
+
+    .page-btn:hover:not(:disabled) { border-color: var(--accent); color: var(--text); }
+    .page-btn:disabled { opacity: 0.3; cursor: not-allowed; }
+    .page-btn.active { background: var(--accent-dim); border-color: var(--accent); color: var(--accent); }
+
+    .page-ellipsis {
+      color: var(--muted);
+      font-size: 0.8rem;
+      padding: 0 4px;
+      line-height: 34px;
+    }
+
     /* ── Skeleton loading cards ──────────────────────────────────────────── */
     .skeleton-card {
       width: 150px;
@@ -496,6 +542,20 @@
       line-height: 1.5;
     }
 
+    .empty-hint {
+      font-size: 0.76rem !important;
+      font-style: italic;
+      color: var(--muted) !important;
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+
+    .empty-hint svg {
+      flex-shrink: 0;
+      opacity: 0.5;
+    }
+
     /* ── Toasts ──────────────────────────────────────────────────────────── */
     #toast {
       position: fixed;
@@ -527,11 +587,240 @@
     .toast-msg.is-error { border-left-color: var(--error); }
     .toast-msg.fade { opacity: 0; }
 
+    /* ── Upload button ───────────────────────────────────────────────────── */
+    .upload-btn {
+      height: 36px;
+      width: 36px;
+      background: var(--surface2);
+      border: 1px solid var(--border);
+      border-radius: var(--radius);
+      color: var(--text2);
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+      transition: background 0.15s, border-color 0.15s, color 0.15s;
+    }
+
+    .upload-btn:hover { background: var(--border); border-color: var(--border2); color: var(--text); }
+
+    /* ── Upload modal ────────────────────────────────────────────────────── */
+    .modal-backdrop {
+      position: fixed;
+      inset: 0;
+      background: rgba(0,0,0,0.6);
+      backdrop-filter: blur(4px);
+      -webkit-backdrop-filter: blur(4px);
+      z-index: 200;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      opacity: 0;
+      pointer-events: none;
+      transition: opacity 0.2s;
+    }
+
+    .modal-backdrop.open { opacity: 1; pointer-events: all; }
+
+    .modal {
+      background: var(--surface);
+      border: 1px solid var(--border2);
+      border-radius: 12px;
+      padding: 28px;
+      width: 480px;
+      max-width: calc(100vw - 32px);
+      box-shadow: 0 24px 80px rgba(0,0,0,0.6);
+      transform: translateY(12px);
+      transition: transform 0.2s;
+      display: flex;
+      flex-direction: column;
+      gap: 18px;
+    }
+
+    .modal-backdrop.open .modal { transform: translateY(0); }
+
+    .modal-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+
+    .modal-title {
+      font-size: 0.95rem;
+      font-weight: 700;
+      color: var(--text);
+    }
+
+    .modal-close {
+      background: none;
+      border: none;
+      color: var(--muted);
+      cursor: pointer;
+      font-size: 1.2rem;
+      line-height: 1;
+      width: 28px;
+      height: 28px;
+      border-radius: var(--radius-sm);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: color 0.12s, background 0.12s;
+    }
+
+    .modal-close:hover { color: var(--text); background: var(--border); }
+
+    .upload-title-input {
+      width: 100%;
+      height: 38px;
+      padding: 0 14px;
+      background: var(--surface2);
+      border: 1px solid var(--border);
+      border-radius: var(--radius);
+      color: var(--text);
+      font-family: inherit;
+      font-size: 0.875rem;
+      outline: none;
+      transition: border-color 0.15s, box-shadow 0.15s;
+    }
+
+    .upload-title-input::placeholder { color: var(--muted); }
+
+    .upload-title-input:focus {
+      border-color: var(--accent);
+      box-shadow: 0 0 0 3px rgba(91,140,245,0.15);
+    }
+
+    .drop-zone {
+      border: 2px dashed var(--border2);
+      border-radius: var(--radius);
+      padding: 36px 20px;
+      text-align: center;
+      cursor: pointer;
+      transition: border-color 0.15s, background 0.15s;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 10px;
+      color: var(--muted);
+    }
+
+    .drop-zone:hover, .drop-zone.drag-over {
+      border-color: var(--accent);
+      background: var(--accent-dim);
+      color: var(--text2);
+    }
+
+    .drop-zone svg { opacity: 0.5; }
+    .drop-zone.drag-over svg { opacity: 0.8; }
+
+    .drop-zone-label {
+      font-size: 0.85rem;
+      font-weight: 500;
+      color: var(--text2);
+    }
+
+    .drop-zone-sub {
+      font-size: 0.75rem;
+      color: var(--muted);
+    }
+
+    .drop-zone-actions {
+      display: flex;
+      gap: 8px;
+      margin-top: 4px;
+    }
+
+    .pick-btn {
+      height: 30px;
+      padding: 0 14px;
+      background: var(--surface2);
+      border: 1px solid var(--border2);
+      border-radius: var(--radius-sm);
+      color: var(--text2);
+      font-family: inherit;
+      font-size: 0.75rem;
+      font-weight: 600;
+      cursor: pointer;
+      transition: border-color 0.12s, color 0.12s, background 0.12s;
+    }
+
+    .pick-btn:hover { border-color: var(--accent); color: var(--text); background: var(--accent-dim); }
+
+    .file-count {
+      font-size: 0.78rem;
+      color: var(--accent);
+      font-weight: 600;
+      min-height: 1.2em;
+    }
+
+    .upload-progress {
+      height: 3px;
+      background: var(--border);
+      border-radius: 999px;
+      overflow: hidden;
+      display: none;
+    }
+
+    .upload-progress-bar {
+      height: 100%;
+      background: var(--accent);
+      border-radius: 999px;
+      width: 0%;
+      transition: width 0.2s;
+    }
+
+    .modal-submit {
+      height: 40px;
+      background: var(--accent);
+      color: #fff;
+      border: none;
+      border-radius: var(--radius);
+      font-family: inherit;
+      font-size: 0.875rem;
+      font-weight: 700;
+      cursor: pointer;
+      transition: background 0.15s, transform 0.1s;
+    }
+
+    .modal-submit:hover  { background: var(--accent-hv); }
+    .modal-submit:active { transform: scale(0.98); }
+    .modal-submit:disabled { opacity: 0.4; cursor: not-allowed; transform: none; }
+
+    .toast-icon {
+      display: inline-flex;
+      align-items: center;
+      flex-shrink: 0;
+      margin-right: 7px;
+      vertical-align: middle;
+      position: relative;
+      top: -1px;
+    }
+
     @keyframes slideIn {
       from { transform: translateX(32px); opacity: 0; }
       to   { transform: translateX(0);   opacity: 1; }
     }
 
+    /* ── Footer ──────────────────────────────────────────────────────────── */
+    footer {
+      position: relative;
+      z-index: 1;
+      text-align: center;
+      padding: 14px 28px;
+      font-size: 0.72rem;
+      color: var(--muted);
+      border-top: 1px solid var(--border);
+    }
+
+    footer a {
+      color: var(--muted);
+      text-decoration: none;
+      transition: color 0.15s;
+    }
+
+    footer a:hover { color: var(--text2); }
+
     /* ── Responsive — tablet ─────────────────────────────────────────────── */
     @media (max-width: 860px) {
       .url-form { max-width: 100%; }
@@ -620,8 +909,46 @@
       />
       <button class="url-btn" id="url-btn" type="submit">Download</button>
     </form>
+
+    <button class="upload-btn" id="upload-open-btn" title="Package local images as CBZ">
+      <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round">
+        <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/>
+        <polyline points="17 8 12 3 7 8"/>
+        <line x1="12" y1="3" x2="12" y2="15"/>
+      </svg>
+    </button>
   </header>
 
+  <!-- Upload modal -->
+  <div class="modal-backdrop" id="upload-modal">
+    <div class="modal" role="dialog" aria-modal="true" aria-labelledby="modal-title-label">
+      <div class="modal-header">
+        <span class="modal-title" id="modal-title-label">Package images as CBZ</span>
+        <button class="modal-close" id="upload-close-btn" aria-label="Close">&times;</button>
+      </div>
+
+      <input class="upload-title-input" id="upload-title" type="text" placeholder="Comic title…" autocomplete="off" />
+
+      <div class="drop-zone" id="drop-zone">
+        <svg width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+          <rect x="3" y="3" width="18" height="18" rx="2"/>
+          <path d="M3 9h18M9 21V9"/>
+        </svg>
+        <span class="drop-zone-label">Drop images or a folder here</span>
+        <span class="drop-zone-sub">JPG, PNG, WebP — sorted by filename</span>
+        <div class="drop-zone-actions">
+          <button class="pick-btn" id="pick-folder-btn" type="button">Select folder</button>
+          <button class="pick-btn" id="pick-files-btn" type="button">Select files</button>
+        </div>
+      </div>
+
+      <div class="file-count" id="file-count"></div>
+      <div class="upload-progress" id="upload-progress"><div class="upload-progress-bar" id="upload-progress-bar"></div></div>
+
+      <button class="modal-submit" id="upload-submit-btn" disabled>Package &amp; add to library</button>
+    </div>
+  </div>
+
   <div id="queue"></div>
 
   <main>
@@ -639,12 +966,13 @@
       <div class="sort-group">
         <button class="sort-btn active" data-sort="newest">Newest</button>
         <button class="sort-btn" data-sort="oldest">Oldest</button>
-        <button class="sort-btn" data-sort="az">A–Z</button>
+        <button class="sort-btn" data-sort="az">A&ndash;Z</button>
-        <button class="sort-btn" data-sort="za">Z–A</button>
+        <button class="sort-btn" data-sort="za">Z&ndash;A</button>
       </div>
     </div>
 
     <div id="comics-grid"></div>
+    <div id="pagination"></div>
 
     <div id="empty-state">
       <div class="empty-box">
@@ -654,17 +982,34 @@
         </svg>
       </div>
       <p>No comics yet — paste a URL above to start building your library.</p>
+      <p class="empty-hint">
+        <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+          <path d="M12 19V5M5 12l7-7 7 7"/>
+        </svg>
+        Your downloaded comics will appear here
+      </p>
     </div>
   </main>
 
+  <footer>
+    <a href="https://github.com/brizzbuzz/yoink-go" target="_blank" rel="noopener">Yoink</a>
+    &nbsp;&middot;&nbsp; v1.1.0
+  </footer>
+
   <div id="toast"></div>
 
+  <!-- Hidden file inputs for upload modal -->
+  <input type="file" id="file-input-folder" style="display:none" multiple webkitdirectory />
+  <input type="file" id="file-input-files" style="display:none" multiple accept="image/*" />
+
   <script>
     // ── State ──────────────────────────────────────────────────────────────
+    const PAGE_SIZE   = 48;
     let knownJobs     = {};
     let dismissedJobs = JSON.parse(localStorage.getItem('dismissedJobs') || '{}');
     let allComics     = [];
     let currentSort   = localStorage.getItem('comicSort') || 'newest';
+    let currentPage   = 1;
 
     // ── DOM refs ───────────────────────────────────────────────────────────
     const form        = document.getElementById('url-form');
@@ -784,7 +1129,7 @@
     }
 
     // ── Filter & sort ──────────────────────────────────────────────────────
-    function applyFilterAndSort() {
+    function applyFilterAndSort(resetPage = false) {
       const query = filterInput.value.trim().toLowerCase();
 
       let comics = query
@@ -799,7 +1144,56 @@
         comics = comics.slice().sort((a, b) => b.title.localeCompare(a.title));
       }
 
-      renderComics(comics);
+      const totalPages = Math.max(1, Math.ceil(comics.length / PAGE_SIZE));
+      if (resetPage || currentPage > totalPages) currentPage = 1;
+
+      const paged = comics.slice((currentPage - 1) * PAGE_SIZE, currentPage * PAGE_SIZE);
+      renderComics(paged);
+      renderPagination(totalPages);
+    }
+
+    function renderPagination(totalPages) {
+      const el = document.getElementById('pagination');
+      el.innerHTML = '';
+      if (totalPages <= 1) return;
+
+      const mkBtn = (label, page, active = false, disabled = false) => {
+        const b = document.createElement('button');
+        b.className = 'page-btn' + (active ? ' active' : '');
+        b.textContent = label;
+        b.disabled = disabled;
+        b.addEventListener('click', () => {
+          currentPage = page;
+          applyFilterAndSort();
+          window.scrollTo({ top: 0, behavior: 'smooth' });
+        });
+        return b;
+      };
+
+      const mkEllipsis = () => {
+        const s = document.createElement('span');
+        s.className = 'page-ellipsis';
+        s.textContent = '…';
+        return s;
+      };
+
+      el.append(mkBtn('← Prev', currentPage - 1, false, currentPage === 1));
+
+      // Page numbers with ellipsis: always show first, last, and window around current
+      const pages = new Set([1, totalPages]);
+      for (let p = currentPage - 2; p <= currentPage + 2; p++) {
+        if (p > 1 && p < totalPages) pages.add(p);
+      }
+      const sorted = [...pages].sort((a, b) => a - b);
+
+      let prev = 0;
+      for (const p of sorted) {
+        if (p - prev > 1) el.append(mkEllipsis());
+        el.append(mkBtn(p, p, p === currentPage));
+        prev = p;
+      }
+
+      el.append(mkBtn('Next →', currentPage + 1, false, currentPage === totalPages));
     }
 
     // ── Render comics ──────────────────────────────────────────────────────
@@ -827,12 +1221,19 @@
           img.src = comic.cover_url;
           img.alt = comic.title;
           img.loading = 'lazy';
-          img.onerror = () => img.replaceWith(makePlaceholder());
+          img.onerror = () => img.replaceWith(makePlaceholder(comic.title));
           a.append(img);
         } else {
-          a.append(makePlaceholder());
+          a.append(makePlaceholder(comic.title));
         }
 
+        const overlay = document.createElement('div');
+        overlay.className = 'comic-download-overlay';
+        overlay.innerHTML = `<svg width="28" height="28" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+          <path d="M12 3v13M5 14l7 7 7-7"/><path d="M3 21h18"/>
+        </svg>`;
+        a.append(overlay);
+
         const info = document.createElement('div');
         info.className = 'comic-info';
 
@@ -846,15 +1247,26 @@
       });
     }
 
-    function makePlaceholder() {
+    function makePlaceholder(title) {
       const div = document.createElement('div');
       div.className = 'comic-cover-placeholder';
+      if (title) {
+        const words = title.trim().split(/\s+/).filter(Boolean);
+        const initials = words.length === 1
+          ? words[0].slice(0, 2)
+          : (words[0][0] + words[1][0]);
+        const span = document.createElement('span');
+        span.className = 'placeholder-initials';
+        span.textContent = initials.toUpperCase();
+        div.append(span);
+      } else {
         div.innerHTML = `
           <svg width="40" height="40" viewBox="0 0 24 24" fill="none"
                stroke="currentColor" stroke-width="1.2">
             <rect x="3" y="3" width="18" height="18" rx="2"/>
             <path d="M3 9h18M9 21V9"/>
           </svg>`;
+      }
       return div;
     }
 
@@ -872,7 +1284,20 @@
     function toast(msg, isError = false) {
       const el = document.createElement('div');
       el.className = 'toast-msg' + (isError ? ' is-error' : '');
-      el.textContent = msg;
+
+      const icon = document.createElement('span');
+      icon.className = 'toast-icon';
+      if (isError) {
+        icon.innerHTML = `<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--error)" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+          <circle cx="12" cy="12" r="10"/><path d="M15 9l-6 6M9 9l6 6"/>
+        </svg>`;
+      } else {
+        icon.innerHTML = `<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--success)" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+          <circle cx="12" cy="12" r="10"/><path d="M8 12l3 3 5-5"/>
+        </svg>`;
+      }
+
+      el.append(icon, document.createTextNode(msg));
       toastEl.append(el);
       setTimeout(() => {
         el.classList.add('fade');
@@ -921,16 +1346,165 @@
         currentSort = b.dataset.sort;
         localStorage.setItem('comicSort', currentSort);
         sortBtns.forEach(x => x.classList.toggle('active', x === b));
-        applyFilterAndSort();
+        applyFilterAndSort(true);
       });
     });
 
-    filterInput.addEventListener('input', applyFilterAndSort);
+    filterInput.addEventListener('input', () => applyFilterAndSort(true));
 
     showSkeletons();
     fetchComics();
     setInterval(pollJobs, 2000);
     setInterval(fetchComics, 10000);
+
+    // ── Upload modal ───────────────────────────────────────────────────────
+    const uploadModal      = document.getElementById('upload-modal');
+    const uploadOpenBtn    = document.getElementById('upload-open-btn');
+    const uploadCloseBtn   = document.getElementById('upload-close-btn');
+    const uploadTitleInput = document.getElementById('upload-title');
+    const dropZone         = document.getElementById('drop-zone');
+    const pickFolderBtn    = document.getElementById('pick-folder-btn');
+    const pickFilesBtn     = document.getElementById('pick-files-btn');
+    const fileInputFolder  = document.getElementById('file-input-folder');
+    const fileInputFiles   = document.getElementById('file-input-files');
+    const fileCountEl      = document.getElementById('file-count');
+    const uploadProgress   = document.getElementById('upload-progress');
+    const uploadProgressBar= document.getElementById('upload-progress-bar');
+    const uploadSubmitBtn  = document.getElementById('upload-submit-btn');
+
+    let pendingFiles = [];
+
+    const IMAGE_EXTS = new Set(['.jpg', '.jpeg', '.png', '.webp']);
+
+    function isImage(name) {
+      const ext = name.slice(name.lastIndexOf('.')).toLowerCase();
+      return IMAGE_EXTS.has(ext);
+    }
+
+    function setFiles(fileList) {
+      const imgs = Array.from(fileList).filter(f => isImage(f.name));
+      imgs.sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true }));
+      pendingFiles = imgs;
+      fileCountEl.textContent = imgs.length
+        ? `${imgs.length} image${imgs.length !== 1 ? 's' : ''} selected`
+        : '';
+      uploadSubmitBtn.disabled = imgs.length === 0 || !uploadTitleInput.value.trim();
+    }
+
+    function openModal() {
+      uploadModal.classList.add('open');
+      uploadTitleInput.focus();
+    }
+
+    function closeModal() {
+      uploadModal.classList.remove('open');
+      pendingFiles = [];
+      fileCountEl.textContent = '';
+      uploadTitleInput.value = '';
+      uploadSubmitBtn.disabled = true;
+      uploadProgress.style.display = 'none';
+      uploadProgressBar.style.width = '0%';
+      fileInputFolder.value = '';
+      fileInputFiles.value = '';
+    }
+
+    uploadOpenBtn.addEventListener('click', openModal);
+    uploadCloseBtn.addEventListener('click', closeModal);
+    uploadModal.addEventListener('click', e => { if (e.target === uploadModal) closeModal(); });
+    document.addEventListener('keydown', e => { if (e.key === 'Escape' && uploadModal.classList.contains('open')) closeModal(); });
+
+    pickFolderBtn.addEventListener('click', () => fileInputFolder.click());
+    pickFilesBtn.addEventListener('click',  () => fileInputFiles.click());
+
+    fileInputFolder.addEventListener('change', e => {
+      // Auto-fill title from folder name via webkitRelativePath
+      const files = Array.from(e.target.files);
+      if (files.length && !uploadTitleInput.value.trim()) {
+        const rel = files[0].webkitRelativePath;
+        if (rel) uploadTitleInput.value = rel.split('/')[0];
+      }
+      setFiles(e.target.files);
+    });
+
+    fileInputFiles.addEventListener('change', e => setFiles(e.target.files));
+
+    uploadTitleInput.addEventListener('input', () => {
+      uploadSubmitBtn.disabled = pendingFiles.length === 0 || !uploadTitleInput.value.trim();
+    });
+
+    // Drag & drop
+    dropZone.addEventListener('dragover', e => {
+      e.preventDefault();
+      dropZone.classList.add('drag-over');
+    });
+    dropZone.addEventListener('dragleave', () => dropZone.classList.remove('drag-over'));
+    dropZone.addEventListener('drop', async e => {
+      e.preventDefault();
+      dropZone.classList.remove('drag-over');
+
+      const collected = [];
+      const entries = Array.from(e.dataTransfer.items)
+        .filter(i => i.kind === 'file')
+        .map(i => i.webkitGetAsEntry());
+
+      async function readEntry(entry) {
+        if (entry.isFile) {
+          await new Promise(res => entry.file(f => { collected.push(f); res(); }));
+        } else if (entry.isDirectory) {
+          if (!uploadTitleInput.value.trim()) uploadTitleInput.value = entry.name;
+          const reader = entry.createReader();
+          await new Promise(res => reader.readEntries(async entries => {
+            for (const e of entries) await readEntry(e);
+            res();
+          }));
+        }
+      }
+
+      for (const entry of entries) if (entry) await readEntry(entry);
+      setFiles(collected);
+    });
+
+    // Submit
+    uploadSubmitBtn.addEventListener('click', async () => {
+      const title = uploadTitleInput.value.trim();
+      if (!title || pendingFiles.length === 0) return;
+
+      uploadSubmitBtn.disabled = true;
+      uploadProgress.style.display = 'block';
+
+      const form = new FormData();
+      form.append('title', title);
+      pendingFiles.forEach(f => form.append('images', f, f.name));
+
+      const xhr = new XMLHttpRequest();
+      xhr.open('POST', '/api/upload');
+
+      xhr.upload.addEventListener('progress', e => {
+        if (e.lengthComputable) {
+          uploadProgressBar.style.width = Math.round((e.loaded / e.total) * 100) + '%';
+        }
+      });
+
+      xhr.addEventListener('load', () => {
+        if (xhr.status === 200) {
+          toast(`"${title}" added to library`);
+          closeModal();
+          fetchComics();
+        } else {
+          toast('Upload failed: ' + xhr.responseText, true);
+          uploadSubmitBtn.disabled = false;
+          uploadProgress.style.display = 'none';
+        }
+      });
+
+      xhr.addEventListener('error', () => {
+        toast('Upload failed', true);
+        uploadSubmitBtn.disabled = false;
+        uploadProgress.style.display = 'none';
+      });
+
+      xhr.send(form);
+    });
   </script>
 </body>
 </html>