doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(server): e2e tests fails because db interface is updated

Browse source
This commit is contained in:
hexxa 2022-10-08 15:38:39 +08:00 • committed by Hexxa
parent 2b50c84273
commit 1b39b7ebf7
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/db/rdb/sqlite/init.go
View file

@ -20,7 +20,7 @@ type SQLite struct {
} }
func NewSQLite(dbPath string) (*SQLite, error) { func NewSQLite(dbPath string) (*SQLite, error) {
db, err := sql.Open("sqlite3", fmt.Sprintf("%s?_sync=FULL&_locking=EXCLUSIVE", dbPath)) db, err := sql.Open("sqlite3", fmt.Sprintf("%s?_sync=FULL&_vacuum=incremental", dbPath))
if err != nil { if err != nil {
return nil, err return nil, err
} }

15
src/handlers/fileshdr/handlers.go
View file

@ -142,10 +142,11 @@ func (h *FileHandlers) Create(c *gin.Context) {
return return
} }
infoId := h.deps.ID().Gen()
tmpFilePath := q.UploadPath(userName, fsFilePath) tmpFilePath := q.UploadPath(userName, fsFilePath)
if req.FileSize == 0 { if req.FileSize == 0 {
// TODO: limit the number of files with 0 byte // TODO: limit the number of files with 0 byte
err = h.deps.FileInfos().AddUploadInfos(c, userID, tmpFilePath, fsFilePath, &db.FileInfo{ err = h.deps.FileInfos().AddUploadInfos(c, infoId, userID, tmpFilePath, fsFilePath, &db.FileInfo{
Size: req.FileSize, Size: req.FileSize,
}) })
if err != nil { if err != nil {
@ -157,7 +158,9 @@ func (h *FileHandlers) Create(c *gin.Context) {
return return
} }
err = h.deps.FileInfos().MoveUploadingInfos(c, userID, tmpFilePath, fsFilePath) // it is ok to use same info ID here
// because the upload info is just moved to the right place after creating.
err = h.deps.FileInfos().MoveUploadingInfos(c, infoId, userID, tmpFilePath, fsFilePath)
if err != nil { if err != nil {
c.JSON(q.ErrResp(c, 500, err)) c.JSON(q.ErrResp(c, 500, err))
return return
@ -210,7 +213,7 @@ func (h *FileHandlers) Create(c *gin.Context) {
return return
} }
err = h.deps.FileInfos().AddUploadInfos(c, userID, tmpFilePath, fsFilePath, &db.FileInfo{ err = h.deps.FileInfos().AddUploadInfos(c, infoId, userID, tmpFilePath, fsFilePath, &db.FileInfo{
Size: req.FileSize, Size: req.FileSize,
}) })
if err != nil { if err != nil {
@ -517,8 +520,9 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
} }
// move the file from uploading dir to uploaded dir // move the file from uploading dir to uploaded dir
infoId := h.deps.ID().Gen()
if uploaded+int64(wrote) == fileSize { if uploaded+int64(wrote) == fileSize {
err = h.deps.FileInfos().MoveUploadingInfos(c, userId, tmpFilePath, fsFilePath) err = h.deps.FileInfos().MoveUploadingInfos(c, infoId, userId, tmpFilePath, fsFilePath)
if err != nil { if err != nil {
return 500, err return 500, err
} }
@ -1017,7 +1021,8 @@ func (h *FileHandlers) AddSharing(c *gin.Context) {
return return
} }
err = h.deps.FileInfos().AddSharing(c, userId, sharingPath) infoId := h.deps.ID().Gen()
err = h.deps.FileInfos().AddSharing(c, infoId, userId, sharingPath)
if err != nil { if err != nil {
c.JSON(q.ErrResp(c, 500, err)) c.JSON(q.ErrResp(c, 500, err))
return return

4
src/server/config_load_test.go
View file

@ -90,7 +90,7 @@ func TestLoadCfg(t *testing.T) {
BgColor: "", BgColor: "",
}, },
AllowSetBg: false, AllowSetBg: false,
AutoTheme: true, AutoTheme: false,
}, },
} }
@ -156,7 +156,7 @@ func TestLoadCfg(t *testing.T) {
BgColor: "", BgColor: "",
}, },
AllowSetBg: false, AllowSetBg: false,
AutoTheme: true, AutoTheme: false,
}, },
}, },
Db: &DbConfig{ Db: &DbConfig{

BIN
src/server/testdata/quickshare.sqlite vendored Normal file
View file

Binary file not shown.