Browse Source

fix-50

tags/v1.21.8^2
lewis 4 years ago
parent
commit
64ee8e3003
2 changed files with 24 additions and 5 deletions
  1. +11
    -1
      models/file_chunk.go
  2. +13
    -4
      routers/repo/attachment.go

+ 11
- 1
models/file_chunk.go View File

@@ -87,7 +87,7 @@ func InsertFileChunk(fileChunk *FileChunk) (_ *FileChunk, err error) {
return fileChunk, nil return fileChunk, nil
} }


// UpdateAttachment updates the given attachment in database
// UpdateFileChunk updates the given file_chunk in database
func UpdateFileChunk(fileChunk *FileChunk) error { func UpdateFileChunk(fileChunk *FileChunk) error {
return updateFileChunk(x, fileChunk) return updateFileChunk(x, fileChunk)
} }
@@ -98,3 +98,13 @@ func updateFileChunk(e Engine, fileChunk *FileChunk) error {
_, err := sess.Cols("is_uploaded").Update(fileChunk) _, err := sess.Cols("is_uploaded").Update(fileChunk)
return err return err
} }

// DeleteFileChunk delete the given file_chunk in database
func DeleteFileChunk(fileChunk *FileChunk) error {
return deleteFileChunk(x, fileChunk)
}

func deleteFileChunk(e Engine, fileChunk *FileChunk) error {
_, err := e.ID(fileChunk.ID).Delete(fileChunk)
return err
}

+ 13
- 4
routers/repo/attachment.go View File

@@ -483,16 +483,25 @@ func GetSuccessChunks(ctx *context.Context) {
if typeCloudBrain == models.TypeCloudBrainOne { if typeCloudBrain == models.TypeCloudBrainOne {
chunks, err = storage.GetPartInfos(fileChunk.UUID, fileChunk.UploadID) chunks, err = storage.GetPartInfos(fileChunk.UUID, fileChunk.UploadID)
if err != nil { if err != nil {
ctx.ServerError("GetPartInfos failed", err)
return
log.Error("GetPartInfos failed:%v", err.Error())
} }
} else { } else {
chunks, err = storage.GetObsPartInfos(fileChunk.UUID, fileChunk.UploadID) chunks, err = storage.GetObsPartInfos(fileChunk.UUID, fileChunk.UploadID)
if err != nil { if err != nil {
ctx.ServerError("GetObsPartInfos failed", err)
return
log.Error("GetObsPartInfos failed:%v", err.Error())
} }
} }

if err != nil {
models.DeleteFileChunk(fileChunk)
ctx.JSON(200, map[string]string{
"uuid": "",
"uploaded": "0",
"uploadID": "",
"chunks": "",
})
return
}
} }


var attachID int64 var attachID int64


Loading…
Cancel
Save