Support iOS platform

Signed-off-by: Yuan Si <do4suki@gmail.com>
This commit is contained in:
2023-04-22 18:58:51 +08:00
parent d9559203a3
commit a207b6642f
8 changed files with 114 additions and 86 deletions
+33 -37
View File
@@ -12,8 +12,15 @@ import (
"github.com/gin-gonic/gin"
_ "github.com/mattn/go-sqlite3"
"xorm.io/builder"
)
type PkgInfo struct {
Id int `xorm:"pkg_id"`
Order int `xorm:"pkg_order"`
Size int `xorm:"pkg_size"`
}
func DownloadAdditionalHandler(ctx *gin.Context) {
downloadReq := model.AdditionalReq{}
if err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &downloadReq); err != nil {
@@ -22,18 +29,16 @@ func DownloadAdditionalHandler(ctx *gin.Context) {
pkgList := []model.AdditionalResult{}
if CdnUrl != "" {
pkgType, pkgId := downloadReq.PackageType, downloadReq.PackageID
stmt, err := MainEng.DB().Prepare("SELECT pkg_order,pkg_size FROM download_db WHERE pkg_type = ? AND pkg_id = ? ORDER BY pkg_order ASC")
var pkgInfo []PkgInfo
err := 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)
CheckErr(err)
defer stmt.Close()
rows, err := stmt.Query(pkgType, pkgId)
CheckErr(err)
for rows.Next() {
var pkgOrder, pkgSize int
err = rows.Scan(&pkgOrder, &pkgSize)
CheckErr(err)
for _, pkg := range pkgInfo {
pkgList = append(pkgList, model.AdditionalResult{
Size: pkgSize,
URL: fmt.Sprintf("%s/archives/%d_%d_%d.zip", CdnUrl, pkgType, pkgId, pkgOrder),
Size: pkg.Size,
URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip", CdnUrl, downloadReq.TargetOs, pkgType, pkg.Id, pkg.Order),
})
}
}
@@ -64,26 +69,16 @@ func DownloadBatchHandler(ctx *gin.Context) {
pkgList := []model.BatchResult{}
if downloadReq.ClientVersion == PackageVersion && CdnUrl != "" {
pkgType := downloadReq.PackageType
exPkgId := ""
if len(downloadReq.ExcludedPackageIds) > 0 {
// https://stackoverflow.com/a/37533144
exPkgId = strings.Trim(strings.Join(strings.Fields(fmt.Sprint(downloadReq.ExcludedPackageIds)), ","), "[]")
var pkgInfo []PkgInfo
err := MainEng.Table("download_m").Where(builder.NotIn("pkg_id", downloadReq.ExcludedPackageIds)).Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.Os).
Cols("pkg_id,pkg_order,pkg_size").
OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
CheckErr(err)
exPkgId = fmt.Sprintf("AND pkg_id NOT IN (%s)", exPkgId)
}
// fmt.Println(exPkgId)
stmt, err := MainEng.DB().Prepare("SELECT pkg_id,pkg_order,pkg_size FROM download_db WHERE pkg_type = ? " + exPkgId + " ORDER BY pkg_id ASC, pkg_order ASC")
CheckErr(err)
defer stmt.Close()
rows, err := stmt.Query(pkgType)
CheckErr(err)
for rows.Next() {
var pkgId, pkgOrder, pkgSize int
err = rows.Scan(&pkgId, &pkgOrder, &pkgSize)
CheckErr(err)
for _, pkg := range pkgInfo {
pkgList = append(pkgList, model.BatchResult{
Size: pkgSize,
URL: fmt.Sprintf("%s/archives/%d_%d_%d.zip", CdnUrl, pkgType, pkgId, pkgOrder),
Size: pkg.Size,
URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip", CdnUrl, downloadReq.Os, pkgType, pkg.Id, pkg.Order),
})
}
}
@@ -114,15 +109,16 @@ func DownloadUpdateHandler(ctx *gin.Context) {
pkgList := []model.UpdateResult{}
if downloadReq.ExternalVersion != PackageVersion && CdnUrl != "" {
pkgType := 99
rows, err := MainEng.DB().Query("SELECT pkg_id,pkg_order,pkg_size FROM download_db WHERE pkg_type = 99 ORDER BY pkg_id ASC, pkg_order ASC")
var pkgInfo []PkgInfo
err := 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)
CheckErr(err)
for rows.Next() {
var pkgId, pkgOrder, pkgSize int
err = rows.Scan(&pkgId, &pkgOrder, &pkgSize)
CheckErr(err)
for _, pkg := range pkgInfo {
pkgList = append(pkgList, model.UpdateResult{
Size: pkgSize,
URL: fmt.Sprintf("%s/archives/%d_%d_%d.zip", CdnUrl, pkgType, pkgId, pkgOrder),
Size: pkg.Size,
URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip", CdnUrl, downloadReq.TargetOs, pkgType, pkg.Id, pkg.Order),
Version: PackageVersion,
})
}
@@ -147,7 +143,7 @@ func DownloadUpdateHandler(ctx *gin.Context) {
}
func DownloadUrlHandler(ctx *gin.Context) {
// Extract SQL: SELECT CAST(pkg_type AS TEXT) || '_' || CAST(pkg_id AS TEXT) || '_' || CAST(pkg_order AS TEXT) || '.zip' AS zip_name FROM download_db ORDER BY pkg_type ASC,pkg_id ASC, pkg_order ASC;
// Extract SQL: SELECT CAST(pkg_type AS TEXT) || '_' || CAST(pkg_id AS TEXT) || '_' || CAST(pkg_order AS TEXT) || '.zip' AS zip_name FROM download_m ORDER BY pkg_type ASC,pkg_id ASC, pkg_order ASC;
// Extract Cmd: cat list.txt | while read line; do; unzip -o $line; done
downloadReq := model.UrlReq{}
if err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &downloadReq); err != nil {
@@ -155,7 +151,7 @@ func DownloadUrlHandler(ctx *gin.Context) {
}
urlList := []string{}
for _, v := range downloadReq.PathList {
urlList = append(urlList, fmt.Sprintf("%s/extracted/%s", CdnUrl, strings.ReplaceAll(v, "\\", "")))
urlList = append(urlList, fmt.Sprintf("%s/%s/extracted/%s", CdnUrl, downloadReq.Os, strings.ReplaceAll(v, "\\", "")))
}
urlResp := model.UrlResp{
ResponseData: model.UrlResult{
-1
View File
@@ -38,7 +38,6 @@ func PartyListHandler(ctx *gin.Context) {
}
func PlayLiveHandler(ctx *gin.Context) {
fmt.Println(ctx.PostForm("request_data"))
playReq := model.PlayReq{}
err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &playReq)
CheckErr(err)