Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-19 05:09:43 +02:00
Code Issues Releases Activity

feat: Preserve original format of images, change interpolation kernel

Browse source 
Closes #349
This commit is contained in:
Maksim Eltyshev 2022-12-24 00:47:59 +01:00
parent 73abed65b5
commit 05b57142f9
17 changed files with 212 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

29
server/api/helpers/users/process-uploaded-avatar-file.js
View file

@ -17,34 +17,36 @@ module.exports = {
},
async fn(inputs) {
const image = sharp(inputs.file.fd);
const image = sharp(inputs.file.fd, {
animated: true,
});
let metadata;
try {
await image.metadata();
metadata = await image.metadata();
} catch (error) {
throw 'fileIsNotImage';
}
if (['svg', 'pdf'].includes(metadata.format)) {
throw 'fileIsNotImage';
}
const dirname = uuid();
const rootPath = path.join(sails.config.custom.userAvatarsPath, dirname);
fs.mkdirSync(rootPath);
const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
try {
await image
.jpeg({
quality: 100,
chromaSubsampling: '4:4:4',
})
.toFile(path.join(rootPath, 'original.jpg'));
await image.toFile(path.join(rootPath, `original.${extension}`));
await image
.resize(100, 100)
.jpeg({
quality: 100,
chromaSubsampling: '4:4:4',
.resize(100, 100, {
kernel: sharp.kernel.nearest,
})
.toFile(path.join(rootPath, 'square-100.jpg'));
.toFile(path.join(rootPath, `square-100.${extension}`));
} catch (error1) {
try {
rimraf.sync(rootPath);
@ -63,6 +65,7 @@ module.exports = {
return {
dirname,
extension,
};
},
};

16
server/api/helpers/users/update-one.js
View file

@ -28,7 +28,7 @@ module.exports = {
return false;
}
if (!_.isUndefined(value.avatarUrl) && !_.isNull(value.avatarUrl)) {
if (value.avatar && !_.isPlainObject(value.avatar)) {
return false;
}
@ -74,13 +74,6 @@ module.exports = {
inputs.values.username = inputs.values.username.toLowerCase();
}
if (!_.isUndefined(inputs.values.avatarUrl)) {
/* eslint-disable no-param-reassign */
inputs.values.avatarDirname = null;
delete inputs.values.avatarUrl;
/* eslint-enable no-param-reassign */
}
const user = await User.updateOne({
id: inputs.record.id,
deletedAt: null,
@ -102,9 +95,12 @@ module.exports = {
);
if (user) {
if (inputs.record.avatarDirname && user.avatarDirname !== inputs.record.avatarDirname) {
if (
inputs.record.avatar &&
(!user.avatar || user.avatar.dirname !== inputs.record.avatar.dirname)
) {
try {
rimraf.sync(path.join(sails.config.custom.userAvatarsPath, inputs.record.avatarDirname));
rimraf.sync(path.join(sails.config.custom.userAvatarsPath, inputs.record.avatar.dirname));
} catch (error) {
console.warn(error.stack); // eslint-disable-line no-console
}