Skip to content

fix(upload): thumbnail is lost #516

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

Merged
cnlangzi merged 3 commits into from
Jan 26, 2022
Merged

fix(upload): thumbnail is lost #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a78fcb6
fix(upload): thumbnail is not committed correcly on upload/update req…
cnlangzi Jan 26, 2022
9d406d1
fix(devops): short name for UI pretty on github checks
cnlangzi Jan 26, 2022
4f2b28d
fix(devops): short name for UI pretty on github checks
cnlangzi Jan 26, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/build-&-publish-docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Build & Publish Docker Image"
name: "Dockerize"

concurrency:
group: "publish-${{ github.ref }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
linter:
name: Buf & Golangci lint
name: Lints
runs-on: [self-hosted,docker-builds]
steps:
- name: Setup go 1.17
Expand Down
3 changes: 1 addition & 2 deletions code/go/0chain.net/blobbercore/allocation/allocationchange.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (cc *AllocationChangeCollector) ComputeProperties() {
var acp AllocationChangeProcessor
switch change.Operation {
case constants.FileOperationInsert:
acp = new(NewFileChange)
acp = new(AddFileChanger)
case constants.FileOperationUpdate:
acp = new(UpdateFileChanger)
case constants.FileOperationDelete:
Expand All @@ -130,7 +130,6 @@ func (cc *AllocationChangeCollector) ComputeProperties() {
acp = new(CopyFileChange)
case constants.FileOperationUpdateAttrs:
acp = new(AttributesChange)

}

if acp == nil {
Expand Down
1 change: 1 addition & 0 deletions code/go/0chain.net/blobbercore/allocation/file_changer_base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type BaseFileChanger struct {
ActualThumbnailSize int64 `json:"actual_thumb_size"`
//client side:
ActualThumbnailHash string `json:"actual_thumb_hash"`

//client side:
MimeType string `json:"mimetype,omitempty"`
//client side:
Expand Down
4 changes: 4 additions & 0 deletions code/go/0chain.net/blobbercore/handler/file_command_add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ func (cmd *AddFileCommand) reloadChange(connectionObj *allocation.AllocationChan
}

cmd.fileChanger.Size = dbChangeProcessor.Size
cmd.fileChanger.ThumbnailFilename = dbChangeProcessor.ThumbnailFilename
cmd.fileChanger.ThumbnailSize = dbChangeProcessor.ThumbnailSize
cmd.fileChanger.ThumbnailHash = dbChangeProcessor.Hash

return
}
}
Expand Down
135 changes: 0 additions & 135 deletions code/go/0chain.net/blobbercore/handler/file_command_insert.go
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion code/go/0chain.net/blobbercore/handler/file_command_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func (cmd *UpdateFileCommand) reloadChange(connectionObj *allocation.AllocationC
for _, c := range connectionObj.Changes {
if c.Operation == constants.FileOperationUpdate {

dbFileChanger := &allocation.AddFileChanger{}
dbFileChanger := &allocation.UpdateFileChanger{}

err := dbFileChanger.Unmarshal(c.Input)
if err != nil {
Expand All @@ -167,6 +167,9 @@ func (cmd *UpdateFileCommand) reloadChange(connectionObj *allocation.AllocationC

// reload uploaded size from db, it was chunk size from client
cmd.fileChanger.Size = dbFileChanger.Size
cmd.fileChanger.ThumbnailFilename = dbFileChanger.ThumbnailFilename
cmd.fileChanger.ThumbnailSize = dbFileChanger.ThumbnailSize
cmd.fileChanger.ThumbnailHash = dbFileChanger.Hash
return
}
}
Expand Down