fix for deplicate post file size and dimensions

merge-requests/208/head
fatchan 5 years ago
parent 8002569954
commit cf127052e2
  1. 29
      controllers/api.js
  2. 45
      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,24 +1,25 @@
mixin post(board, post) mixin post(board, post)
div(class='post-container '+(post.thread ? '' : 'op')) .post-wrapper
.post-info div(class='post-container '+(post.thread ? '' : 'op'))
span.post-subject #{post.subject} .post-info
span.post-author #{post.author} span.post-subject #{post.subject}
span #{post.date.toLocaleString()} span.post-author #{post.author}
span No. span #{post.date.toLocaleString()}
if post.thread == null span No.
a(href=`/${board._id}/thread/${post._id}`) ##{post._id} if post.thread == null
else a(href=`/${board._id}/thread/${post._id}`) ##{post._id}
a(href=`/${board._id}/thread/${post.thread}#${post._id}`) ##{post._id} else
if post.files.length > 0 a(href=`/${board._id}/thread/${post.thread}#${post._id}`) ##{post._id}
.post-files if post.files.length > 0
each file in post.files .post-files
.post-file-info each file in post.files
span: a(href='/img/thumb-'+file.filename download=file.originalFilename) #{file.originalFilename} .post-file-info
span ( Size: #{file.size} span: a(href='/img/thumb-'+file.filename download=file.originalFilename) #{file.originalFilename}
span Dimensions: #{file.geometry} ) span ( Size: #{file.size}
.post-file span Dimensions: #{file.geometry} )
a(href='/img/'+file.filename) .post-file
object(data='/img/thumb-'+file.filename type=file.mimetype) a(href='/img/'+file.filename)
.post-content object(data='/img/thumb-'+file.filename type=file.mimetype)
p(style='white-space: pre-wrap;') #{post.content} .post-content
p(style='white-space: pre-wrap;') #{post.content}

Loading…
Cancel
Save