refactor: 重构复制粘贴写入 Cookie 功能

复制粘贴写入 Cookie 功能 已经重构为 从剪贴板读取 Cookie 功能；直接从剪贴板读取内容，避免内容过长超出终端限制

Author: JoeanAmier

README.md

@@ -58,7 +58,7 @@
 * ✅ 采集抖音热榜数据
 * ✅ 记录已下载作品 ID
 * ☑️ ~~扫码登陆获取 Cookie~~
-* ✅ 从浏览器获取 Cookie
+* ✅ 从浏览器读取 Cookie
 * ✅ 支持 Web API 调用
 * ✅ 支持多线程下载作品
 * ✅ 文件完整性处理机制
@@ -146,17 +146,17 @@ demo()
 </li>
 <li>阅读 DouK-Downloader 的免责声明，根据提示输入内容</li>
 <li>将 Cookie 信息写入配置文件
-<ol><b>手动复制粘贴 Cookie</b>
+<ol><b>从剪贴板读取 Cookie</b>
 <li>参考 <a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">Cookie 提取教程</a>，复制所需 Cookie 至剪贴板</li>
-<li>选择 <code>复制粘贴写入 Cookie</code> 选项，按照提示将 Cookie 写入配置文件</li>
+<li>选择 <code>从剪贴板读取 Cookie</code> 选项，程序会自动读取剪贴板的 Cookie 并写入配置文件</li>
 </ol>
-<ol><b>从浏览器获取 Cookie</b>
-<li>选择 <code>从浏览器获取 Cookie</code> 选项，按照提示选择浏览器类型</li>
+<ol><b>从浏览器读取 Cookie</b>
+<li>选择 <code>从浏览器读取 Cookie</code> 选项，按照提示输入浏览器类型或序号</li>
 </ol>
 <ol><b><del>扫码登录获取 Cookie</del>（失效）</b>
 <li><del>选择 <code>扫码登录获取 Cookie</code> 选项，程序会显示登录二维码图片，并使用默认应用打开图片</del></li>
 <li><del>使用抖音 APP 扫描二维码并登录账号</del></li>
-<li><del>按照提示操作，将 Cookie 写入配置文件</del></li>
+<li><del>按照提示操作，程序会自动将 Cookie 写入配置文件</del></li>
 </ol>
 </li>
 <li>返回程序界面，依次选择 <code>终端交互模式</code> -> <code>批量下载链接作品(通用)</code> -> <code>手动输入待采集的作品链接</code></li>
@@ -182,7 +182,7 @@ demo()
 </ul>
 </li>
 </ol>
-<p>Docker 容器无法直接访问宿主机的文件系统，部分功能不可用，例如：<code>从浏览器获取 Cookie</code>；其他功能如有异常请反馈！</p>
+<p>Docker 容器无法直接访问宿主机的文件系统，部分功能不可用，例如：<code>从浏览器读取 Cookie</code>；其他功能如有异常请反馈！</p>
 
 <hr>
 

README_EN.md

@@ -151,18 +151,18 @@ demo()
 </ol>
 </li>
 <li>Read the disclaimer of DouK-Downloader and enter content according to the prompt.</li>
-<li>Write Cookie information into the configuration file
-<ol><b>Manually copy and paste Cookie</b>
-<li>Refer to <a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">Cookie Extraction Tutorial</a>, copy the required Cookie to the clipboard.</li>
-<li>Select the option to <code>copy and paste to write Cookie</code>, and follow the prompts to write the Cookie into the configuration file.</li>
+<li>Write Cookie Information into Configuration File 
+<ol><b>Read Cookie from Clipboard</b>
+<li>Refer to the <a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">Cookie Extraction Tutorial</a>, copy the required Cookie to the clipboard</li>
+<li>Select the <code>Read Cookie from Clipboard</code> option, the program will automatically read the Cookie from the clipboard and write it into the configuration file</li>
 </ol>
-<ol><b>Get Cookie from Browser</b>
-<li>Select the option <code>Get Cookie from Browser</code> and follow the prompts to choose the browser type.</li>
+<ol><b>Read Cookie from Browser</b>
+<li>Select the <code>Read Cookie from Browser</code> option, then follow the prompts to input the browser type or its corresponding number</li>
 </ol>
-<ol><b><del>Scan code login to get Cookie</del> (Disabled)</b>
-<li><del>Select the option <code>Scan code login to get Cookie</code>, and the program will display a login QR code image and open the image with the default application.</del></li>
-<li><del>Use the DouYin APP to scan the QR code and log into your account.</del></li>
-<li><del>Follow the prompts to write the Cookie into the configuration file.</del></li>
+<ol><b><del>Obtain Cookie via QR Code Login</del> (No longer valid)</b>
+<li><del>Select the <code>Obtain Cookie via QR Code Login</code> option, the program will display a login QR code image and open it with the default application</del></li>
+<li><del>Use the TikTok app to scan the QR code and log in</del></li>
+<li><del>Follow the prompts, the program will automatically write the Cookie into the configuration file</del></li>
 </ol>
 </li>
 <li>Return to the program interface, sequentially select <code>Terminal interactive mode</code> -> <code>Batch download link works (general)</code> -> <code>Manually enter the link of the works to be collected</code>.</li>

docs/DouK-Downloader文档.md

@@ -39,23 +39,23 @@
 </li>
 <li>阅读 DouK-Downloader 的免责声明，根据提示输入内容</li>
 <li>将 Cookie 信息写入配置文件
-<ol><b>手动复制粘贴 Cookie</b>
+<ol><b>从剪贴板读取 Cookie</b>
 <li>参考 <a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">Cookie 提取教程</a>，复制所需 Cookie 至剪贴板</li>
-<li>选择 <code>复制粘贴写入 Cookie</code> 选项，按照提示将 Cookie 写入配置文件</li>
+<li>选择 <code>从剪贴板读取 Cookie</code> 选项，程序会自动读取剪贴板的 Cookie 并写入配置文件</li>
 </ol>
-<ol><b>从浏览器获取 Cookie</b>
-<li>选择 <code>从浏览器获取 Cookie</code> 选项，按照提示选择浏览器类型</li>
+<ol><b>从浏览器读取 Cookie</b>
+<li>选择 <code>从浏览器读取 Cookie</code> 选项，按照提示输入浏览器类型或序号</li>
 </ol>
 <ol><b><del>扫码登录获取 Cookie</del>（失效）</b>
 <li><del>选择 <code>扫码登录获取 Cookie</code> 选项，程序会显示登录二维码图片，并使用默认应用打开图片</del></li>
 <li><del>使用抖音 APP 扫描二维码并登录账号</del></li>
-<li><del>按照提示操作，将 Cookie 写入配置文件</del></li>
+<li><del>按照提示操作，程序会自动将 Cookie 写入配置文件</del></li>
 </ol>
 </li>
 <li>返回程序界面，依次选择 <code>终端交互模式</code> -> <code>批量下载链接作品(抖音)</code> -> <code>手动输入待采集的作品链接</code></li>
 <li>输入抖音作品链接即可下载作品文件</li>
 </ol>
-<p><b>TikTok 平台功能需要额外设置配置文件 <code>browser_info_tiktok</code> 的 <code>device_id</code> 参数，否则平台功能可能无法正常使用！参数获取方式与 Cookie 类似，详见 <a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">Cookie 获取教程</a></b></p>
+<p><b>TikTok 平台功能需要额外设置配置文件 <code>browser_info_tiktok</code> 的 <code>device_id</code> 参数，否则 TikTok 平台功能可能无法正常使用！参数获取方式与 Cookie 类似，详见 <a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">Cookie 获取教程</a></b></p>
 <h2>Docker 容器</h2>
 <ol>
 <li>获取镜像</li>
@@ -72,7 +72,7 @@
 </ul>
 </li>
 </ol>
-<p>Docker 容器无法直接访问宿主机的文件系统，部分功能不可用，例如：<code>从浏览器获取 Cookie</code>；其他功能如有异常请反馈！</p>
+<p>Docker 容器无法直接访问宿主机的文件系统，部分功能不可用，例如：<code>从浏览器读取 Cookie</code>；其他功能如有异常请反馈！</p>
 <h1>Cookie 说明</h1>
 <p><a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">点击查看 Cookie 获取教程</a>；无效或失效的 Cookie 会导致程序获取数据失败！</p>
 <ul>
@@ -700,7 +700,7 @@ built with gcc 14.2.0 (crosstool-NG 1.27.0.18_7458341)
 <ul>其他示例：
 <li><code>6 2</code>：代表依次执行 <code>终端交互模式</code> -> <code>批量下载账号作品(抖音)</code></li>
 <li><code>8</code>：代表执行<code>Web API 模式</code></li>
-<li><code>2 7</code>：代表依次执行<code>从浏览器获取 Cookie (抖音)</code> -> <code>Edge</code></li>
+<li><code>2 7</code>：代表依次执行<code>从浏览器读取 Cookie (抖音)</code> -> <code>Edge</code></li>
 </ul>
 <h3>程序代理设置</h3>
 
@@ -733,11 +733,10 @@ built with gcc 14.2.0 (crosstool-NG 1.27.0.18_7458341)
 <li>设置服务器模式参数验证</li>
 </ul>
 <h1>功能介绍</h1>
-<h2>复制粘贴写入 Cookie</h2>
-<p>参考 <a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">Cookie 提取教程</a>，手动从浏览器复制所需 Cookie 至剪贴板，按照程序提示输入 Cookie 后回车确认，程序会自动处理 Cookie 并写入配置文件。</p>
-<p>如果粘贴 Cookie 至终端后无响应，可能是 Cookie 文本长度超出终端最大文本长度限制，请考虑更换终端或者其他写入方式。</p>
+<h2>从剪贴板读取 Cookie</h2>
+<p>参考 <a href="https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B.md">Cookie 提取教程</a>，手动从浏览器复制所需 Cookie 内容至剪贴板，再按照程序提示操作；程序会自动读取剪贴板的内容并将有效的 Cookie 写入配置文件。</p>
 <p>成功写入配置文件后，程序会提示当前 Cookie 登录状态！</p>
-<h2>从浏览器获取 Cookie</h2>
+<h2>从浏览器读取 Cookie</h2>
 <p>自动读取本地浏览器的 Cookie 数据，并提取所需 Cookie 写入配置文件。</p>
 <p>成功写入配置文件后，程序会提示当前 Cookie 登录状态！</p>
 <p>Windows 系统需要以管理员身份运行程序才能读取 Chromium、Chrome、Edge 浏览器 Cookie！</p>

docs/Release_Notes.md

@@ -5,8 +5,9 @@
 3. 修复 MacOS 下载直播报错的问题
 4. 搜索数据为空时不再保存至文件
 5. 支持设置直播下载的默认清晰度
-6. 重构调用 ffmpeg 下载直播功能
-7. 优化配置文件参数容错机制
-8. 恢复数据请求延时机制
+6. 重构复制粘贴写入 Cookie 功能
+7. 重构调用 ffmpeg 下载直播功能
+8. 优化配置文件参数容错机制
+9. 恢复数据请求延时机制
 
 <p><strong>更新公告：本项目名称由 <code>TikTokDownloader</code> 变更为 <code>DouK-Downloader</code></strong></p>

pyproject.toml

@@ -18,6 +18,7 @@ dependencies = [
     "lxml>=5.3.1",
     "openpyxl>=3.1.5",
     "pydantic>=2.10.6",
+    "pyperclip>=1.9.0",
     "qrcode>=8.0",
     "rich>=13.9.4",
     "rookiepy>=0.5.6",

requirements.txt

@@ -1,28 +1,30 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile pyproject.toml --no-deps --no-strip-extras -o requirements.txt
 aiofiles==24.1.0
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 aiosqlite==0.21.0
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 emoji==2.14.1
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 fastapi==0.115.9
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 gmssl==3.2.2
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 httpx[socks]==0.28.1
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 lxml==5.3.1
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 openpyxl==3.1.5
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 pydantic==2.10.6
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
+pyperclip==1.9.0
+    # via douk-downloader (pyproject.toml)
 qrcode==8.0
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 rich==13.9.4
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 rookiepy==0.5.6
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)
 uvicorn==0.34.0
-    # via tiktokdownloader (pyproject.toml)
+    # via douk-downloader (pyproject.toml)

src/application/TikTokDownloader.py

@@ -49,10 +49,6 @@ class TikTokDownloader:
     VERSION_MAJOR = VERSION_MAJOR
     VERSION_MINOR = VERSION_MINOR
     VERSION_BETA = VERSION_BETA
-    PLATFORM = (
-        "cookie",
-        "cookie_tiktok",
-    )
     NAME = PROJECT_NAME
     WIDTH = 50
     LINE = ">" * WIDTH
@@ -110,11 +106,11 @@ def __update_menu(self):
             0: _("启用"),
         }
         self.__function_menu = (
-            (_("复制粘贴写入 Cookie (抖音)"), self.write_cookie),
-            (_("从浏览器获取 Cookie (抖音)"), self.browser_cookie),
+            (_("从剪贴板读取 Cookie (抖音)"), self.write_cookie),
+            (_("从浏览器读取 Cookie (抖音)"), self.browser_cookie),
             # (_("扫码登录获取 Cookie (抖音)"), self.auto_cookie),
-            (_("复制粘贴写入 Cookie (TikTok)"), self.write_cookie_tiktok),
-            (_("从浏览器获取 Cookie (TikTok)"), self.browser_cookie_tiktok),
+            (_("从剪贴板读取 Cookie (TikTok)"), self.write_cookie_tiktok),
+            (_("从浏览器读取 Cookie (TikTok)"), self.browser_cookie_tiktok),
             (_("终端交互模式"), self.complete),
             (_("后台监测模式"), self.disable_function),
             (_("Web API 模式"), self.server),
@@ -312,18 +308,24 @@ async def change_config(
         await self.check_settings()
 
     async def write_cookie(self):
-        await self.__write_cookie()
+        await self.__write_cookie(False)
 
     async def write_cookie_tiktok(self):
-        await self.__write_cookie(1)
+        await self.__write_cookie(True)
 
-    async def __write_cookie(self, index=0):
+    async def __write_cookie(self, tiktok: bool):
         self.console.print(
             _("Cookie 获取教程：")
             + "https://github.com/JoeanAmier/TikTokDownloader/blob/master/docs/Cookie%E8%8E%B7%E5%8F%96%E6"
             "%95%99%E7%A8%8B.md"
         )
-        if self.cookie.run(self.PLATFORM[index], index):
+        if self.console.input(
+            _(
+                "复制 Cookie 内容至剪贴板后，按回车键确认继续；若输入任意内容并按回车，则取消操作："
+            )
+        ):
+            return
+        if self.cookie.run(tiktok):
             await self.check_settings()
 
     async def auto_cookie(self):
@@ -338,7 +340,7 @@ async def auto_cookie(self):
             self.parameter,
             self.settings,
         ).run():
-            self.cookie.extract(cookie)
+            self.cookie.extract(cookie, platform=_("抖音"))
             await self.check_settings()
         else:
             self.console.warning(

src/config/parameter.py

@@ -859,9 +859,11 @@ async def set_settings_data(
         self.set_general_params(data)
 
     async def __update_cookie_data(self, data: dict) -> None:
-        for i in ("cookie", "cookie_tiktok"):
+        for i, j in zip(("cookie", "cookie_tiktok"), (_("抖音"), "TikTok")):
             if c := data.get(i):
-                setattr(self, i, self.cookie_object.extract(c, False, key=i))
+                setattr(
+                    self, i, self.cookie_object.extract(c, False, key=i, platform=j)
+                )
         await self.update_params()
 
     @staticmethod

src/module/cookie.py

@@ -1,7 +1,8 @@
 from typing import TYPE_CHECKING
-
 from ..tools import cookie_str_to_dict
 from ..translation import _
+from re import compile
+from pyperclip import paste
 
 if TYPE_CHECKING:
     from ..config import Settings
@@ -11,53 +12,77 @@
 
 
 class Cookie:
+    PATTERN = compile(r"[!#$%&'*+\-.^_`|~0-9A-Za-z]+=([^;\s][^;]*)")
     STATE_KEY = "sessionid_ss"
-    PLATFORM = (
-        _("抖音"),
-        "TikTok",
-    )
+    PLATFORM_KEY = {
+        False: "cookie",
+        True: "cookie_tiktok",
+    }
 
     def __init__(self, settings: "Settings", console: "ColorfulConsole"):
         self.settings = settings
         self.console = console
+        self.PLATFORM_NAME = {
+            False: _("抖音"),
+            True: "TikTok",
+        }
 
     def run(
         self,
-        key="cookie",
-        tiktok=0,
-    ):
+        tiktok=False,
+    ) -> bool:
         """提取 Cookie 并写入配置文件"""
-        if not (
-            cookie := self.console.input(
-                _("请粘贴 {platform} Cookie 内容: ").format(
-                    platform=self.PLATFORM[tiktok]
-                )
+        if self.validate_cookie_minimal(cookie := paste()):
+            self.extract(
+                cookie,
+                key=self.PLATFORM_KEY[tiktok],
+                platform=self.PLATFORM_NAME[tiktok],
             )
-        ):
-            return False
-        self.extract(cookie, key=key)
-        return True
+            return True
+        self.console.warning(_("当前剪贴板的内容不是有效的 Cookie 内容！"))
+        return False
 
     def extract(
         self,
         cookie: str,
         write=True,
         key="cookie",
+        platform: str = ...,
     ) -> dict:
         cookie_dict = cookie_str_to_dict(cookie)
-        self.__check_state(cookie_dict)
+        self.__check_state(
+            cookie_dict,
+            platform,
+        )
         if write:
             self.save_cookie(cookie_dict, key)
-            self.console.print(_("写入 Cookie 成功！"))
+            self.console.print(
+                _(f"写入 {platform} Cookie 成功！").format(platform=platform)
+            )
         return cookie_dict
 
-    def __check_state(self, items: dict) -> None:
+    def __check_state(self, items: dict, platform: str) -> None:
         if items.get(self.STATE_KEY):
-            self.console.print(_("当前 Cookie 已登录"))
+            self.console.print(
+                _(f"当前 {platform} Cookie 已登录").format(platform=platform)
+            )
         else:
-            self.console.print(_("当前 Cookie 未登录"))
+            self.console.print(
+                _(f"当前 {platform} Cookie 未登录").format(platform=platform)
+            )
 
     def save_cookie(self, cookie: dict, key="cookie") -> None:
         data = self.settings.read()
         data[key] = cookie
         self.settings.update(data)
+
+    @classmethod
+    def validate_cookie_minimal(cls, cookie_str: str) -> bool:
+        """
+        只检查整个字符串中是否存在 key=value 子串，
+        且 key 和 value 都非空。
+        返回 True 或 False。
+        """
+        if not isinstance(cookie_str, str):
+            return False
+        return bool(cls.PATTERN.search(cookie_str))