fix for deplicate post file size and dimensions

merge-requests/208/head
fatchan 5 years ago
parent 8002569954
commit cf127052e2
  1. 23
      controllers/api.js
  2. 1
      views/mixins/post.pug

@ -51,15 +51,26 @@ router.post('/board/:board', Boards.exists, async (req, res, next) => {
await fileUpload(req, res, filename); await fileUpload(req, res, filename);
const fileData = await fileIdentify(filename); const fileData = await fileIdentify(filename);
await fileThumbnail(filename); await fileThumbnail(filename);
files.push({ const processedFile = {
filename: filename, filename: filename,
originalFilename: file.name, originalFilename: file.name,
mimetype: file.mimetype, mimetype: file.mimetype,
size: file.size, filesize: file.size, // size in bytes
dimensions: fileData.size, size: fileData.Filesize, // 123 Ki size formatted string
geometry: fileData.Geometry, dimensions: fileData.size, // object with width and height pixels
size: fileData.Filesize geometry: fileData.Geometry, // 123 x 123 string
}) }
//handle gifs with multiple geometry and size
if (Array.isArray(processedFile.size)) {
processedFile.size = processedFile.size[0];
}
if (Array.isArray(processedFile.dimensions)) {
processedFile.geometry = processedFile.dimensions[0];
}
if (Array.isArray(processedFile.geometry)) {
processedFile.geometry = processedFile.geometry[0];
}
files.push(processedFile);
} catch (err) { } catch (err) {
console.error(err); console.error(err);

@ -1,4 +1,5 @@
mixin post(board, post) mixin post(board, post)
.post-wrapper
div(class='post-container '+(post.thread ? '' : 'op')) div(class='post-container '+(post.thread ? '' : 'op'))
.post-info .post-info
span.post-subject #{post.subject} span.post-subject #{post.subject}

Loading…
Cancel
Save