Support iOS platform

Signed-off-by: Yuan Si <do4suki@gmail.com>

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/forgoer/openssl v1.5.0
 	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/tidwall/gjson v1.14.4
+	xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978
 	xorm.io/xorm v1.3.2
 )
 
@@ -15,7 +16,6 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
-	xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978
 )
 
 require (

handler/download.go

@@ -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
-		CheckErr(err)
+		err := MainEng.Table("download_m").Where("pkg_type = ? AND pkg_id = ? AND pkg_os = ?", pkgType, pkgId, downloadReq.TargetOs).
-		defer stmt.Close()
+			Cols("pkg_id,pkg_order,pkg_size").
-		rows, err := stmt.Query(pkgType, pkgId)
+			OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
-		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,
+				Size: pkg.Size,
-				URL:  fmt.Sprintf("%s/archives/%d_%d_%d.zip", CdnUrl, pkgType, pkgId, pkgOrder),
+				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 := ""
+		var pkgInfo []PkgInfo
-		if len(downloadReq.ExcludedPackageIds) > 0 {
+		err := MainEng.Table("download_m").Where(builder.NotIn("pkg_id", downloadReq.ExcludedPackageIds)).Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.Os).
-			// https://stackoverflow.com/a/37533144
+			Cols("pkg_id,pkg_order,pkg_size").
-			exPkgId = strings.Trim(strings.Join(strings.Fields(fmt.Sprint(downloadReq.ExcludedPackageIds)), ","), "[]")
+			OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
+		CheckErr(err)
 
-			exPkgId = fmt.Sprintf("AND pkg_id NOT IN (%s)", exPkgId)
+		for _, pkg := range pkgInfo {
-		}
-		// 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)
 			pkgList = append(pkgList, model.BatchResult{
-				Size: pkgSize,
+				Size: pkg.Size,
-				URL:  fmt.Sprintf("%s/archives/%d_%d_%d.zip", CdnUrl, pkgType, pkgId, pkgOrder),
+				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
-		CheckErr(err)
+		err := MainEng.Table("download_m").Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.TargetOs).
-		for rows.Next() {
+			Cols("pkg_id,pkg_order,pkg_size").
-			var pkgId, pkgOrder, pkgSize int
+			OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
-			err = rows.Scan(&pkgId, &pkgOrder, &pkgSize)
 		CheckErr(err)
+
+		for _, pkg := range pkgInfo {
 			pkgList = append(pkgList, model.UpdateResult{
-				Size:    pkgSize,
+				Size:    pkg.Size,
-				URL:     fmt.Sprintf("%s/archives/%d_%d_%d.zip", CdnUrl, pkgType, pkgId, pkgOrder),
+				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{

handler/live.go

@@ -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)

main.go

@@ -102,5 +102,5 @@ func main() {
 		ctx.HTML(http.StatusOK, "manga.tmpl", gin.H{})
 	})
 
-	r.Run(":8080") // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
+	r.Run(":80") // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
 }

middleware/common.go

@@ -24,6 +24,13 @@ func CheckErr(err error) {
 func Common(ctx *gin.Context) {
 	ctx.Set("req_time", time.Now().Unix())
 
+	ctx.Request.ParseMultipartForm(0)
+	if len(ctx.PostForm("request_data")) == 0 {
+		// 弱智iOS客户端经常发些空的表单上来...
+		fmt.Println("Fuck you, iOS!")
+		ctx.Abort()
+	}
+
 	authorize := ctx.Request.Header.Get("Authorize")
 	if authorize == "" {
 		ctx.String(http.StatusForbidden, ErrorMsg)

tools/download.go

@@ -0,0 +1,72 @@
+package tools
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	_ "github.com/mattn/go-sqlite3"
+)
+
+func GenDownloadDb() {
+	// Create table
+	// CREATE TABLE "download_m" (
+	// 	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	// 	"pkg_type" integer,
+	// 	"pkg_id" integer,
+	// 	"pkg_order" integer,
+	// 	"pkg_size" integer,
+	// 	"pkg_os" TEXT
+	//   );
+	fileLists, err := os.ReadDir("F:/sif_dl/list_CN_Android")
+	CheckErr(err)
+	for _, v := range fileLists {
+		if v.IsDir() {
+			panic(err)
+		}
+		fileList := "F:/sif_dl/list_CN_Android/" + v.Name()
+		fileStat, err := os.Stat(fileList)
+		CheckErr(err)
+		pkgSize := fileStat.Size()
+		fileInfo := strings.Split(strings.ReplaceAll(v.Name(), ".zip", ""), "_")
+		pkgType, pkgId, pkgOrder := fileInfo[0], fileInfo[1], fileInfo[2]
+		fmt.Printf("Android: %s - %s - %s - %d\n", pkgType, pkgId, pkgOrder, pkgSize)
+
+		stmt, err := MainEng.DB().Prepare("INSERT INTO download_m(pkg_type,pkg_id,pkg_order,pkg_size,pkg_os) VALUES (?,?,?,?,?)")
+		CheckErr(err)
+		defer stmt.Close()
+
+		res, err := stmt.Exec(pkgType, pkgId, pkgOrder, pkgSize, "Android")
+		CheckErr(err)
+
+		id, err := res.LastInsertId()
+		CheckErr(err)
+		fmt.Println("LastInsertId:", id)
+	}
+
+	fileLists, err = os.ReadDir("F:/sif_dl/list_CN_iOS")
+	CheckErr(err)
+	for _, v := range fileLists {
+		if v.IsDir() {
+			panic(err)
+		}
+		fileList := "F:/sif_dl/list_CN_iOS/" + v.Name()
+		fileStat, err := os.Stat(fileList)
+		CheckErr(err)
+		pkgSize := fileStat.Size()
+		fileInfo := strings.Split(strings.ReplaceAll(v.Name(), ".zip", ""), "_")
+		pkgType, pkgId, pkgOrder := fileInfo[0], fileInfo[1], fileInfo[2]
+		fmt.Printf("iOS: %s - %s - %s - %d\n", pkgType, pkgId, pkgOrder, pkgSize)
+
+		stmt, err := MainEng.DB().Prepare("INSERT INTO download_m(pkg_type,pkg_id,pkg_order,pkg_size,pkg_os) VALUES (?,?,?,?,?)")
+		CheckErr(err)
+		defer stmt.Close()
+
+		res, err := stmt.Exec(pkgType, pkgId, pkgOrder, pkgSize, "iOS")
+		CheckErr(err)
+
+		id, err := res.LastInsertId()
+		CheckErr(err)
+		fmt.Println("LastInsertId:", id)
+	}
+}

tools/download_db.go

@@ -1,46 +0,0 @@
-package tools
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	_ "github.com/mattn/go-sqlite3"
-)
-
-func GenDownloadDb() {
-	// Create table
-	// sql := `CREATE TABLE "main"."download_db" (
-	// 	"id" integer NOT NULL,
-	// 	"pkg_type" integer,
-	// 	"pkg_id" integer,
-	// 	"pkg_order" integer,
-	// 	"pkg_size" integer,
-	// 	PRIMARY KEY ("id")
-	//   )`
-	fileLists, err := os.ReadDir("F:/sif_dl/list_CN_Android")
-	CheckErr(err)
-	for _, v := range fileLists {
-		if v.IsDir() {
-			panic(err)
-		}
-		fileList := "F:/sif_dl/list_CN_Android/" + v.Name()
-		fileStat, err := os.Stat(fileList)
-		CheckErr(err)
-		pkgSize := fileStat.Size()
-		fileInfo := strings.Split(strings.ReplaceAll(v.Name(), ".zip", ""), "_")
-		pkgType, pkgId, pkgOrder := fileInfo[0], fileInfo[1], fileInfo[2]
-		fmt.Printf("%s - %s - %s - %d\n", pkgType, pkgId, pkgOrder, pkgSize)
-
-		stmt, err := MainEng.DB().Prepare("INSERT INTO download_db(pkg_type,pkg_id,pkg_order,pkg_size) VALUES (?,?,?,?)")
-		CheckErr(err)
-		defer stmt.Close()
-
-		res, err := stmt.Exec(pkgType, pkgId, pkgOrder, pkgSize)
-		CheckErr(err)
-
-		id, err := res.LastInsertId()
-		CheckErr(err)
-		fmt.Println("LastInsertId:", id)
-	}
-}