♻️ refactor(handlers): status 与 review 页面模板化
- HTML 提取至 templates/status.html、templates/review.html(go:embed 内嵌) - status.go 1022→271 行、review.go 1281→438 行,动态数据全部经 html/template 按上下文自动转义 - 评论循环/作者徽章/贴纸/图片条件渲染翻译为模板 range/if;emojiMap 以 template.JS 注入 - 与旧版渲染输出实测对比:22 条评论结构完全一致;差异仅为 JS 上下文安全转义(& 等)与 html/template 剥除 CSS 注释,均无功能影响 - 其余文件为 gofmt 顺手格式化
This commit is contained in:
1 parent
ad6d28fd85
commit
5bcc8a962e
29 files changed
+1267
-2893
No files matched your search
+18
-19
@@ -71,14 +71,14 @@ func getMangaWithRetry(itemID string, showHTML bool, urlOutputMode string, retry
|
||||
mangaLogger.Warning(fmt.Sprintf("已重试 %d 次,获取漫画失败", maxRetries))
|
||||
return nil, fmt.Errorf("已重试 %d 次,所有设备均失败", maxRetries)
|
||||
}
|
||||
|
||||
|
||||
// 1. 从设备密钥池获取设备
|
||||
pool := GetDeviceKeyPool()
|
||||
item, err := pool.GetNext()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("从设备池获取设备失败: %w", err)
|
||||
}
|
||||
|
||||
|
||||
header := item.DeviceHeader
|
||||
keyInfo := &KeyInfo{
|
||||
Key: item.Key,
|
||||
@@ -171,18 +171,18 @@ func getMangaWithRetry(itemID string, showHTML bool, urlOutputMode string, retry
|
||||
// 是漫画,决定输出模式
|
||||
// 优先级:URL参数 > 配置文件 > 默认值
|
||||
outputMode := "proxy" // 默认值
|
||||
|
||||
|
||||
// 从配置文件读取
|
||||
cfg := config.GetConfig()
|
||||
if cfg != nil && cfg.Fanqie.Manga.OutputMode != "" {
|
||||
outputMode = cfg.Fanqie.Manga.OutputMode
|
||||
}
|
||||
|
||||
|
||||
// URL参数优先级最高
|
||||
if urlOutputMode != "" {
|
||||
outputMode = urlOutputMode
|
||||
}
|
||||
|
||||
|
||||
// 解析漫画图片(传入keyInfo用于解密模式)
|
||||
images, err := parseMangaImages(decrypted, showHTML, outputMode, itemID, keyInfo)
|
||||
if err != nil {
|
||||
@@ -279,7 +279,7 @@ func buildMangaResponse(images []ImageResult, showHTML bool) interface{} {
|
||||
"content": htmlContent.String(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return map[string]interface{}{
|
||||
"images": images,
|
||||
}
|
||||
@@ -289,7 +289,7 @@ func buildMangaResponse(images []ImageResult, showHTML bool) interface{} {
|
||||
func processURLMode(mangaData *MangaData) []ImageResult {
|
||||
baseDomain := "https://p6-novel.byteimg.com/origin/"
|
||||
validPath := detectMangaPath(baseDomain, mangaData.PicInfos[0].Md5)
|
||||
|
||||
|
||||
images := make([]ImageResult, len(mangaData.PicInfos))
|
||||
for i, pic := range mangaData.PicInfos {
|
||||
imageURL := baseDomain + validPath + pic.Md5
|
||||
@@ -309,7 +309,7 @@ func processProxyMode(mangaData *MangaData, itemID string) []ImageResult {
|
||||
images := make([]ImageResult, len(mangaData.PicInfos))
|
||||
for i, pic := range mangaData.PicInfos {
|
||||
cacheKey := fmt.Sprintf("%s_%d", itemID, i)
|
||||
|
||||
|
||||
// 存储图片信息到缓存
|
||||
mangaCacheMutex.Lock()
|
||||
mangaImageCache[cacheKey] = &MangaImageInfo{
|
||||
@@ -320,7 +320,7 @@ func processProxyMode(mangaData *MangaData, itemID string) []ImageResult {
|
||||
CachedAt: time.Now(),
|
||||
}
|
||||
mangaCacheMutex.Unlock()
|
||||
|
||||
|
||||
// 返回短的代理URL
|
||||
imageData := fmt.Sprintf("/manga/image/%s/%d", itemID, i)
|
||||
images[i] = ImageResult{
|
||||
@@ -390,7 +390,7 @@ func processDataURIMode(mangaData *MangaData) []ImageResult {
|
||||
|
||||
// Base64编码图片数据
|
||||
base64Data := base64.StdEncoding.EncodeToString(decryptedData)
|
||||
|
||||
|
||||
// Data URI模式:返回完整的Base64编码
|
||||
mimeType := fmt.Sprintf("image/%s", format)
|
||||
if format == "jpg" {
|
||||
@@ -542,31 +542,31 @@ func decryptImage(encryptedData, keyBytes []byte) ([]byte, error) {
|
||||
func detectMangaPath(baseDomain, firstMd5 string) string {
|
||||
// 优先尝试 novel-images/
|
||||
testURL := baseDomain + "novel-images/" + firstMd5
|
||||
|
||||
|
||||
client := &http.Client{
|
||||
Timeout: 8 * time.Second,
|
||||
}
|
||||
|
||||
|
||||
resp, err := client.Get(testURL)
|
||||
if err != nil {
|
||||
// 请求失败,使用novel-pic/
|
||||
return "novel-pic/"
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
|
||||
// 读取响应内容
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return "novel-pic/"
|
||||
}
|
||||
|
||||
|
||||
// 检查是否为JSON响应(错误响应通常是JSON)
|
||||
var jsonData interface{}
|
||||
if json.Unmarshal(body, &jsonData) == nil {
|
||||
// 是JSON,说明路径无效,切换到novel-pic/
|
||||
return "novel-pic/"
|
||||
}
|
||||
|
||||
|
||||
// 不是JSON,说明返回的是图片,路径有效
|
||||
return "novel-images/"
|
||||
}
|
||||
@@ -605,12 +605,11 @@ func getImageFormat(data []byte, url string) string {
|
||||
}
|
||||
|
||||
// WEBP: RIFF...WEBP
|
||||
if bytes.HasPrefix(data, []byte{0x52, 0x49, 0x46, 0x46}) &&
|
||||
len(data) >= 12 &&
|
||||
bytes.Equal(data[8:12], []byte{0x57, 0x45, 0x42, 0x50}) {
|
||||
if bytes.HasPrefix(data, []byte{0x52, 0x49, 0x46, 0x46}) &&
|
||||
len(data) >= 12 &&
|
||||
bytes.Equal(data[8:12], []byte{0x57, 0x45, 0x42, 0x50}) {
|
||||
return "webp"
|
||||
}
|
||||
|
||||
return "png"
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user