YumeMichi/honoka-chan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct package size calculation in batch download

Browse Source 
Signed-off-by: Sean Du <do4suki@gmail.com>
This commit is contained in:
YumeMichi
2026-06-04 01:56:46 +08:00
parent b71dc7c6ae
commit 674d904e84
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handler/download/additional.go
+5 -5
View File
@@ -13,9 +13,10 @@ import (
) )
type PkgInfo struct { type PkgInfo struct {
Id int `xorm:"pkg_id"` PkgType int `xorm:"pkg_type"`
Order int `xorm:"pkg_order"` PkgID int `xorm:"pkg_id"`
Size int `xorm:"pkg_size"` Order int `xorm:"pkg_order"`
Size int `xorm:"pkg_size"`
} }
func additional(ctx *gin.Context) { func additional(ctx *gin.Context) {
@@ -32,7 +33,6 @@ func additional(ctx *gin.Context) {
pkgType, pkgId := downloadReq.PackageType, downloadReq.PackageID pkgType, pkgId := downloadReq.PackageType, downloadReq.PackageID
var pkgInfo []PkgInfo var pkgInfo []PkgInfo
err = ss.MainEng.Table("download_m").Where("pkg_type = ? AND pkg_id = ? AND pkg_os = ?", pkgType, pkgId, downloadReq.TargetOs). err = ss.MainEng.Table("download_m").Where("pkg_type = ? AND pkg_id = ? AND pkg_os = ?", pkgType, pkgId, downloadReq.TargetOs).
Cols("pkg_id,pkg_order,pkg_size").
OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo) OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
if ss.CheckErr(err) { if ss.CheckErr(err) {
return return
@@ -42,7 +42,7 @@ func additional(ctx *gin.Context) {
pkgList = append(pkgList, downloadschema.AdditionalData{ pkgList = append(pkgList, downloadschema.AdditionalData{
Size: pkg.Size, Size: pkg.Size,
URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip", URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip",
config.Conf.Settings.CdnServer, downloadReq.TargetOs, pkgType, pkg.Id, pkg.Order), config.Conf.Settings.CdnServer, downloadReq.TargetOs, pkg.PkgType, pkg.PkgID, pkg.Order),
}) })
} }
internal/handler/download/batch.go
+7 -4
View File
@@ -25,10 +25,13 @@ func batch(ctx *gin.Context) {
pkgList := []downloadschema.BatchData{} pkgList := []downloadschema.BatchData{}
if downloadReq.ClientVersion == config.PackageVersion { if downloadReq.ClientVersion == config.PackageVersion {
pkgType := downloadReq.PackageType // 直接使用 downloadReq.PackageType 会导致下载数据量计算错误
pkgType := 4
var pkgInfo []PkgInfo var pkgInfo []PkgInfo
err := ss.MainEng.Table("download_m").Where(builder.NotIn("pkg_id", downloadReq.ExcludedPackageIds)).Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.Os). err := ss.MainEng.Table("download_m").
Cols("pkg_id,pkg_order,pkg_size"). Where(builder.NotIn("pkg_id", downloadReq.ExcludedPackageIds)).
Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.Os).
OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo) OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
if ss.CheckErr(err) { if ss.CheckErr(err) {
return return
@@ -38,7 +41,7 @@ func batch(ctx *gin.Context) {
pkgList = append(pkgList, downloadschema.BatchData{ pkgList = append(pkgList, downloadschema.BatchData{
Size: pkg.Size, Size: pkg.Size,
URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip", URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip",
config.Conf.Settings.CdnServer, downloadReq.Os, pkgType, pkg.Id, pkg.Order), config.Conf.Settings.CdnServer, downloadReq.Os, pkg.PkgType, pkg.PkgID, pkg.Order),
}) })
} }
} }
internal/handler/download/update.go
+1 -2
View File
@@ -33,7 +33,6 @@ func update(ctx *gin.Context) {
pkgType := 99 pkgType := 99
var pkgInfo []PkgInfo var pkgInfo []PkgInfo
err := ss.MainEng.Table("download_m").Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.TargetOs). err := ss.MainEng.Table("download_m").Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.TargetOs).
Cols("pkg_id,pkg_order,pkg_size").
OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo) OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
if ss.CheckErr(err) { if ss.CheckErr(err) {
return return
@@ -41,7 +40,7 @@ func update(ctx *gin.Context) {
pkgMap := map[string]int{} pkgMap := map[string]int{}
for _, pkg := range pkgInfo { for _, pkg := range pkgInfo {
fileName := fmt.Sprintf("%d_%d_%d.zip", pkgType, pkg.Id, pkg.Order) fileName := fmt.Sprintf("%d_%d_%d.zip", pkg.PkgType, pkg.PkgID, pkg.Order)
url := fmt.Sprintf("%s/%s/archives/%s", url := fmt.Sprintf("%s/%s/archives/%s",
config.Conf.Settings.CdnServer, downloadReq.TargetOs, fileName) config.Conf.Settings.CdnServer, downloadReq.TargetOs, fileName)