release: v0.8.6 双引擎下载与图片详情修复

Author: ChanMo

README.md

@@ -82,8 +82,14 @@ TikLocal includes a `/download` page where you can paste a media URL and enqueue
 
 Requirements:
 - `yt-dlp` (required)
+- `gallery-dl` (recommended for image/gallery posts)
 - `ffmpeg` (recommended for format merge)
 
+Download engine:
+- `yt-dlp`: video-oriented sites and links
+- `gallery-dl`: image posts/albums (Instagram/X/Pinterest, etc.)
+- Download form allows manual engine selection per task (default: `yt-dlp`)
+
 Cookie for login-only content (optional):
 - Put exported cookie files in `~/.tiklocal/cookies`
 - Filename should include domain, e.g. `x.com.txt`, `youtube.com.cookies`
@@ -93,10 +99,10 @@ Cookie for login-only content (optional):
 Example installs:
 ```bash
 # macOS (Homebrew)
-brew install yt-dlp ffmpeg
+brew install yt-dlp gallery-dl ffmpeg
 
 # Ubuntu / Debian
-sudo apt install yt-dlp ffmpeg
+sudo apt install yt-dlp gallery-dl ffmpeg
 ```
 
 ### Configuration

README_zh.md

@@ -80,8 +80,14 @@ TikLocal 新增了 `/download` 页面，可粘贴媒体 URL 并创建后台下
 
 依赖要求：
 - `yt-dlp`（必需）
+- `gallery-dl`（建议，用于图片帖/图集）
 - `ffmpeg`（建议，用于格式合并）
 
+下载引擎说明：
+- `yt-dlp`：更适合视频链接
+- `gallery-dl`：更适合图片帖与图集（如 Instagram/X/Pinterest）
+- 下载表单支持按任务手动选择引擎（默认 `yt-dlp`）
+
 登录态内容（可选）：
 - 将导出的 cookie 文件放到 `~/.tiklocal/cookies`
 - 文件名建议包含域名，例如 `x.com.txt`、`youtube.com.cookies`
@@ -91,10 +97,10 @@ TikLocal 新增了 `/download` 页面，可粘贴媒体 URL 并创建后台下
 安装示例：
 ```bash
 # macOS (Homebrew)
-brew install yt-dlp ffmpeg
+brew install yt-dlp gallery-dl ffmpeg
 
 # Ubuntu / Debian
-sudo apt install yt-dlp ffmpeg
+sudo apt install yt-dlp gallery-dl ffmpeg
 ```
 
 ### 配置

docs/release_notes.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## v0.8.6 (2026-02-21)
+- URL 下载中心升级为双引擎：支持按任务手动选择 `yt-dlp` / `gallery-dl`，并在运行状态中展示双引擎可用性与版本。
+- 下载任务模型增强：新增 `engine`、`engine_version`、`output_files_rel`、`file_count` 字段；兼容旧任务历史记录恢复。
+- 新增 `gallery-dl` 下载链路：支持 cookie 文件复用、`download-archive` 去重归档、临时目录收敛后写回媒体根目录（含重名自动避让）。
+- 修复下载列表“查看文件”跳转：图片文件改为进入 `/image` 详情页；并为 `/detail/<image>` 增加后端自动重定向兜底。
+- 更新中英文 README 与下载测试覆盖，补充双引擎使用与安装说明。
+
 ## v0.8.5 (2026-02-20)
 - 新增 URL 下载中心（`/download`）与后台任务队列：支持任务创建、取消、删除、清空历史与失败重试。
 - 新增 cookie 文件方案：支持 `~/.tiklocal/cookies` 自动匹配/手动指定、页面上传即同名覆盖更新。

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tiklocal",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "A local media server that combines the features of TikTok and Pinterest",
   "scripts": {
     "build-css": "tailwindcss -i ./tiklocal/static/input.css -o ./tiklocal/static/output.css --watch",

package.json

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "TikLocal"
-version = "0.8.5"
+version = "0.8.6"
 description = "A local media server that combines the features of TikTok and Pinterest"
 authors = ["ChanMo <chan.mo@outlook.com>"]
 readme = "README.md"

pyproject.toml

@@ -48,6 +48,8 @@ def test_download_config_api(client):
     assert res.status_code == 200
     assert data["success"] is True
     assert data["data"]["effective"]["max_concurrent"] == 2
+    assert data["data"]["effective"]["gallery_archive_enabled"] is True
+    assert "gallery_archive_file" in data["data"]["effective"]
 
     res = client.post(
         "/api/download/config",
@@ -90,9 +92,42 @@ def test_create_download_job_success(client):
     final_job = _wait_for_job(client, job_id)
     assert final_job["status"] == "success"
     assert final_job["output_path_rel"] == "mock-output.mp4"
+    assert final_job["output_files_rel"] == ["mock-output.mp4"]
+    assert final_job["file_count"] == 1
+    assert final_job["engine"] == "yt-dlp"
     assert final_job["cookie_match_mode"] == "none"
 
 
+def test_create_download_job_with_gallery_engine(client):
+    res = client.post("/api/download/jobs", json={"url": "https://example.com/post", "engine": "gallery-dl"})
+    data = res.get_json()
+    assert res.status_code == 200
+    assert data["success"] is True
+    final_job = _wait_for_job(client, data["data"]["job"]["id"])
+    assert final_job["status"] == "success"
+    assert final_job["engine"] == "gallery-dl"
+
+
+def test_create_download_job_rejects_invalid_engine(client):
+    res = client.post("/api/download/jobs", json={"url": "https://example.com/video", "engine": "wget"})
+    data = res.get_json()
+    assert res.status_code == 400
+    assert data["success"] is False
+    assert "engine" in data["error"]
+
+
+def test_detail_route_redirects_image_to_image_view(client):
+    media_root = client.application.config["MEDIA_ROOT"]
+    image_file = media_root / "from-download.JPG"
+    image_file.write_bytes(b"\x89PNG\r\n")
+
+    res = client.get("/detail/from-download.JPG", follow_redirects=False)
+    assert res.status_code in {301, 302, 308}
+    location = res.headers.get("Location", "")
+    assert location.startswith("/image?uri=")
+    assert "from-download.JPG" in location
+
+
 def test_create_download_job_validation(client):
     res = client.post("/api/download/jobs", json={"url": "file:///tmp/a.mp4"})
     data = res.get_json()
@@ -128,6 +163,7 @@ def test_download_probe_api(client):
     assert res.status_code == 200
     assert data["success"] is True
     assert "yt_dlp_available" in data["data"]
+    assert "gallery_dl_available" in data["data"]
     assert "ffmpeg_available" in data["data"]
 
 
@@ -200,7 +236,7 @@ def fail_execute(self, job_id):  # noqa: ARG001
         return 1, "network", ""
 
     monkeypatch.setattr("tiklocal.services.downloader.DownloadManager._execute_download", fail_execute)
-    res = client.post("/api/download/jobs", json={"url": "https://example.com/fail"})
+    res = client.post("/api/download/jobs", json={"url": "https://example.com/fail", "engine": "gallery-dl"})
     data = res.get_json()
     assert res.status_code == 200
     failed_job = _wait_for_job(client, data["data"]["job"]["id"])
@@ -216,6 +252,7 @@ def ok_execute(self, job_id):  # noqa: ARG001
     new_job_id = retry_data["data"]["job"]["id"]
     assert new_job_id != failed_job["id"]
     assert retry_data["data"]["job"]["retry_of"] == failed_job["id"]
+    assert retry_data["data"]["job"]["engine"] == "gallery-dl"
     final = _wait_for_job(client, new_job_id)
     assert final["status"] == "success"
 

tests/test_download.py

@@ -10,7 +10,7 @@
 from flask import Flask, render_template, send_from_directory, request, redirect, send_file
 
 # Service Imports
-from tiklocal.services import LibraryService, FavoriteService, RecommendService
+from tiklocal.services import LibraryService, FavoriteService, RecommendService, IMAGE_EXTENSIONS
 from tiklocal.services.thumbnail import ThumbnailService
 from tiklocal.services.metadata import (
     ImageMetadataStore,
@@ -287,6 +287,9 @@ def detail_view(name):
         target = library_service.resolve_path(name)
         if not target or not target.exists():
             return "File not found", 404
+
+        if target.suffix.lower() in IMAGE_EXTENSIONS:
+            return redirect(f"/image?uri={quote(name)}")
 
         # Context navigation (prev/next)
         # Note: Re-scanning every request is inefficient for large libraries, 
@@ -469,6 +472,7 @@ def api_download_jobs():
             job = download_manager.enqueue(
                 validated['url'],
                 save_mode=validated['save_mode'],
+                engine=validated.get('engine', 'yt-dlp'),
                 cookie_mode=validated.get('cookie_mode', 'auto'),
                 cookie_file=validated.get('cookie_file', ''),
             )