Skip to content

Commit

Permalink
style: 更新用户脚本代码
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoeanAmier
JoeanAmier committed Dec 29, 2024
1 parent 2d8d678 commit 7eb270b
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 9 deletions.
10 changes: 6 additions & 4 deletions source/translation/translate.py
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from gettext import translation
from locale import getlocale
from pathlib import Path

ROOT = Path(__file__).resolve().parent.parent.parent

from locale import getlocale


class TranslationManager:
"""管理gettext翻译的类"""
Expand All @@ -21,7 +20,9 @@ def __init__(self, domain="xhs", localedir=None):
if not localedir:
localedir = ROOT.joinpath('locale')
self.localedir = Path(localedir)
self.current_translator = self.setup_translation(self.get_language_code())
self.current_translator = self.setup_translation(
self.get_language_code(),
)

@staticmethod
def get_language_code() -> str:
Expand All @@ -39,7 +40,8 @@ def setup_translation(self, language: str = "zh_CN"):
fallback=True,
)
except FileNotFoundError as e:
print(f"Warning: Translation files for '{self.domain}' not found. Error: {e}")
print(
f"Warning: Translation files for '{self.domain}' not found. Error: {e}")
return translation(self.domain, fallback=True)

def switch_language(self, language: str = "en_US"):
Expand Down
68 changes: 63 additions & 5 deletions static/XHS-Downloader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
// @run-at document-end
// @updateURL https://raw.githubusercontent.com/JoeanAmier/XHS-Downloader/master/static/XHS-Downloader.js
// @downloadURL https://raw.githubusercontent.com/JoeanAmier/XHS-Downloader/master/static/XHS-Downloader.js
// @require https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js
// @require https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2.0.5/FileSaver.min.js
// ==/UserScript==

(function () {
Expand Down Expand Up @@ -213,7 +215,7 @@ XHS-Downloader 用户脚本 详细说明：
}
};

const downloadFile = async (link, filename) => {
const downloadFile = async (link, name) => {
try {
// 使用 fetch 获取文件数据
const response = await fetch(link, {method: "GET"});
Expand All @@ -232,7 +234,7 @@ XHS-Downloader 用户脚本 详细说明：
// 创建一个临时链接元素
const tempLink = document.createElement("a");
tempLink.href = blobUrl;
tempLink.download = filename;
tempLink.download = name;

// 将链接添加到 DOM 并模拟点击
document.body.appendChild(tempLink); // 避免某些浏览器安全限制
Expand All @@ -242,14 +244,52 @@ XHS-Downloader 用户脚本 详细说明：
document.body.removeChild(tempLink); // 从 DOM 中移除临时链接
URL.revokeObjectURL(blobUrl); // 释放 URL

console.info(`文件已成功下载: ${filename}`);
console.info(`文件已成功下载: ${name}`);
return true;
} catch (error) {
console.error(`下载失败 (${filename})，错误信息:`, error);
console.error(`下载失败 (${name})，错误信息:`, error);
return false;
}
};

const downloadFiles = async (urls, name) => {
// TODO: 功能异常
// 创建一个 JSZip 实例
const zip = new JSZip();

// 用于存储是否有错误发生的标志
let hasError = false;

// 获取每个图片并添加到 ZIP
await Promise.all(urls.map(async (url, index) => {
try {
const response = await fetch(url, {method: "GET"});
if (!response.ok) {
console.error(`下载失败: ${url}，状态码: ${response.status}`);
hasError = true; // 标记为有错误发生
return;
}
const blob = await response.blob();
zip.file(`${name}_${index + 1}.png`, blob);
} catch (err) {
console.error('下载图片失败:', err);
hasError = true; // 标记为有错误发生
}
}));

// 生成 ZIP 文件
await zip.generateAsync({type: "blob"})
.then(content => {
saveAs(content, `${name}.zip`); // 下载 ZIP 文件
})
.catch(err => {
console.error('生成 ZIP 文件失败:', err);
hasError = true; // 标记为有错误发生
});

return !hasError; // 如果没有错误返回 true，有错误则返回 false
};

const extractName = () => {
let name = document.title.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, "");
let match = currentUrl.match(/\/([^\/]+)$/);
Expand All @@ -271,6 +311,17 @@ XHS-Downloader 用户脚本 详细说明：
if (!result.every(item => item === true)) {
abnormal();
}

// TODO: 未生效
// let success;
// if (urls.length > 1) {
// success = await downloadFiles(urls, name,);
// } else {
// success = await downloadFile(urls[0], `${name}.png`);
// }
// if (!success) {
// abnormal();
// }
};

const window_scrollBy = (x, y,) => {
Expand Down Expand Up @@ -345,7 +396,7 @@ XHS-Downloader 用户脚本 详细说明：
return notesRawValue.map(item => [item.id, item.xsecToken,]);
};

const extractBoardInfo = order => {
const extractBoardInfo = () => {
// 定义正则表达式来匹配 URL 中的 ID
const regex = /\/board\/([a-z0-9]+)\?/;

Expand Down Expand Up @@ -571,4 +622,11 @@ XHS-Downloader 用户脚本 详细说明：
style.type = 'text/css';
style.appendChild(document.createTextNode(buttonStyle));
console.info("用户接受 XHS-Downloader 免责声明", disclaimer)

if (typeof JSZip === 'undefined') {
alert("XHS-Downloader 用户脚本依赖库 JSZip 加载失败，下载功能可能无法使用！");
}
if (typeof saveAs === 'undefined') {
alert("XHS-Downloader 用户脚本依赖库 FileSaver 加载失败，下载功能可能无法使用！");
}
})();

0 comments on commit 7eb270b

Please sign in to comment.