Remove personal CDN override hacks

These CDN compatibility hacks are personal deployment adjustments and should not live in the public codebase.

Keep them in a separate personal branch when needed, while preserving only the generic 99_0_115.zip probe-and-append behavior in the shared branch.

Signed-off-by: Sean Du <do4suki@gmail.com>
This commit is contained in:
2026-06-04 14:50:41 +08:00
parent b32b5fd531
commit d8875490b6
4 changed files with 16 additions and 176 deletions
+1 -6
View File
@@ -23,15 +23,10 @@ func getUrl(ctx *gin.Context) {
return
}
cdnServer := config.Conf.Settings.BackupCdnServer
if cdnServer == "" {
cdnServer = config.Conf.Settings.CdnServer
}
urlList := []string{}
for _, v := range downloadReq.PathList {
urlList = append(urlList, fmt.Sprintf("%s/%s/extracted/%s",
cdnServer, downloadReq.Os, strings.ReplaceAll(v, "\\", "")))
config.Conf.Settings.CdnServer, downloadReq.Os, strings.ReplaceAll(v, "\\", "")))
}
ss.Respond(downloadschema.UrlResp{
+10 -88
View File
@@ -10,7 +10,6 @@ import (
honokautils "honoka-chan/internal/utils"
"io"
"net/http"
"strings"
"time"
"github.com/gin-gonic/gin"
@@ -38,7 +37,6 @@ func update(ctx *gin.Context) {
return
}
pkgMap := map[string]int{}
for _, pkg := range pkgInfo {
fileName := fmt.Sprintf("%d_%d_%d.zip", pkg.PkgType, pkg.PkgID, pkg.Order)
url := fmt.Sprintf("%s/%s/archives/%s",
@@ -49,28 +47,18 @@ func update(ctx *gin.Context) {
URL: url,
Version: config.PackageVersion,
})
pkgMap[fileName] = len(pkgList) - 1
}
overrideSource := getOverrideSource(downloadReq.TargetOs)
serverConfigURL := fmt.Sprintf("%s/%s/archives/%s",
config.Conf.Settings.CdnServer, downloadReq.TargetOs, overrideServerConfigFileName)
serverConfigURL, serverConfigSize, serverConfigAvailable := resolveServerConfigFile(serverConfigURL, overrideSource)
if serverConfigAvailable {
if index, ok := pkgMap[overrideServerConfigFileName]; ok {
pkgList[index].URL = serverConfigURL
pkgList[index].Size = serverConfigSize
} else {
pkgList = append(pkgList, downloadschema.UpdateData{
Size: serverConfigSize,
URL: serverConfigURL,
Version: config.PackageVersion,
})
}
serverConfigSize, ok := getRemoteFileSize(serverConfigURL)
if ok {
pkgList = append(pkgList, downloadschema.UpdateData{
Size: serverConfigSize,
URL: serverConfigURL,
Version: config.PackageVersion,
})
}
applyOverrideFileSize(downloadReq.TargetOs, pkgList)
}
ss.Respond(downloadschema.UpdateResp{
@@ -80,32 +68,6 @@ func update(ctx *gin.Context) {
})
}
func getOverrideSource(targetOs string) config.OverrideFileSource {
if strings.EqualFold(targetOs, "Android") {
return config.Conf.Settings.OverrideServerConfig.Android
}
if strings.EqualFold(targetOs, "iOS") {
return config.Conf.Settings.OverrideServerConfig.IOS
}
return config.OverrideFileSource{}
}
func resolveServerConfigFile(defaultURL string, overrideSource config.OverrideFileSource) (string, int, bool) {
if config.Conf.Settings.OverrideServerConfig.Enable && overrideSource.URL != "" {
size, ok := getRemoteFileSize(overrideSource.URL)
if !ok {
return overrideSource.URL, 0, false
}
if overrideSource.Size > 0 {
size = overrideSource.Size
}
return overrideSource.URL, size, true
}
size, ok := getRemoteFileSize(defaultURL)
return defaultURL, size, ok
}
func getRemoteFileSize(url string) (int, bool) {
client := &http.Client{Timeout: 5 * time.Second}
@@ -113,10 +75,9 @@ func getRemoteFileSize(url string) (int, bool) {
if err == nil {
if resp, err := client.Do(headReq); err == nil {
_ = resp.Body.Close()
if resp.StatusCode >= http.StatusOK && resp.StatusCode < http.StatusMultipleChoices {
if resp.ContentLength > 0 {
return int(resp.ContentLength), true
}
if resp.StatusCode >= http.StatusOK &&
resp.StatusCode < http.StatusMultipleChoices && resp.ContentLength > 0 {
return int(resp.ContentLength), true
}
}
}
@@ -138,45 +99,6 @@ func getRemoteFileSize(url string) (int, bool) {
return int(dataLen), dataLen > 0
}
func applyOverrideFileSize(targetOs string, pkgList []downloadschema.UpdateData) {
urlSizeCache := map[string]int{}
for i := range pkgList {
fileName := getFileNameFromURL(pkgList[i].URL)
if fileName == "" {
continue
}
for _, override := range config.Conf.Settings.OverrideFileSize {
overrideOs := strings.TrimSpace(override.TargetOs)
if overrideOs != "" && !strings.EqualFold(overrideOs, strings.TrimSpace(targetOs)) {
continue
}
if strings.EqualFold(strings.TrimSpace(override.FileName), fileName) {
size, ok := urlSizeCache[pkgList[i].URL]
if !ok {
size, _ = getRemoteFileSize(pkgList[i].URL)
urlSizeCache[pkgList[i].URL] = size
}
if size > 0 {
pkgList[i].Size = size
}
break
}
}
}
}
func getFileNameFromURL(rawURL string) string {
urlNoQuery := strings.Split(rawURL, "?")[0]
parts := strings.Split(urlNoQuery, "/")
if len(parts) == 0 {
return ""
}
return strings.TrimSpace(parts[len(parts)-1])
}
func init() {
router.AddHandler("main.php", "POST", "/download/update", middleware.Common, update)
}