From 1b39b7ebf7155c5e01856a201ccdf2cfa6f376f3 Mon Sep 17 00:00:00 2001 From: hexxa Date: Sat, 8 Oct 2022 15:38:39 +0800 Subject: [PATCH] fix(server): e2e tests fails because db interface is updated --- src/db/rdb/sqlite/init.go | 2 +- src/handlers/fileshdr/handlers.go | 15 ++++++++++----- src/server/config_load_test.go | 4 ++-- src/server/testdata/quickshare.sqlite | Bin 0 -> 61440 bytes 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 src/server/testdata/quickshare.sqlite diff --git a/src/db/rdb/sqlite/init.go b/src/db/rdb/sqlite/init.go index 60b08fe..67e1596 100644 --- a/src/db/rdb/sqlite/init.go +++ b/src/db/rdb/sqlite/init.go @@ -20,7 +20,7 @@ type SQLite struct { } 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 { return nil, err } diff --git a/src/handlers/fileshdr/handlers.go b/src/handlers/fileshdr/handlers.go index 5c4b81f..3d4311d 100644 --- a/src/handlers/fileshdr/handlers.go +++ b/src/handlers/fileshdr/handlers.go @@ -142,10 +142,11 @@ func (h *FileHandlers) Create(c *gin.Context) { return } + infoId := h.deps.ID().Gen() tmpFilePath := q.UploadPath(userName, fsFilePath) if req.FileSize == 0 { // 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, }) if err != nil { @@ -157,7 +158,9 @@ func (h *FileHandlers) Create(c *gin.Context) { 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 { c.JSON(q.ErrResp(c, 500, err)) return @@ -210,7 +213,7 @@ func (h *FileHandlers) Create(c *gin.Context) { 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, }) if err != nil { @@ -517,8 +520,9 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) { } // move the file from uploading dir to uploaded dir + infoId := h.deps.ID().Gen() 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 { return 500, err } @@ -1017,7 +1021,8 @@ func (h *FileHandlers) AddSharing(c *gin.Context) { 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 { c.JSON(q.ErrResp(c, 500, err)) return diff --git a/src/server/config_load_test.go b/src/server/config_load_test.go index 1b3bf69..bc916ff 100644 --- a/src/server/config_load_test.go +++ b/src/server/config_load_test.go @@ -90,7 +90,7 @@ func TestLoadCfg(t *testing.T) { BgColor: "", }, AllowSetBg: false, - AutoTheme: true, + AutoTheme: false, }, } @@ -156,7 +156,7 @@ func TestLoadCfg(t *testing.T) { BgColor: "", }, AllowSetBg: false, - AutoTheme: true, + AutoTheme: false, }, }, Db: &DbConfig{ diff --git a/src/server/testdata/quickshare.sqlite b/src/server/testdata/quickshare.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..69eac6ddbd58264c7f3d629b96663ce3a952f7fe GIT binary patch literal 61440 zcmeI*?Qh%09S3mI@`Gf@;()WXUGqU&#+F3SLES&In2AgJ2{bASP-8t1f=BA z{(Sn^r#kuGzk2QVYRvgerc$Z>Eab|8 zi{Wm?Ze8=0RC{)8A~QQH?oD^WUL)sKiVPE{cop?qo|_*~>fGX5C|HvXttyMhQ>9voN2n`3;wUaA(^Bzs7bU zp1Z}@9QO&e*?MVf+4uZ9KYn*UTW&NSY~1E6^I4Bn*GYN1cbx@jwfJC@MT3X5LfJY? z?qR^weM|xpCNrO<72<{^+TB}AOpVX9$7Yi4`MvebjQ--+H`WB3R{W0Y;?s@g8|3Mu z*3Dd_b#L|2;@S=RF1@RM*t)uxjX9n<#$(`*IN&^u9sE=;#C&;r;tOSx|uH+ zio%LA$a9$HNw8cVnM$2&kDW`l&+n~2c3H*x_19^foh14s;{{bE@{Kp_Mo)s`O>ruG zfhWJY7kHoGX?bx^vUm4{^tm8?DSa;ek?Cmb7H5vXe61)q{4p9==1*~=v6D#u_*(|Ya*RM0nN15eJ>wH3v zp%Z-&&+}WGG`Pmf=n$_#*#T^>()-b@9^sbVT}{!n1;tuW4Oy`+=h;7XF>e{Ben~Me zD+(X~7p1S*_y12z72`Z1009U<00Izz00bZa0SG_<0;fxWfB&D4|Fa+c6VBAT_tRy7 zvxNWzAOHafKmY;|fB*!(U4g`Jt|T-0OmcL(?Szw%E%C9^#!^5V!HQd7(iej#K^Pbq z75?z@H-r5y}k-rTub#7>>!|0nRb#{2EwV|aBqi>+pqBp$M z>d;b$(Kk?P;gjK|R)&^3jQ-C{&By=w=YMItd;fM{`$!!E5P$##AOHafKmY;|fB*y_ z@c%FHyMY~AW9;NxanZ2jXp}`ih>M0DGzk{{QCu|a2pM6~*|=!f;jsVt|1VPK&UVKQ z0uX=z1Rwwb2tWV=5P$##AOL~mD`1G>=X~Cma4A~k9S3r>$a@K9qD9^%Fd6;+U-$d} z(#Po^Mt2s&4FV8=00bZa0SG_<0uX=z1dgqM^hcre%jD?jz=7T<(5!hrvDu7tjisDs zv1=dfe4%V9S}sSeyrwvmSdL;8a;BA2t%6DHyw1Op9zF!|uPldTTn?|U*jVbxp=1=w znr>N^qf(7Jj%lfu;V6zt%LdECC=o5Evdb+xsXrN%`l~A|dQ&$n#mePORd>pI$ux9B zF$+X7)k4X!a@4RiTXSsPDs@tSdr<1Hu7Eg@x=yT;N(nLbTsg1l`Mg67!^s&=NwsWh z(Y#VJOhTj7g+C8U{neEUy{W5~=@bl_%aejlXxVf$rlV4wlvGnUZIe|CyJ;G0ZUbxe z8!%@z+a3Q;f7ZPp+a`{JK>z{}fB*y_009U<00Izz00bfdF@LC+FKx5raDxB@AOHafKmY;| zfB*y_009U<;57t}@%8_X)VaUL>ETcaKmY;|fB*y_009U<00Izzz-brweRS!4+)rKb z?;h;LhW97``+015fA+t3V#E8>|9vmI*1s?BgY*CWUFzIVdqv^=ApijgKmY;|fB*y_ e009U<00Jjk;4R+I@LhhXLYiN3km45(jQ$7rJwvJh literal 0 HcmV?d00001