-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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.
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
Replaced FineUploader by Uppy library. Refactored things. #8071
Open
Fensterbank
wants to merge
1
commit into
diaspora:develop
Choose a base branch
from
Fensterbank:feature/implement-uppy
base: develop
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later | ||
| /** | ||
| * Custom resizer plugin for Uppy. Resizes image files if necessary using Pica image processing library. | ||
| */ | ||
| window.Resizer = class extends window.Uppy.Core.Plugin { | ||
| constructor(uppy, options) { | ||
| super(uppy, options); | ||
| this.id = options.id || "Resizer"; | ||
| this.type = "modifier"; | ||
| this.maxSize = options.maxSize; | ||
| this.maxFileSize = options.maxFileSize; | ||
|
|
||
| this.prepareUpload = this.prepareUpload.bind(this); | ||
| this.resize = this.resize.bind(this); | ||
| this.pica = window.pica(); | ||
| } | ||
|
|
||
| /** | ||
| * Resizes the file if necessary based on conditions. | ||
| * If the file exceeds the file size limit it will either be resized to maximum dimensions | ||
| * or only recompressed as JPEG (e.g. for huge PNG files not exceeding the dimension limit) | ||
| * @param file The uppy file | ||
| */ | ||
| resize(file) { | ||
| return new Promise((resolve) => { | ||
| const img = new Image(); | ||
| img.src = URL.createObjectURL(file.data); | ||
| const canvas = document.createElement("canvas"); | ||
|
|
||
| img.onload = () => { | ||
| if (img.width > this.maxSize || img.height > this.maxSize) { | ||
| this.uppy.log(`[Resize] ${file.name}: | ||
| Image dimensions ${img.width}x${img.height} are greater than max size ${this.maxSize}. | ||
| Resizing image...`); | ||
| let ratio; | ||
|
|
||
| if (img.height > img.width) { | ||
| ratio = img.width / img.height; | ||
| canvas.width = this.maxSize * ratio; | ||
| canvas.height = this.maxSize; | ||
| } else { | ||
| ratio = img.height / img.width; | ||
| canvas.width = this.maxSize; | ||
| canvas.height = this.maxSize * ratio; | ||
| } | ||
| this.uppy.log(`[Resize] ${file.name}: New image dimensions: ${canvas.width}x${canvas.height}...`); | ||
| } else { | ||
| this.uppy.log(`[Resize] ${file.name}: | ||
| Image dimensions ${img.width}x${img.height} are smaller than max size ${this.maxSize}. | ||
| Saving to JPEG without resizing...`); | ||
| canvas.width = img.width; | ||
| canvas.height = img.height; | ||
| } | ||
|
|
||
| this.pica.resize(img, canvas) | ||
| .then(result => this.pica.toBlob(result, "image/jpeg", 0.85)) | ||
| .then(blob => resolve(blob)); | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| prepareUpload(fileIDs) { | ||
| const promises = fileIDs.map((fileID) => { | ||
| const file = this.uppy.getFile(fileID); | ||
| if (file.type.split("/")[0] !== "image" || (file.size <= this.maxFileSize)) { | ||
| return Promise.resolve(); | ||
| } | ||
| this.uppy.log(`[Resize] ${file.name}: File size ${file.size} exceeds max file size of ${this.maxFileSize}.`); | ||
|
|
||
| return this.resize(file).then((blob) => { | ||
| // since size and eventually type are changing, | ||
| // we have to overwrite several redundant information in the file object | ||
| const filename = file.name.replace(/\.png$/i, ".jpg"); | ||
| const processedFile = Object.assign({}, file, { | ||
| data: blob, | ||
| size: blob.size, | ||
| progress: Object.assign({}, file.progress, {bytesTotal: blob.size}), | ||
| type: blob.type, | ||
| name: filename, | ||
| extension: file.extension === "png" ? "jpg" : file.extension, | ||
| meta: Object.assign({}, file.meta, { | ||
| filename: filename, | ||
| name: filename, | ||
| totalfilesize: blob.size, | ||
| type: blob.type | ||
| }) | ||
| }); | ||
| this.uppy.log(`[Resize] ${filename}: New file size: ${processedFile.data.size}.`); | ||
| this.uppy.setFileState(fileID, processedFile); | ||
| }); | ||
| }); | ||
| return Promise.all(promises); | ||
| } | ||
|
|
||
| install() { | ||
| this.uppy.addPreProcessor(this.prepareUpload); | ||
| } | ||
|
|
||
| uninstall() { | ||
| this.uppy.removePreProcessor(this.prepareUpload); | ||
| } | ||
| } | ||
| // @license-end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing semicolon.