-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed issue #34: Increased upload image size, added image compression…
… and functionality to remove image metadata
- Loading branch information
1 parent
4f0052b
commit fcf3c30
Showing
5 changed files
with
187 additions
and
31 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,35 @@ | ||
| import Compressor from "compressorjs"; | ||
|
|
||
|
|
||
|
|
||
| const Compress = (images,setImages) => { | ||
| let compressed = []; | ||
|
|
||
| for (let index = 0; index < images.length; index += 1) { | ||
| let image = images[index]; | ||
|
|
||
| if (image) { | ||
| new Compressor(image, { | ||
| quality: 0.6, | ||
| convertSize: 100000, | ||
| success: (result) => { | ||
| compressed.push(result); | ||
| shouldSetImages(compressed, images, setImages); | ||
| }, | ||
| error: (error) => { | ||
| console.warn(error.message); | ||
| compressed.push(image); | ||
| shouldSetImages(compressed, images, setImages); | ||
| }, | ||
| }) | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| const shouldSetImages = (compressed, images, setImages) =>{ | ||
| if(compressed.length === images.length){ | ||
| setImages(compressed); | ||
| } | ||
| } | ||
|
|
||
| export default Compress |
69 changes: 69 additions & 0 deletions
69
zubhub_frontend/zubhub/src/assets/js/removeMetaDataWorker.js
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,69 @@ | ||
| export const removeMetaData =(imageArr)=>{ | ||
| let newImageArr = []; | ||
|
|
||
| for(let index=0; index < imageArr.length; index++){ | ||
| let fr = new FileReader(); | ||
| fr.onload = process; | ||
| fr.mainFile = imageArr[index]; | ||
| fr.readAsArrayBuffer(imageArr[index]); | ||
| } | ||
|
|
||
| function process(){ | ||
| let dv = new DataView(this.result); | ||
| let offset = 0, recess = 0; | ||
| let pieces = []; | ||
| let i = 0; | ||
| if (dv.getUint16(offset) === 0xffd8){ | ||
| offset += 2; | ||
| let app1 = dv.getUint16(offset); | ||
| offset += 2; | ||
| while (offset < dv.byteLength){ | ||
| if (app1 === 0xffe1){ | ||
|
|
||
| pieces[i] = {recess:recess,offset:offset-2}; | ||
| recess = offset + dv.getUint16(offset); | ||
| i++; | ||
| } | ||
| else if (app1 === 0xffda){ | ||
| break; | ||
| } | ||
| offset += dv.getUint16(offset); | ||
| app1 = dv.getUint16(offset); | ||
| offset += 2; | ||
| } | ||
|
|
||
| if (pieces.length > 0){ | ||
| let newPieces = []; | ||
| pieces.forEach(function(v){ | ||
| newPieces.push(this.result.slice(v.recess, v.offset)); | ||
| }, this); | ||
| newPieces.push(this.result.slice(recess)); | ||
| newImageArr.push(new Blob(newPieces, {type: imageArr[newImageArr.length].type})); | ||
|
|
||
| if(newImageArr.length === imageArr.length){ | ||
| postMessage(newImageArr); | ||
| } | ||
|
|
||
| } | ||
| else { | ||
| newImageArr.push(this.mainFile); | ||
|
|
||
| if(newImageArr.length === imageArr.length){ | ||
| postMessage(newImageArr); | ||
| } | ||
| } | ||
| } | ||
| else { | ||
| newImageArr.push(this.mainFile); | ||
|
|
||
| if(newImageArr.length === imageArr.length){ | ||
| postMessage(newImageArr); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
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