diff --git a/locale/en_US/LC_MESSAGES/xhs.mo b/locale/en_US/LC_MESSAGES/xhs.mo index cb6819f..b3a76d0 100644 Binary files a/locale/en_US/LC_MESSAGES/xhs.mo and b/locale/en_US/LC_MESSAGES/xhs.mo differ diff --git a/locale/en_US/LC_MESSAGES/xhs.po b/locale/en_US/LC_MESSAGES/xhs.po index ac4b749..9a190ef 100644 --- a/locale/en_US/LC_MESSAGES/xhs.po +++ b/locale/en_US/LC_MESSAGES/xhs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: XHS-Downloader 2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-22 14:07+0800\n" +"POT-Creation-Date: 2024-12-28 16:54+0800\n" "PO-Revision-Date: 2024-12-22 14:14+0800\n" "Last-Translator: \n" "Language-Team: English\n" @@ -28,7 +28,7 @@ msgstr "Failed to extract the download address for the Xiaohongshu works files" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:196 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:214 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:445 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:444 msgid "提取小红书作品链接失败" msgstr "Failed to extract the links for Xiaohongshu works" @@ -57,37 +57,39 @@ msgstr "{0} failed to retrieve data" msgid "{0} 提取数据失败" msgstr "{0} failed to extract data" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:259 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:258 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\download.py:75 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:11 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:13 msgid "视频" msgstr "video" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:261 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:260 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\download.py:82 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:11 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:13 msgid "图文" msgstr "image" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:266 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:265 #, python-brace-format msgid "作品处理完成:{0}" msgstr "works processing completed: {0}" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:327 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:326 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:54 msgid "" "程序会自动读取并提取剪贴板中的小红书作品链接,并自动下载链接对应的作品文件," "如需关闭,请点击关闭按钮,或者向剪贴板写入 “close” 文本!" msgstr "" -"The program will automatically read and extract the link to Xiaohongshu works from the clipboard, and automatically download the corresponding work file. " -"If you want to close it, please click the close button or write the \"close\" text to the clipboard!" +"The program will automatically read and extract the link to Xiaohongshu " +"works from the clipboard, and automatically download the corresponding work " +"file. If you want to close it, please click the close button or write the " +"\"close\" text to the clipboard!" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:457 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:456 msgid "获取小红书作品数据成功" msgstr "Successfully obtained data on Xiaohongshu works" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:459 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:458 msgid "获取小红书作品数据失败" msgstr "Failed to obtain data on Xiaohongshu works" @@ -125,9 +127,9 @@ msgstr "Network error, {0} download failed, error message: {1}" msgid "文件 {0} 格式判断失败,错误信息:{1}" msgstr "Format recognition failed for file {0}, error message: {1}" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:48 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:56 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:50 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:58 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:63 msgid "未知" msgstr "unknown" @@ -142,7 +144,9 @@ msgstr "Link to Xiaohongshu works" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\CLI\main.py:119 msgid "下载指定序号的图片文件,仅对图文作品生效;多个序号输入示例:\"1 3 5 7\"" -msgstr "Download image files with specified serial numbers, only effective for image works; Example of multiple serial numbers input: \"1 3 5 7\"" +msgstr "" +"Download image files with specified serial numbers, only effective for image " +"works; Example of multiple serial numbers input: \"1 3 5 7\"" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\CLI\main.py:120 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:33 @@ -176,7 +180,9 @@ msgstr "Network request timeout limit, in seconds" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\CLI\main.py:129 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:50 msgid "下载文件时,每次从服务器获取的数据块大小,单位:字节" -msgstr "When downloading a file, the size of the data block obtained from the server each time, in bytes" +msgstr "" +"When downloading a file, the size of the data block obtained from the server " +"each time, in bytes" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\CLI\main.py:130 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:52 @@ -215,7 +221,9 @@ msgstr "Read specified configuration file" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\CLI\main.py:139 #, python-brace-format msgid "从指定的浏览器读取小红书网页版 Cookie,支持:{0}; 输入浏览器名称或序号" -msgstr "Read Xiaohongshu web version cookies from the specified browser, supporting: {0}; Enter browser name or serial number" +msgstr "" +"Read Xiaohongshu web version cookies from the specified browser, supporting: " +"{0}; Enter browser name or serial number" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\CLI\main.py:145 msgid "是否更新配置文件" @@ -238,8 +246,10 @@ msgid "" "{options}\n" "请输入浏览器名称或序号:" msgstr "" -"Read cookies from the specified browser and write them to the configuration file\n" -"The Windows system requires running programs as an administrator to read Chromium, Chrome, Edge browser cookies!\n" +"Read cookies from the specified browser and write them to the configuration " +"file\n" +"The Windows system requires running programs as an administrator to read " +"Chromium, Chrome, Edge browser cookies!\n" "{options}\n" "Please enter your browser name or serial number:" @@ -257,11 +267,15 @@ msgstr "Failed to retrieve cookie, no cookie data found!" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\expansion\browser.py:99 msgid "从浏览器读取 Cookie 功能不支持当前平台!" -msgstr "The cookie reading function from the browser is not supported on the current platform!" +msgstr "" +"The cookie reading function from the browser is not supported on the current " +"platform!" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\expansion\cleaner.py:45 msgid "不受支持的操作系统类型,可能无法正常去除非法字符!" -msgstr "Unsupported operating system type, may not be able to remove illegal characters properly!" +msgstr "" +"Unsupported operating system type, may not be able to remove illegal " +"characters properly!" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\module\manager.py:204 #, python-brace-format @@ -278,61 +292,136 @@ msgstr "Agent {0} test timeout" msgid "代理 {0} 测试失败:{1}" msgstr "Agent {0} test failed: {1}" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:41 -msgid "如果 XHS-Downloader 对您有帮助,请考虑为它点个 Star,感谢您的支持!" -msgstr "If XHS-Downloader is helpful to you, please consider giving it Star. Thank you for your support!" +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:26 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:37 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:26 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:22 +msgid "退出程序" +msgstr "Quit" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:45 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:30 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:38 +msgid "检查更新" +msgstr "Update" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:34 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\record.py:28 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:23 +msgid "返回首页" +msgstr "Return" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:42 +msgid "如果 XHS-Downloader 对您有帮助,请考虑为它点个 Star,感谢您的支持!" +msgstr "" +"If XHS-Downloader is helpful to you, please consider giving it Star. Thank " +"you for your support!" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:44 +msgid "Discord 社区" +msgstr "Discord Community" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:48 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:55 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:65 +msgid "点击访问" +msgstr "Click to visit" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:50 msgid "作者的其他开源项目" msgstr "Other open-source projects of the author" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\app.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\app.py:62 msgid "" "配置文件 settings.json 缺少必要的参数,请删除该文件,然后重新运行程序,自动生" "成默认配置文件!" msgstr "" -"The configuration file settings.json is missing necessary parameters. " -"Please delete the file and run the program again to automatically generate the default configuration file!" +"The configuration file settings.json is missing necessary parameters. Please " +"delete the file and run the program again to automatically generate the " +"default configuration file!" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:65 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:39 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:97 +msgid "程序设置" +msgstr "Settings" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:40 +msgid "下载记录" +msgstr "Record" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:41 +msgid "开启监听" +msgstr "Monitor" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:42 +msgid "关于项目" +msgstr "About" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:69 msgid "请输入小红书图文/视频作品链接" msgstr "Please enter the link to the Xiaohongshu image or video works" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:68 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:72 msgid "多个链接之间使用空格分隔" msgstr "Separate multiple links with spaces" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:70 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:74 msgid "下载无水印作品文件" msgstr "Download images/video files" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:71 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:75 msgid "读取剪贴板" msgstr "Read the clipboard" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:72 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:76 msgid "清空输入框" msgstr "Clear the input box" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:84 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:88 msgid "免责声明\n" -msgstr "Disclaimer about XHS-Downloader:\n" +msgstr "" +"Disclaimer about XHS-Downloader:\n" "\n" -"1. The user decides on their own use of this project and assumes all risks. The author is not responsible for any losses, liabilities, or risks incurred by the user in using this project.\n" -"2. The code and features provided by the author of this project are developed based on existing knowledge and technology. The author strives to ensure the correctness and security of the code but does not guarantee that the code is entirely free of errors or defects.\n" -"3. The user must strictly adhere to the requirements of the GNU General Public License v3.0 when using this project and appropriately acknowledge the use of code licensed under the GNU General Public License v3.0.\n" -"4. Under no circumstances may the user associate the author, contributors, or other relevant parties of this project with the user's actions, nor demand them to be held responsible for any losses or damages incurred by the user in using this project.\n" -"5. The user must independently research relevant laws and regulations when using the code and features of this project, ensuring that their use is legal and compliant. Any legal responsibilities and risks arising from violations of laws and regulations are the sole responsibility of the user.\n" -"6. The author of this project will not offer a paid version of the XHS-Downloader project and will not provide any commercial services related to the XHS-Downloader project.\n" -"7. Any secondary development, modification, or compilation of programs based on this project is not associated with the original author. The original author is not responsible for any consequences related to secondary development actions or their results. The user is solely responsible for all situations that may arise from secondary development.\n" +"1. The user decides on their own use of this project and assumes all risks. " +"The author is not responsible for any losses, liabilities, or risks incurred " +"by the user in using this project.\n" +"2. The code and features provided by the author of this project are " +"developed based on existing knowledge and technology. The author strives to " +"ensure the correctness and security of the code but does not guarantee that " +"the code is entirely free of errors or defects.\n" +"3. The user must strictly adhere to the requirements of the GNU General " +"Public License v3.0 when using this project and appropriately acknowledge " +"the use of code licensed under the GNU General Public License v3.0.\n" +"4. Under no circumstances may the user associate the author, contributors, " +"or other relevant parties of this project with the user's actions, nor " +"demand them to be held responsible for any losses or damages incurred by the " +"user in using this project.\n" +"5. The user must independently research relevant laws and regulations when " +"using the code and features of this project, ensuring that their use is " +"legal and compliant. Any legal responsibilities and risks arising from " +"violations of laws and regulations are the sole responsibility of the user.\n" +"6. The author of this project will not offer a paid version of the XHS-" +"Downloader project and will not provide any commercial services related to " +"the XHS-Downloader project.\n" +"7. Any secondary development, modification, or compilation of programs based " +"on this project is not associated with the original author. The original " +"author is not responsible for any consequences related to secondary " +"development actions or their results. The user is solely responsible for all " +"situations that may arise from secondary development.\n" "\n" -"Before using the code and features of this project, please carefully consider and accept the above disclaimers. If you have any questions or do not agree with the statements above, please refrain from using the code and features of this project. If you proceed to use the code and features of this project, it will be considered that you fully understand and accept the disclaimers mentioned above, and willingly assume all risks and consequences associated with using this project.\n" +"Before using the code and features of this project, please carefully " +"consider and accept the above disclaimers. If you have any questions or do " +"not agree with the statements above, please refrain from using the code and " +"features of this project. If you proceed to use the code and features of " +"this project, it will be considered that you fully understand and accept the " +"disclaimers mentioned above, and willingly assume all risks and consequences " +"associated with using this project.\n" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:97 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:103 msgid "未输入任何小红书作品链接" msgstr "No Xiaohongshu works links provided" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:114 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:126 msgid "下载小红书作品文件失败" msgstr "Failed to download the Xiaohongshu works files" @@ -340,6 +429,10 @@ msgstr "Failed to download the Xiaohongshu works files" msgid "程序处理中..." msgstr "Processing..." +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:27 +msgid "关闭监听" +msgstr "Close" + #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:36 msgid "已启动监听剪贴板模式" msgstr "Currently in monitoring clipboard mode" @@ -356,16 +449,13 @@ msgstr "Please enter the link or ID of the Xiaohongshu works to be deleted" msgid "" "支持输入作品 ID 或包含作品 ID 的作品链接,多个链接或 ID 之间使用空格分隔" msgstr "" -"Support input of works ID or links containing works ID, with multiple links or IDs separated by spaces" +"Support input of works ID or links containing works ID, with multiple links " +"or IDs separated by spaces" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\record.py:27 msgid "删除指定作品 ID" msgstr "Delete specified works ID" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\record.py:28 -msgid "返回首页" -msgstr "return" - #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:34 msgid "程序根路径" msgstr "Program root path" @@ -420,16 +510,13 @@ msgstr "Discard changes" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:93 msgid "小红书网页版 Cookie,无需登录,参数已设置" -msgstr "Xiaohongshu web version cookie, no login required, parameters have been set" +msgstr "" +"Xiaohongshu web version cookie, no login required, parameters have been set" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:94 msgid "小红书网页版 Cookie,无需登录,参数未设置" msgstr "Xiaohongshu web version cookie, no login required, parameters not set" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:97 -msgid "程序设置" -msgstr "Settings" - #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\update.py:28 msgid "正在检查新版本,请稍等..." msgstr "Checking for new version, please wait..." diff --git a/locale/xhs.pot b/locale/xhs.pot index 4d95819..8ab9ef0 100644 --- a/locale/xhs.pot +++ b/locale/xhs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: XHS-Downloader 2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-22 14:07+0800\n" +"POT-Creation-Date: 2024-12-28 16:54+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgstr "" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:196 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:214 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:445 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:444 msgid "提取小红书作品链接失败" msgstr "" @@ -57,35 +57,35 @@ msgstr "" msgid "{0} 提取数据失败" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:259 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:258 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\download.py:75 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:11 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:13 msgid "视频" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:261 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:260 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\download.py:82 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:11 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:13 msgid "图文" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:266 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:265 #, python-brace-format msgid "作品处理完成:{0}" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:327 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:326 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:54 msgid "" "程序会自动读取并提取剪贴板中的小红书作品链接,并自动下载链接对应的作品文件," "如需关闭,请点击关闭按钮,或者向剪贴板写入 “close” 文本!" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:457 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:456 msgid "获取小红书作品数据成功" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:459 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:458 msgid "获取小红书作品数据失败" msgstr "" @@ -123,9 +123,9 @@ msgstr "" msgid "文件 {0} 格式判断失败,错误信息:{1}" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:48 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:56 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:50 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:58 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:63 msgid "未知" msgstr "" @@ -272,49 +272,95 @@ msgstr "" msgid "代理 {0} 测试失败:{1}" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:41 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:26 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:37 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:26 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:22 +msgid "退出程序" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:30 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:38 +msgid "检查更新" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:34 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\record.py:28 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:23 +msgid "返回首页" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:42 msgid "如果 XHS-Downloader 对您有帮助,请考虑为它点个 Star,感谢您的支持!" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:45 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:44 +msgid "Discord 社区" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:48 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:55 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:65 +msgid "点击访问" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:50 msgid "作者的其他开源项目" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\app.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\app.py:62 msgid "" "配置文件 settings.json 缺少必要的参数,请删除该文件,然后重新运行程序,自动生" "成默认配置文件!" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:65 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:39 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:97 +msgid "程序设置" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:40 +msgid "下载记录" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:41 +msgid "开启监听" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:42 +msgid "关于项目" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:69 msgid "请输入小红书图文/视频作品链接" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:68 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:72 msgid "多个链接之间使用空格分隔" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:70 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:74 msgid "下载无水印作品文件" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:71 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:75 msgid "读取剪贴板" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:72 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:76 msgid "清空输入框" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:84 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:88 msgid "免责声明\n" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:97 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:103 msgid "未输入任何小红书作品链接" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:114 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:126 msgid "下载小红书作品文件失败" msgstr "" @@ -322,6 +368,10 @@ msgstr "" msgid "程序处理中..." msgstr "" +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:27 +msgid "关闭监听" +msgstr "" + #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:36 msgid "已启动监听剪贴板模式" msgstr "" @@ -343,10 +393,6 @@ msgstr "" msgid "删除指定作品 ID" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\record.py:28 -msgid "返回首页" -msgstr "" - #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:34 msgid "程序根路径" msgstr "" @@ -407,10 +453,6 @@ msgstr "" msgid "小红书网页版 Cookie,无需登录,参数未设置" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:97 -msgid "程序设置" -msgstr "" - #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\update.py:28 msgid "正在检查新版本,请稍等..." msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/xhs.po b/locale/zh_CN/LC_MESSAGES/xhs.po index a7bb5bc..2778d0b 100644 --- a/locale/zh_CN/LC_MESSAGES/xhs.po +++ b/locale/zh_CN/LC_MESSAGES/xhs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: XHS-Downloader 2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-22 14:07+0800\n" +"POT-Creation-Date: 2024-12-28 16:54+0800\n" "PO-Revision-Date: 2024-12-22 14:14+0800\n" "Last-Translator: \n" "Language-Team: Chinese (simplified)\n" @@ -28,7 +28,7 @@ msgstr "" #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:196 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:214 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:445 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:444 msgid "提取小红书作品链接失败" msgstr "" @@ -57,35 +57,35 @@ msgstr "" msgid "{0} 提取数据失败" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:259 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:258 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\download.py:75 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:11 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:13 msgid "视频" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:261 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:260 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\download.py:82 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:11 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:13 msgid "图文" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:266 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:265 #, python-brace-format msgid "作品处理完成:{0}" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:327 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:326 #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:54 msgid "" "程序会自动读取并提取剪贴板中的小红书作品链接,并自动下载链接对应的作品文件," "如需关闭,请点击关闭按钮,或者向剪贴板写入 “close” 文本!" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:457 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:456 msgid "获取小红书作品数据成功" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:459 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\app.py:458 msgid "获取小红书作品数据失败" msgstr "" @@ -123,9 +123,9 @@ msgstr "" msgid "文件 {0} 格式判断失败,错误信息:{1}" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:48 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:56 -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:50 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:58 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\application\explore.py:63 msgid "未知" msgstr "" @@ -272,59 +272,117 @@ msgstr "" msgid "代理 {0} 测试失败:{1}" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:41 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:26 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:37 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:26 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:22 +msgid "退出程序" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:30 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:38 +msgid "检查更新" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:34 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\record.py:28 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:23 +msgid "返回首页" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:42 msgid "如果 XHS-Downloader 对您有帮助,请考虑为它点个 Star,感谢您的支持!" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:45 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:44 +msgid "Discord 社区" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:48 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:55 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:65 +msgid "点击访问" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\about.py:50 msgid "作者的其他开源项目" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\app.py:61 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\app.py:62 msgid "" "配置文件 settings.json 缺少必要的参数,请删除该文件,然后重新运行程序,自动生" "成默认配置文件!" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:65 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:39 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:97 +msgid "程序设置" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:40 +msgid "下载记录" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:41 +msgid "开启监听" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:42 +msgid "关于项目" +msgstr "" + +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:69 msgid "请输入小红书图文/视频作品链接" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:68 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:72 msgid "多个链接之间使用空格分隔" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:70 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:74 msgid "下载无水印作品文件" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:71 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:75 msgid "读取剪贴板" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:72 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:76 msgid "清空输入框" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:84 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:88 msgid "免责声明\n" -msgstr "关于 XHS-Downloader 的 免责声明:\n" +msgstr "" +"关于 XHS-Downloader 的 免责声明:\n" "\n" -"1.使用者对本项目的使用由使用者自行决定,并自行承担风险。作者对使用者使用本项目所产生的任何损失、责任、或风险概不负责。\n" -"2.本项目的作者提供的代码和功能是基于现有知识和技术的开发成果。作者尽力确保代码的正确性和安全性,但不保证代码完全没有错误或缺陷。\n" -"3.使用者在使用本项目时必须严格遵守 GNU General Public License v3.0 的要求,并在适当的地方注明使用了 GNU General Public License v3.0 的代码。\n" -"4.使用者在任何情况下均不得将本项目的作者、贡献者或其他相关方与使用者的使用行为联系起来,或要求其对使用者使用本项目所产生的任何损失或损害负责。\n" -"5.使用者在使用本项目的代码和功能时,必须自行研究相关法律法规,并确保其使用行为合法合规。任何因违反法律法规而导致的法律责任和风险,均由使用者自行承担。\n" -"6.本项目的作者不会提供 XHS-Downloader 项目的付费版本,也不会提供与 XHS-Downloader 项目相关的任何商业服务。\n" -"7.基于本项目进行的任何二次开发、修改或编译的程序与原创作者无关,原创作者不承担与二次开发行为或其结果相关的任何责任,使用者应自行对因二次开发可能带来的各种情况负全部责任。\n" +"1.使用者对本项目的使用由使用者自行决定,并自行承担风险。作者对使用者使用本项" +"目所产生的任何损失、责任、或风险概不负责。\n" +"2.本项目的作者提供的代码和功能是基于现有知识和技术的开发成果。作者尽力确保代" +"码的正确性和安全性,但不保证代码完全没有错误或缺陷。\n" +"3.使用者在使用本项目时必须严格遵守 GNU General Public License v3.0 的要求,并" +"在适当的地方注明使用了 GNU General Public License v3.0 的代码。\n" +"4.使用者在任何情况下均不得将本项目的作者、贡献者或其他相关方与使用者的使用行" +"为联系起来,或要求其对使用者使用本项目所产生的任何损失或损害负责。\n" +"5.使用者在使用本项目的代码和功能时,必须自行研究相关法律法规,并确保其使用行" +"为合法合规。任何因违反法律法规而导致的法律责任和风险,均由使用者自行承担。\n" +"6.本项目的作者不会提供 XHS-Downloader 项目的付费版本,也不会提供与 XHS-" +"Downloader 项目相关的任何商业服务。\n" +"7.基于本项目进行的任何二次开发、修改或编译的程序与原创作者无关,原创作者不承" +"担与二次开发行为或其结果相关的任何责任,使用者应自行对因二次开发可能带来的各" +"种情况负全部责任。\n" "\n" -"在使用本项目的代码和功能之前,请您认真考虑并接受以上免责声明。如果您对上述声明有任何疑问或不同意,请不要使用本项目的代码和功能。如果您使用了本项目的代码和功能,则视为您已完全理解并接受上述免责声明,并自愿承担使用本项目的一切风险和后果。\n" +"在使用本项目的代码和功能之前,请您认真考虑并接受以上免责声明。如果您对上述声" +"明有任何疑问或不同意,请不要使用本项目的代码和功能。如果您使用了本项目的代码" +"和功能,则视为您已完全理解并接受上述免责声明,并自愿承担使用本项目的一切风险" +"和后果。\n" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:97 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:103 msgid "未输入任何小红书作品链接" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:114 +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\index.py:126 msgid "下载小红书作品文件失败" msgstr "" @@ -332,6 +390,10 @@ msgstr "" msgid "程序处理中..." msgstr "" +#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:27 +msgid "关闭监听" +msgstr "" + #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\monitor.py:36 msgid "已启动监听剪贴板模式" msgstr "" @@ -353,10 +415,6 @@ msgstr "" msgid "删除指定作品 ID" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\record.py:28 -msgid "返回首页" -msgstr "" - #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:34 msgid "程序根路径" msgstr "" @@ -417,10 +475,6 @@ msgstr "" msgid "小红书网页版 Cookie,无需登录,参数未设置" msgstr "" -#: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\setting.py:97 -msgid "程序设置" -msgstr "" - #: C:\Users\youyq\PycharmProjects\XHS-Downloader\source\TUI\update.py:28 msgid "正在检查新版本,请稍等..." msgstr "" diff --git a/requirements.txt b/requirements.txt index b4a1837..3db7b6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -textual<=0.63.0 +textual>=1.0.0 pyperclip>=1.9.0 lxml>=5.3.0 PyYAML>=6.0.2 diff --git a/source/TUI/about.py b/source/TUI/about.py index c0a4c9f..4255f44 100644 --- a/source/TUI/about.py +++ b/source/TUI/about.py @@ -5,6 +5,7 @@ from textual.screen import Screen from textual.widgets import Footer from textual.widgets import Header from textual.widgets import Label +from textual.widgets import Link from ..module import ( PROJECT, @@ -22,15 +23,15 @@ class About(Screen): Binding( key="Q", action="quit", - description="退出程序/Quit"), + description=_("退出程序")), Binding( key="U", action="check_update", - description="检查更新/Update"), + description=_("检查更新")), Binding( key="B", action="index", - description="返回首页/Back"), + description=_("返回首页")), ] def __init__(self, ): @@ -40,13 +41,25 @@ class About(Screen): yield Header() yield Label(Text(_("如果 XHS-Downloader 对您有帮助,请考虑为它点个 Star,感谢您的支持!"), style=INFO), classes="prompt", ) - yield Label(Text("Discord 社区", style=PROMPT), classes="prompt", ) - yield Label(f"{_("邀请链接:")}https://discord.com/invite/ZYtmgKud9Y") + yield Label(Text(_("Discord 社区"), style=PROMPT), classes="prompt", ) + yield Link( + f"{_("邀请链接:")}https://discord.com/invite/ZYtmgKud9Y", + url="https://discord.com/invite/ZYtmgKud9Y", + tooltip=_("点击访问"), + ) yield Label(Text(_("作者的其他开源项目"), style=PROMPT), classes="prompt", ) yield Label(Text("TikTokDownloader (抖音 / TikTok)", style=MASTER), classes="prompt", ) - yield Label("https://github.com/JoeanAmier/TikTokDownloader") + yield Link( + "https://github.com/JoeanAmier/TikTokDownloader", + url="https://github.com/JoeanAmier/TikTokDownloader", + tooltip=_("点击访问"), + ) yield Label(Text("KS-Downloader (快手)", style=MASTER), classes="prompt", ) - yield Label("https://github.com/JoeanAmier/KS-Downloader") + yield Link( + "https://github.com/JoeanAmier/KS-Downloader", + url="https://github.com/JoeanAmier/KS-Downloader", + tooltip=_("点击访问"), + ) yield Footer() def on_mount(self) -> None: diff --git a/source/TUI/app.py b/source/TUI/app.py index 3915929..4c05ece 100644 --- a/source/TUI/app.py +++ b/source/TUI/app.py @@ -44,6 +44,7 @@ class XHSDownloader(App): ) async def on_mount(self) -> None: + self.theme = "nord" self.install_screen( Setting( self.parameter, diff --git a/source/TUI/index.py b/source/TUI/index.py index a3149ac..92c2b4b 100644 --- a/source/TUI/index.py +++ b/source/TUI/index.py @@ -12,6 +12,7 @@ from textual.widgets import Footer from textual.widgets import Header from textual.widgets import Input from textual.widgets import Label +from textual.widgets import Link from textual.widgets import RichLog from .monitor import Monitor @@ -33,12 +34,12 @@ __all__ = ["Index"] class Index(Screen): BINDINGS = [ - Binding(key="Q", action="quit", description="退出程序/Quit"), - Binding(key="U", action="update", description="检查更新/Update"), - Binding(key="S", action="settings", description="程序设置/Settings"), - Binding(key="R", action="record", description="下载记录/Record"), - Binding(key="M", action="monitor", description="开启监听/Monitor"), - Binding(key="A", action="about", description="关于项目/About"), + Binding(key="Q", action="quit", description=_("退出程序")), + Binding(key="U", action="update", description=_("检查更新")), + Binding(key="S", action="settings", description=_("程序设置")), + Binding(key="R", action="record", description=_("下载记录")), + Binding(key="M", action="monitor", description=_("开启监听")), + Binding(key="A", action="about", description=_("关于项目")), ] def __init__(self, app: XHS, ): @@ -55,10 +56,13 @@ class Index(Screen): f"{_("开源协议")}: {LICENCE}", style=MASTER) ), - Label( + Link( Text( f"{_("项目地址")}{REPOSITORY}", - style=MASTER) + style=MASTER, + ), + url=REPOSITORY, + tooltip=_("点击访问"), ), Label( Text( @@ -72,7 +76,7 @@ class Index(Screen): Button(_("清空输入框"), id="reset"), ), ) - yield RichLog(markup=True, ) + yield RichLog(markup=True, wrap=True, ) yield Footer() def on_mount(self) -> None: @@ -85,7 +89,8 @@ class Index(Screen): f"\n{ ">" * 50}", - style=MASTER), scroll_end=False, + style=MASTER), + animate=True, ) self.xhs.manager.print_proxy_tip(log=self.tip, ) @@ -94,8 +99,14 @@ class Index(Screen): if self.url.value: self.deal() else: - self.tip.write(Text(_("未输入任何小红书作品链接"), style=WARNING)) - self.tip.write(Text(">" * 50, style=GENERAL)) + self.tip.write( + Text(_("未输入任何小红书作品链接"), style=WARNING), + animate=True, + ) + self.tip.write( + Text(">" * 50, style=GENERAL), + animate=True, + ) @on(Button.Pressed, "#reset") def reset_button(self): @@ -105,14 +116,20 @@ class Index(Screen): def paste_button(self): self.query_one(Input).value = paste() - @work() + @work(exclusive=True) async def deal(self): await self.app.push_screen("loading") if any(await self.xhs.extract(self.url.value, True, log=self.tip, data=False, )): self.url.value = "" else: - self.tip.write(Text(_("下载小红书作品文件失败"), style=ERROR)) - self.tip.write(Text(">" * 50, style=GENERAL)) + self.tip.write( + Text(_("下载小红书作品文件失败"), style=ERROR), + animate=True, + ) + self.tip.write( + Text(">" * 50, style=GENERAL), + animate=True, + ) self.app.pop_screen() async def action_quit(self) -> None: diff --git a/source/TUI/monitor.py b/source/TUI/monitor.py index 5edf442..f15f6c1 100644 --- a/source/TUI/monitor.py +++ b/source/TUI/monitor.py @@ -23,8 +23,8 @@ __all__ = ["Monitor"] class Monitor(Screen): BINDINGS = [ - Binding(key="Q", action="quit", description="退出程序/Quit"), - Binding(key="C", action="close", description="关闭监听/Close"), + Binding(key="Q", action="quit", description=_("退出程序")), + Binding(key="C", action="close", description=_("关闭监听")), ] def __init__(self, app: XHS, ): @@ -42,7 +42,7 @@ class Monitor(Screen): def close_button(self): self.action_close() - @work() + @work(exclusive=True) async def run_monitor(self): await self.xhs.monitor(download=True, log=self.query_one(RichLog), data=False, ) self.action_close() diff --git a/source/TUI/setting.py b/source/TUI/setting.py index 11e949e..1c33038 100644 --- a/source/TUI/setting.py +++ b/source/TUI/setting.py @@ -19,8 +19,8 @@ __all__ = ["Setting"] class Setting(Screen): BINDINGS = [ - Binding(key="Q", action="quit", description="退出程序/Quit"), - Binding(key="B", action="index", description="返回首页/Back"), + Binding(key="Q", action="quit", description=_("退出程序")), + Binding(key="B", action="index", description=_("返回首页")), ] def __init__(self, data: dict, ): diff --git a/source/TUI/update.py b/source/TUI/update.py index e5de80c..897d354 100644 --- a/source/TUI/update.py +++ b/source/TUI/update.py @@ -30,7 +30,7 @@ class Update(ModalScreen): classes="loading", ) - @work() + @work(exclusive=True) async def check_update(self) -> None: try: url = await self.xhs.html.request_url(RELEASES, False, None, timeout=5, ) diff --git a/source/module/tools.py b/source/module/tools.py index 90824cc..e96cbfd 100644 --- a/source/module/tools.py +++ b/source/module/tools.py @@ -22,7 +22,7 @@ def retry(function): def logging(log, text, style=INFO): string = Text(text, style=style) if log: - log.write(string) + log.write(string, animate=True, ) else: print(string) diff --git a/static/Release_Notes.md b/static/Release_Notes.md index a5cf164..513cef9 100644 --- a/static/Release_Notes.md +++ b/static/Release_Notes.md @@ -4,12 +4,19 @@ 2. 优化文件名称非法字符处理 3. 支持 API 模式传入 Cookie 4. 适配新版本 HTTPX 库 -5. 重构项目翻译模块 -6. 更正英语语言代码 -7. 优化文件下载功能 -8. 降低内置延时机制 +5. 适配新版本 Textual 库 +6. 更新程序交互界面 +7. 重构项目翻译模块 +8. 更正英语语言代码 +9. 优化文件下载功能 +10. 降低内置延时机制 +11. 其他细节优化 + +***** **用户脚本更新内容:** 1. 重构自动滚动页面功能 2. 优化文件下载功能 + +

注意:自动滚动页面功能默认关闭!启用该功能可能会被小红书检测为自动化操作,从而导致账号受到风控或封禁!该功能在使用过程中遇到任何问题请及时向开发者反馈!

diff --git a/static/XHS-Downloader.js b/static/XHS-Downloader.js index abdcbb3..d3d7e4b 100644 --- a/static/XHS-Downloader.js +++ b/static/XHS-Downloader.js @@ -65,8 +65,8 @@ XHS-Downloader 用户脚本 详细说明: ` alert(instructions); alert(`自动滚动页面功能代码已重构,该功能默认关闭! -启用该功能可能会被小红书检测为自动化操作,从而导致账号受到风控或封禁风险! -该功能在使用过程中,如遇任何问题,请及时向开发者反馈! +启用该功能可能会被小红书检测为自动化操作,从而导致账号受到风控或封禁! +该功能在使用过程中遇到任何问题请及时向开发者反馈! `); if (!disclaimer) { const answer = prompt(disclaimer_content, ""); diff --git a/static/XHS-Downloader.tcss b/static/XHS-Downloader.tcss index cfbbc47..2db5121 100644 --- a/static/XHS-Downloader.tcss +++ b/static/XHS-Downloader.tcss @@ -1,10 +1,6 @@ -ScrollableContainer, RichLog, Monitor, About { - background: #2f3542; -} Button { width: 1fr; margin: 1 1; - text-style: bold; } .vertical-layout { layout: vertical; @@ -18,46 +14,38 @@ Button { width: 25vw; } Button#deal, Button#paste, Button#save, Button#enter { - tint: #27ae60 60%; + color: $success; } Button#reset, Button#abandon, Button#close { - tint: #c0392b 60%; + color: $error; } -Label { +Label, Link { width: 100%; content-align-horizontal: center; content-align-vertical: middle; - text-style: bold; +} +Link { + color: $accent; } Label.params { margin: 1 0 0 0; + color: $primary; } Label.prompt { padding: 1; } -Bar { - width: 33vw; -} -Bar > .bar--indeterminate { - color: #7bed9f; -} -Bar > .bar--complete { - color: #ff7f50; -} .loading { grid-size: 1 2; grid-gutter: 1; width: 40vw; height: 5; - background: #353b48; - border: double #747d8c; + border: double $primary; } #record { grid-size: 1 3; width: 80vw; height: 12; - background: #353b48; - border: double #747d8c; + border: double $primary; } ModalScreen { align: center middle;