Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(chaoxing):fix JSON parsing error in content field #5877

Merged
merged 3 commits into from
Jan 14, 2024
Merged

fix(chaoxing):fix JSON parsing error in content field #5877

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06b0a4f
fix(chaoxing):fix JSON parsing error in `content` field
SoY0ung Jan 12, 2024
e5e544d
fix(chaoxing): optimizing `UnmarshalJSON` implementation
SoY0ung Jan 13, 2024
7e36cd6
fix(chaoxing): use `objectID` when is empty
SoY0ung Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 61 additions & 35 deletions drivers/chaoxing/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package chaoxing

import (
"encoding/json"
"fmt"
"strconv"
"time"

"github.com/alist-org/alist/v3/internal/model"
Expand Down Expand Up @@ -88,44 +90,69 @@ type UserAuth struct {
} `json:"operationAuth"`
}

// 手机端学习通上传的文件的json内容(content字段)与网页端上传的有所不同
// 网页端json `"puid": 54321, "size": 12345`
// 手机端json `"puid": "54321". "size": "12345"`
type int_str int

// UnmarshalJSON 实现 json.Unmarshaler 接口
func (ios *int_str) UnmarshalJSON(data []byte) error {
// 解析为int
var intValue int
if err := json.Unmarshal(data, &intValue); err == nil {
*ios = int_str(intValue)
return nil
}
// 解析string再转int
var strValue string
if err := json.Unmarshal(data, &strValue); err == nil {
intValue, err := strconv.Atoi(strValue)
if err != nil {
return fmt.Errorf("json: cannot unmarshal data into Go struct field .list.content._ of type int_string")
}
*ios = int_str(intValue)
}
return nil
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

没必要这样转，json字符串和数字就双引号的区别，删除双引号就是数字

intValue, err := strconv.Atoi(string(bytes.Trim(data , "\"")))
if err != nil {
		return err
}
*ios = int_str(intValue)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

谢谢您的指正，已经改进


type File struct {
Cataid int `json:"cataid"`
Cfid int `json:"cfid"`
Content struct {
Cfid int `json:"cfid"`
Pid int `json:"pid"`
FolderName string `json:"folderName"`
ShareType int `json:"shareType"`
Preview string `json:"preview"`
Filetype string `json:"filetype"`
PreviewURL string `json:"previewUrl"`
IsImg bool `json:"isImg"`
ParentPath string `json:"parentPath"`
Icon string `json:"icon"`
Suffix string `json:"suffix"`
Duration int `json:"duration"`
Pantype string `json:"pantype"`
Puid int `json:"puid"`
Filepath string `json:"filepath"`
Crc string `json:"crc"`
Isfile bool `json:"isfile"`
Residstr string `json:"residstr"`
ObjectID string `json:"objectId"`
Extinfo string `json:"extinfo"`
Thumbnail string `json:"thumbnail"`
Creator int `json:"creator"`
ResTypeValue int `json:"resTypeValue"`
UploadDateFormat string `json:"uploadDateFormat"`
DisableOpt bool `json:"disableOpt"`
DownPath string `json:"downPath"`
Sort int `json:"sort"`
Topsort int `json:"topsort"`
Restype string `json:"restype"`
Size int `json:"size"`
UploadDate string `json:"uploadDate"`
FileSize string `json:"fileSize"`
Name string `json:"name"`
FileID string `json:"fileId"`
Cfid int `json:"cfid"`
Pid int `json:"pid"`
FolderName string `json:"folderName"`
ShareType int `json:"shareType"`
Preview string `json:"preview"`
Filetype string `json:"filetype"`
PreviewURL string `json:"previewUrl"`
IsImg bool `json:"isImg"`
ParentPath string `json:"parentPath"`
Icon string `json:"icon"`
Suffix string `json:"suffix"`
Duration int `json:"duration"`
Pantype string `json:"pantype"`
Puid int_str `json:"puid"`
Filepath string `json:"filepath"`
Crc string `json:"crc"`
Isfile bool `json:"isfile"`
Residstr string `json:"residstr"`
ObjectID string `json:"objectId"`
Extinfo string `json:"extinfo"`
Thumbnail string `json:"thumbnail"`
Creator int `json:"creator"`
ResTypeValue int `json:"resTypeValue"`
UploadDateFormat string `json:"uploadDateFormat"`
DisableOpt bool `json:"disableOpt"`
DownPath string `json:"downPath"`
Sort int `json:"sort"`
Topsort int `json:"topsort"`
Restype string `json:"restype"`
Size int_str `json:"size"`
UploadDate string `json:"uploadDate"`
FileSize string `json:"fileSize"`
Name string `json:"name"`
FileID string `json:"fileId"`
} `json:"content"`
CreatorID int `json:"creatorId"`
DesID string `json:"des_id"`
Expand Down Expand Up @@ -204,7 +231,6 @@ type UploadFileDataRsp struct {
} `json:"data"`
}


type UploadDoneParam struct {
Cataid string `json:"cataid"`
Key string `json:"key"`
Expand Down