mirror of
https://github.com/plankanban/planka.git
synced 2025-07-25 08:09:44 +02:00
feat: Preserve original format of images, change interpolation kernel
Closes #349
This commit is contained in:
Maksim Eltyshev
parent
b82a601f46
commit
0a5210dd21
17 changed files with 212 additions and 103 deletions
|
|
@ -26,9 +26,11 @@ module.exports = {
|
|||
fs.mkdirSync(rootPath);
|
||||
await moveFile(inputs.file.fd, filePath);
|
||||
|
||||
const image = sharp(filePath);
|
||||
let metadata;
|
||||
const image = sharp(filePath, {
|
||||
animated: true,
|
||||
});
|
||||
|
||||
let metadata;
|
||||
try {
|
||||
metadata = await image.metadata();
|
||||
} catch (error) {} // eslint-disable-line no-empty
|
||||
|
|
@ -44,25 +46,19 @@ module.exports = {
|
|||
const thumbnailsPath = path.join(rootPath, 'thumbnails');
|
||||
fs.mkdirSync(thumbnailsPath);
|
||||
|
||||
const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
|
||||
|
||||
try {
|
||||
await image
|
||||
.resize(
|
||||
metadata.height > metadata.width
|
||||
? {
|
||||
width: 256,
|
||||
height: 320,
|
||||
}
|
||||
: {
|
||||
width: 256,
|
||||
},
|
||||
)
|
||||
.jpeg({
|
||||
quality: 100,
|
||||
chromaSubsampling: '4:4:4',
|
||||
.resize(256, metadata.height > metadata.width ? 320 : undefined, {
|
||||
kernel: sharp.kernel.nearest,
|
||||
})
|
||||
.toFile(path.join(thumbnailsPath, 'cover-256.jpg'));
|
||||
.toFile(path.join(thumbnailsPath, `cover-256.${extension}`));
|
||||
|
||||
fileData.image = _.pick(metadata, ['width', 'height']);
|
||||
fileData.image = {
|
||||
..._.pick(metadata, ['width', 'height']),
|
||||
thumbnailsExtension: extension,
|
||||
};
|
||||
} catch (error1) {
|
||||
try {
|
||||
rimraf.sync(thumbnailsPath);
|
||||
|
|
|
|||
|
|
@ -17,29 +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.projectBackgroundImagesPath, dirname);
|
||||
|
||||
fs.mkdirSync(rootPath);
|
||||
|
||||
const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
|
||||
|
||||
try {
|
||||
await image.jpeg().toFile(path.join(rootPath, 'original.jpg'));
|
||||
await image.toFile(path.join(rootPath, `original.${extension}`));
|
||||
|
||||
await image
|
||||
.resize(336, 200)
|
||||
.jpeg({
|
||||
quality: 100,
|
||||
chromaSubsampling: '4:4:4',
|
||||
.resize(336, 200, {
|
||||
kernel: sharp.kernel.nearest,
|
||||
})
|
||||
.toFile(path.join(rootPath, 'cover-336.jpg'));
|
||||
.toFile(path.join(rootPath, `cover-336.${extension}`));
|
||||
} catch (error1) {
|
||||
try {
|
||||
rimraf.sync(rootPath);
|
||||
|
|
@ -58,6 +65,7 @@ module.exports = {
|
|||
|
||||
return {
|
||||
dirname,
|
||||
extension,
|
||||
};
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,15 +14,11 @@ module.exports = {
|
|||
return false;
|
||||
}
|
||||
|
||||
if (
|
||||
!_.isUndefined(value.background) &&
|
||||
!_.isNull(value.background) &&
|
||||
!_.isPlainObject(value.background)
|
||||
) {
|
||||
if (value.background && !_.isPlainObject(value.background)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_.isUndefined(value.backgroundImage) && !_.isNull(value.backgroundImage)) {
|
||||
if (value.backgroundImage && !_.isPlainObject(value.backgroundImage)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -36,24 +32,17 @@ module.exports = {
|
|||
},
|
||||
|
||||
exits: {
|
||||
backgroundImageDirnameMustBeNotNullInValues: {},
|
||||
backgroundImageMustBeNotNullInValues: {},
|
||||
},
|
||||
|
||||
async fn(inputs) {
|
||||
if (!_.isUndefined(inputs.values.backgroundImage)) {
|
||||
/* eslint-disable no-param-reassign */
|
||||
inputs.values.backgroundImageDirname = null;
|
||||
delete inputs.values.backgroundImage;
|
||||
/* eslint-enable no-param-reassign */
|
||||
}
|
||||
|
||||
if (inputs.values.backgroundImageDirname) {
|
||||
if (inputs.values.backgroundImage) {
|
||||
// eslint-disable-next-line no-param-reassign
|
||||
inputs.values.background = {
|
||||
type: 'image',
|
||||
};
|
||||
} else if (
|
||||
_.isNull(inputs.values.backgroundImageDirname) &&
|
||||
_.isNull(inputs.values.backgroundImage) &&
|
||||
inputs.record.background &&
|
||||
inputs.record.background.type === 'image'
|
||||
) {
|
||||
|
|
@ -62,14 +51,14 @@ module.exports = {
|
|||
|
||||
let project;
|
||||
if (inputs.values.background && inputs.values.background.type === 'image') {
|
||||
if (_.isNull(inputs.values.backgroundImageDirname)) {
|
||||
throw 'backgroundImageDirnameMustBeNotNullInValues';
|
||||
if (_.isNull(inputs.values.backgroundImage)) {
|
||||
throw 'backgroundImageMustBeNotNullInValues';
|
||||
}
|
||||
|
||||
if (_.isUndefined(inputs.values.backgroundImageDirname)) {
|
||||
if (_.isUndefined(inputs.values.backgroundImage)) {
|
||||
project = await Project.updateOne({
|
||||
id: inputs.record.id,
|
||||
backgroundImageDirname: {
|
||||
backgroundImage: {
|
||||
'!=': null,
|
||||
},
|
||||
}).set(inputs.values);
|
||||
|
|
@ -86,14 +75,15 @@ module.exports = {
|
|||
|
||||
if (project) {
|
||||
if (
|
||||
inputs.record.backgroundImageDirname &&
|
||||
project.backgroundImageDirname !== inputs.record.backgroundImageDirname
|
||||
inputs.record.backgroundImage &&
|
||||
(!project.backgroundImage ||
|
||||
project.backgroundImage.dirname !== inputs.record.backgroundImage.dirname)
|
||||
) {
|
||||
try {
|
||||
rimraf.sync(
|
||||
path.join(
|
||||
sails.config.custom.projectBackgroundImagesPath,
|
||||
inputs.record.backgroundImageDirname,
|
||||
inputs.record.backgroundImage.dirname,
|
||||
),
|
||||
);
|
||||
} catch (error) {
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue