fatchan
/
jschan
mirror of https://gitgud.io/fatchan/jschan.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change thumbs to png and try handling dedupes when thumb format has been changed and file uploaded

Browse Source
merge-requests/208/head
fatchan 5 years ago
parent 08e93bdd2a
commit 93cd4c4d64
11 changed files with 31 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      db/files.js
  2. 4
      gulp/res/js/post.js
  3. 10
      helpers/files/deletepostfiles.js
  4. 4
      helpers/files/imagethumbnail.js
  5. 2
      helpers/files/videothumbnail.js
  6. 8
      models/forms/makepost.js
  7. 2
      schedules/index.js
  8. 16
      schedules/prune.js
  9. 2
      views/mixins/catalogtile.pug
  10. 2
      views/mixins/post.pug
  11. 2
      views/pages/thread.pug

3
db/files.js
Unescape View File

@ -16,6 +16,9 @@ module.exports = {
'$inc': { '$inc': {
'count': 1 'count': 1
}, },
'$addToSet': {//save list of thumb exts incase config is changed to track old exts
'exts': file.thumbextension,
},
'$setOnInsert': { '$setOnInsert': {
'size': file.size 'size': file.size
} }

4
gulp/res/js/post.js
Unescape View File

@ -83,7 +83,7 @@ pug_html = pug_html + "\u003Cimg class=\"file-thumb\" src=\"\u002Fimg\u002Fspoil
} }
else else
if (file.hasThumb) { if (file.hasThumb) {
pug_html = pug_html + "\u003Cimg" + (" class=\"file-thumb\""+pug_attr("src", `/img/thumb-${file.hash}.jpg`, true, false)+pug_attr("height", file.geometry.thumbheight, true, false)+pug_attr("width", file.geometry.thumbwidth, true, false)) + "\u002F\u003E"; pug_html = pug_html + "\u003Cimg" + (" class=\"file-thumb\""+pug_attr("src", `/img/thumb-${file.hash}${file.thumbextension}`, true, false)+pug_attr("height", file.geometry.thumbheight, true, false)+pug_attr("width", file.geometry.thumbwidth, true, false)) + "\u002F\u003E";
} }
else { else {
pug_html = pug_html + "\u003Cimg" + (" class=\"file-thumb\""+pug_attr("src", `/img/${file.filename}`, true, false)+pug_attr("height", file.geometry.height, true, false)+pug_attr("width", file.geometry.width, true, false)) + "\u002F\u003E"; pug_html = pug_html + "\u003Cimg" + (" class=\"file-thumb\""+pug_attr("src", `/img/${file.filename}`, true, false)+pug_attr("height", file.geometry.height, true, false)+pug_attr("width", file.geometry.width, true, false)) + "\u002F\u003E";
@ -105,7 +105,7 @@ pug_html = pug_html + "\u003Cimg class=\"file-thumb\" src=\"\u002Fimg\u002Fspoil
} }
else else
if (file.hasThumb) { if (file.hasThumb) {
pug_html = pug_html + "\u003Cimg" + (" class=\"file-thumb\""+pug_attr("src", `/img/thumb-${file.hash}.jpg`, true, false)+pug_attr("height", file.geometry.thumbheight, true, false)+pug_attr("width", file.geometry.thumbwidth, true, false)) + "\u002F\u003E"; pug_html = pug_html + "\u003Cimg" + (" class=\"file-thumb\""+pug_attr("src", `/img/thumb-${file.hash}${file.thumbextension}`, true, false)+pug_attr("height", file.geometry.thumbheight, true, false)+pug_attr("width", file.geometry.thumbwidth, true, false)) + "\u002F\u003E";
} }
else { else {
pug_html = pug_html + "\u003Cimg" + (" class=\"file-thumb\""+pug_attr("src", `/img/${file.filename}`, true, false)+pug_attr("height", file.geometry.height, true, false)+pug_attr("width", file.geometry.width, true, false)) + "\u002F\u003E"; pug_html = pug_html + "\u003Cimg" + (" class=\"file-thumb\""+pug_attr("src", `/img/${file.filename}`, true, false)+pug_attr("height", file.geometry.height, true, false)+pug_attr("width", file.geometry.width, true, false)) + "\u002F\u003E";

10
helpers/files/deletepostfiles.js
Unescape View File

@ -7,10 +7,12 @@ module.exports = (files) => {
//delete all the files and thumbs //delete all the files and thumbs
return Promise.all(files.map(async file => { return Promise.all(files.map(async file => {
return Promise.all([ return Promise.all(
remove(`${uploadDirectory}/img/${file.filename}`), [remove(`${uploadDirectory}/img/${file.filename}`)]
remove(`${uploadDirectory}/img/thumb-${file.hash}.jpg`) .concat(file.exts.map(ext => {
]).catch(e => console.error) remove(`${uploadDirectory}/img/thumb-${file.hash}${file.thumbextension}`)
}))
).catch(e => console.error)
})); }));
} }

4
helpers/files/imagethumbnail.js
Unescape View File

@ -5,9 +5,9 @@ const gm = require('gm')
module.exports = (file) => { module.exports = (file) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
gm(`${uploadDirectory}/img/${file.filename}`) gm(`${uploadDirectory}/img/${file.filename}[0]`) //0 for first gif frame
.resize(128, 128) .resize(128, 128)
.write(`${uploadDirectory}/img/thumb-${file.hash}.jpg`, function (err) { .write(`${uploadDirectory}/img/thumb-${file.hash}${configs.thumbExtension}`, function (err) {
if (err) { if (err) {
return reject(err); return reject(err);
} }

2
helpers/files/videothumbnail.js
Unescape View File

@ -12,7 +12,7 @@ module.exports = (file, geometry) => {
.screenshots({ .screenshots({
timestamps: ['1%'],//1% should remedy black first frames or fade-ins timestamps: ['1%'],//1% should remedy black first frames or fade-ins
count: 1, count: 1,
filename: `thumb-${file.hash}.jpg`, filename: `thumb-${file.hash}${thumbExtension}`,
folder: `${uploadDirectory}/img/`, folder: `${uploadDirectory}/img/`,
size: geometry.width > geometry.height ? '128x?' : '?x128' size: geometry.width > geometry.height ? '128x?' : '?x128'
//keep aspect ratio, but also making sure taller/wider thumbs dont exceed 128 in either dimension //keep aspect ratio, but also making sure taller/wider thumbs dont exceed 128 in either dimension

8
models/forms/makepost.js
Unescape View File

@ -27,7 +27,7 @@ const path = require('path')
, msTime = require(__dirname+'/../../helpers/mstime.js') , msTime = require(__dirname+'/../../helpers/mstime.js')
, deletePosts = require(__dirname+'/deletepost.js') , deletePosts = require(__dirname+'/deletepost.js')
, spamCheck = require(__dirname+'/../../helpers/checks/spamcheck.js') , spamCheck = require(__dirname+'/../../helpers/checks/spamcheck.js')
, { postPasswordSecret } = require(__dirname+'/../../configs/main.json') , { thumbExtension, postPasswordSecret } = require(__dirname+'/../../configs/main.json')
, buildQueue = require(__dirname+'/../../queue.js') , buildQueue = require(__dirname+'/../../queue.js')
, dynamicResponse = require(__dirname+'/../../helpers/dynamic.js') , dynamicResponse = require(__dirname+'/../../helpers/dynamic.js')
, { buildThread } = require(__dirname+'/../../helpers/tasks.js'); , { buildThread } = require(__dirname+'/../../helpers/tasks.js');
@ -160,13 +160,15 @@ module.exports = async (req, res, next) => {
originalFilename: file.name, originalFilename: file.name,
mimetype: file.mimetype, mimetype: file.mimetype,
size: file.size, size: file.size,
extension,
thumbextension: thumbExtension,
}; };
await Files.increment(processedFile); await Files.increment(processedFile);
//check if already exists //check if already exists
const existsFull = await pathExists(`${uploadDirectory}/img/${processedFile.filename}`); const existsFull = await pathExists(`${uploadDirectory}/img/${processedFile.filename}`);
const existsThumb = await pathExists(`${uploadDirectory}/img/thumb-${processedFile.hash}.jpg`); const existsThumb = await pathExists(`${uploadDirectory}/img/thumb-${processedFile.hash}${processedFile.thumbextension}`);
//handle video/image ffmpeg or graphicsmagick //handle video/image ffmpeg or graphicsmagick
switch (processedFile.mimetype.split('/')[0]) { switch (processedFile.mimetype.split('/')[0]) {
@ -199,7 +201,7 @@ module.exports = async (req, res, next) => {
}); });
} }
processedFile.duration = videoData.format.duration; processedFile.duration = videoData.format.duration;
processedFile.durationString = new Date(videoData.format.duration*1000).toLocaleString('en-US', {hour12:false}).split(' ')[1].replace(/^00:/, ''); processedFile.durationString = new Date(videoData.format.duration*1000).toLocaleString('en-US', {hour12:false}).split(' ')[1].replace(/^00:/, '');//break for over 24h video
processedFile.geometry = {width: videoData.streams[0].coded_width, height: videoData.streams[0].coded_height} // object with width and height pixels processedFile.geometry = {width: videoData.streams[0].coded_width, height: videoData.streams[0].coded_height} // object with width and height pixels
processedFile.sizeString = formatSize(processedFile.size) // 123 Ki string processedFile.sizeString = formatSize(processedFile.size) // 123 Ki string
processedFile.geometryString = `${processedFile.geometry.width}x${processedFile.geometry.height}` // 123 x 123 string processedFile.geometryString = `${processedFile.geometry.width}x${processedFile.geometry.height}` // 123 x 123 string

2
schedules/index.js
Unescape View File

@ -24,7 +24,7 @@ const msTime = require(__dirname+'/../helpers/mstime.js')
//update webring //update webring
if (enableWebring) { if (enableWebring) {
const updateWebring = require(__dirname+'/webring.js'); const updateWebring = require(__dirname+'/webring.js');
updateWebring().catch(e => console.error); // updateWebring().catch(e => console.error);
setInterval(() => { setInterval(() => {
updateWebring().catch(e => console.error); updateWebring().catch(e => console.error);
}, msTime.hour); }, msTime.hour);

16
schedules/prune.js
Unescape View File

@ -15,18 +15,18 @@ module.exports = async() => {
'count': 0, 'count': 0,
'size': 0 'size': 0
} }
}).toArray().then(res => { }).toArray()
return res.map(x => x._id);
});
await Files.db.removeMany({ await Files.db.removeMany({
'count': { 'count': {
'$lte': 0 '$lte': 0
} }
}); });
await Promise.all(files.map(async filename => { await Promise.all(files.map(async file => {
return Promise.all([ return Promise.all(
remove(`${uploadDirectory}/img/${filename}`), [remove(`${uploadDirectory}/img/${file._id}`)]
remove(`${uploadDirectory}/img/thumb-${filename.split('.')[0]}.jpg`) .concat(file.exts.map(ext => {
]) remove(`${uploadDirectory}/img/thumb-${file._id.split('.')[0]}${ext}`)
}))
)
})); }));
} }

2
views/mixins/catalogtile.pug
Unescape View File

@ -17,7 +17,7 @@ mixin catalogtile(board, post, index)
img.catalog-thumb(src='/img/spoiler.png' width='64' height='64') img.catalog-thumb(src='/img/spoiler.png' width='64' height='64')
else else
if post.files[0].hasThumb if post.files[0].hasThumb
img.catalog-thumb(src=`/img/thumb-${post.files[0].hash}.jpg` width='64' height='64') img.catalog-thumb(src=`/img/thumb-${post.files[0].hash}${post.files[0].thumbextension}` width='64' height='64')
else else
img.catalog-thumb(src=`/img/${post.files[0].filename}` width='64' height='64') img.catalog-thumb(src=`/img/${post.files[0].filename}` width='64' height='64')
if post.message if post.message

2
views/mixins/post.pug
Unescape View File

@ -61,7 +61,7 @@ mixin post(post, truncate, manage=false, globalmanage=false, ban=false)
if post.spoiler if post.spoiler
img.file-thumb(src='/img/spoiler.png' width='128' height='128') img.file-thumb(src='/img/spoiler.png' width='128' height='128')
else if file.hasThumb else if file.hasThumb
img.file-thumb(src=`/img/thumb-${file.hash}.jpg` height=file.geometry.thumbheight width=file.geometry.thumbwidth) img.file-thumb(src=`/img/thumb-${file.hash}${file.thumbextension}` height=file.geometry.thumbheight width=file.geometry.thumbwidth)
else else
img.file-thumb(src=`/img/${file.filename}` height=file.geometry.height width=file.geometry.width) img.file-thumb(src=`/img/${file.filename}` height=file.geometry.height width=file.geometry.width)
- let truncatedMessage = post.message; - let truncatedMessage = post.message;

2
views/pages/thread.pug
Unescape View File

@ -14,7 +14,7 @@ block head
if thread.spoiler if thread.spoiler
meta(property='og:image', content='/img/spoiler.png') meta(property='og:image', content='/img/spoiler.png')
else if thread.files[0].hasThumb === true else if thread.files[0].hasThumb === true
meta(property='og:image', content=`/img/thumb-${thread.files[0].hash}.jpg`) meta(property='og:image', content=`/img/thumb-${thread.files[0].hash}${thread.files[0].thumbextension}`)
else else
meta(property='og:image', content=`/img/${thread.files[0].filename}`) meta(property='og:image', content=`/img/${thread.files[0].filename}`)

Write Preview
Loading…
Cancel
Save