Skip to content
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

Jump to bottom

Resize images before upload in web UI to reduce bandwidth #7223

Merged
merged 3 commits into from Apr 22, 2018
Merged

Resize images before upload in web UI to reduce bandwidth #7223

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bf3207
Resize images before upload in web UI to reduce bandwidth
Gargron Apr 21, 2018
2c337c8
Fix issues
Gargron Apr 21, 2018
a20df8e
Do not resize GIFs in JS
Gargron Apr 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
97 changes: 86 additions & 11 deletions app/javascript/mastodon/actions/compose.js
View file
Open in desktop
Expand Up @@ -174,6 +174,79 @@ export function submitComposeFail(error) {
};
};

const MAX_IMAGE_DIMENSION = 1280;

const dataURLtoBlob = dataURL => {
const BASE64_MARKER = ';base64,';

if (dataURL.indexOf(BASE64_MARKER) === -1) {
const parts = dataURL.split(',');
const contentType = parts[0].split(':')[1];
const raw = parts[1];

return new Blob([raw], { type: contentType });
}

const parts = dataURL.split(BASE64_MARKER);
const contentType = parts[0].split(':')[1];
const raw = window.atob(parts[1]);
const rawLength = raw.length;

const uInt8Array = new Uint8Array(rawLength);

for (let i = 0; i < rawLength; ++i) {
uInt8Array[i] = raw.charCodeAt(i);
}

return new Blob([uInt8Array], { type: contentType });
};

const resizeImage = (inputFile, callback) => {
if (inputFile.type.match(/image.*/)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Animated gifs will pass this test and it will lost animation.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But a GIF image larger than 1280px... is there any point in keeping it animated, since it will be a large file size..?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but if you do so silently. they won't be aware of losing animation before posting it.

I think most cases will be covered even if we exclude GIFs from this process.

const reader = new FileReader();

reader.onload = e => {
const img = new Image();

img.onload = () => {
const canvas = document.createElement('canvas');
const { width, height } = img;

let newWidth, newHeight;

if (width < MAX_IMAGE_DIMENSION && height < MAX_IMAGE_DIMENSION) {
callback(inputFile);
return;
}

if (width > height) {
newHeight = height * MAX_IMAGE_DIMENSION / width;
newWidth = MAX_IMAGE_DIMENSION;
} else if (height > width) {
newWidth = width * MAX_IMAGE_DIMENSION / height;
newHeight = MAX_IMAGE_DIMENSION;
} else {
newWidth = MAX_IMAGE_DIMENSION;
newHeight = MAX_IMAGE_DIMENSION;
}

canvas.width = newWidth;
canvas.height = newHeight;

canvas.getContext('2d').drawImage(img, 0, 0, newWidth, newHeight);

callback(dataURLtoBlob(canvas.toDataURL(inputFile.type)));
};

img.src = e.target.result;
};

reader.readAsDataURL(inputFile);
} else {
callback(inputFile);
}
};

export function uploadCompose(files) {
return function (dispatch, getState) {
if (getState().getIn(['compose', 'media_attachments']).size > 3) {
Expand All @@ -182,17 +255,19 @@ export function uploadCompose(files) {

dispatch(uploadComposeRequest());

let data = new FormData();
data.append('file', files[0]);

api(getState).post('/api/v1/media', data, {
onUploadProgress: function (e) {
dispatch(uploadComposeProgress(e.loaded, e.total));
},
}).then(function (response) {
dispatch(uploadComposeSuccess(response.data));
}).catch(function (error) {
dispatch(uploadComposeFail(error));
resizeImage(files[0], file => {
let data = new FormData();
data.append('file', file);

api(getState).post('/api/v1/media', data, {
onUploadProgress: function (e) {
dispatch(uploadComposeProgress(e.loaded, e.total));
},
}).then(function (response) {
dispatch(uploadComposeSuccess(response.data));
}).catch(function (error) {
dispatch(uploadComposeFail(error));
});
});
};
};
Expand Down