diff --git a/server.js b/server.js index 5029779..f7007be 100644 --- a/server.js +++ b/server.js @@ -1,3 +1,5 @@ +( async () => { + const yargs = require('yargs'); const express = require('express'); const bodyParser = require('body-parser'); @@ -57,6 +59,9 @@ const DB_PATH = path.resolve(argv['db-path']); const IMAGE_PATH = path.resolve(argv['image-path']); const PORT = argv.port; +const THUMBNAIL_IMAGE_SIZE = 400; +const ADDITIONAL_IMAGE_SIZES = [800,1280,1920,2560]; + console.log('tinypin starting...'); console.log(''); console.log(`version: ${VERSION}`); @@ -74,7 +79,7 @@ console.log(''); const db = betterSqlite3(DB_PATH); -initDb(); +await initDb(); const COOKIE_KEY = Buffer.from(db.prepare("SELECT value FROM properties WHERE key = ?").get('cookieKey').value, 'hex'); @@ -82,8 +87,10 @@ const COOKIE_KEY = Buffer.from(db.prepare("SELECT value FROM properties WHERE ke const app = express(); app.use(express.static('public')); +app.use(bodyParser.raw({type: 'image/jpeg', limit: '25mb'})); app.use(bodyParser.urlencoded({ extended: false })) app.use(bodyParser.json()); + app.set('json spaces', 2); app.use(cookieParser()); @@ -121,9 +128,39 @@ function decryptCookie(ciphertext){ // handle auth app.use ( async (req, res, next) => { + // disable security + // req.user = { + // id: 1, + // name: 'a' + // }; + // next(); + // return; + + + + if ( req.originalUrl.startsWith("/up/") ){ + console.log("got up!"); + console.log("content type = " + req.headers['content-type']); + console.log(typeof(req.body)); + + await fs.writeFile('up.jpg', req.body); + + res.send(OK); + + return; + } + + if ( req.originalUrl.startsWith("/images/") ){ + req.user = { + id: 1, + name: "a" + }; + next(); + return; + } // skip auth for pub resources // handle login and register paths - if ( req.originalUrl.startsWith("/pub/")){ + if ( req.originalUrl.startsWith("/pub/") ){ next(); return; } if ( req.method == "GET" && req.originalUrl == "/login" ){ @@ -224,11 +261,21 @@ app.use( (req, res, next) => { res.setHeader('Cache-control', `private, max-age=2592000000`); // 30 days res.sendFile(filepath); + } else if ( req.method == "GET" && req.originalUrl.startsWith("/dl/") ){ + + let path = req.originalUrl.replace("/dl/", "/images/"); + + let filepath = IMAGE_PATH + "/" + req.user.id + "/" + path; + res.setHeader("Content-Disposition", 'attachment; filename="image.jpg'); + res.sendFile(filepath); + } else { next(); } }); + + app.use(express.static('static')); //emulate slow down @@ -332,8 +379,15 @@ app.delete("/api/boards/:boardId", async (req, res) => { let pins = db.prepare("SELECT id FROM pins WHERE userId = @userId and boardId = @boardId").all({userId:req.user.id, boardId:req.params.boardId}); for ( let i = 0; i < pins.length; ++i ){ - await fs.unlink(getThumbnailImagePath(req.user.id, pins[i].id).file); - await fs.unlink(getOriginalImagePath(req.user.id, pins[i].id).file); + + await fs.unlink(getImagePath(req.user.id, pins[i].id, 'o').file); + + await fs.unlink(getImagePath(req.user.id, pins[i].id, THUMBNAIL_IMAGE_SIZE).file); + + for ( let s = 0; s < ADDITIONAL_IMAGE_SIZES.length; ++s ){ + await fs.unlink(getImagePath(req.user.id, pins[i].id, ADDITIONAL_IMAGE_SIZES[s]).file); + } + } let result = db.prepare("DELETE FROM pins WHERE userId = @userId and boardId = @boardId").run({userId:req.user.id, boardId:req.params.boardId}); @@ -369,6 +423,7 @@ app.get("/api/pins/:pinId", (req, res) => { app.post("/api/pins", async (req, res) => { try { + // download the image first to make sure we can get it let image = await downloadImage(req.body.imageUrl); let result = db.prepare(`INSERT INTO PINS ( @@ -411,15 +466,7 @@ app.post("/api/pins", async (req, res) => { let id = result.lastInsertRowid; - // write the images to disk - let originalImagePath = getOriginalImagePath(req.user.id, id); - let thumbnailImagePath = getThumbnailImagePath(req.user.id, id); - await fs.mkdir(originalImagePath.dir, {recursive: true}); - await fs.mkdir(thumbnailImagePath.dir, {recursive: true}); - await fs.writeFile(originalImagePath.file, image.original.buffer); - console.log(`Saved original to: ${originalImagePath.file}`); - await fs.writeFile(thumbnailImagePath.file, image.thumbnail.buffer); - console.log(`Saved thumbnail to: ${thumbnailImagePath.file}`); + await saveImage(req.user.id, id, image); // return the newly created row let pin = db.prepare("SELECT * FROM pins WHERE userId = @userId and id = @pinId").get({userId: req.user.id, pinId: id}); @@ -468,8 +515,12 @@ app.delete("/api/pins/:pinId", async (req, res) => { let result = db.prepare('DELETE FROM pins WHERE userId = @userId and id = @pinId').run({userId: req.user.id, pinId:req.params.pinId}); if ( result.changes == 1 ){ - await fs.unlink(getThumbnailImagePath(req.user.id, req.params.pinId).file); - await fs.unlink(getOriginalImagePath(req.user.id, req.params.pinId).file); + await fs.unlink(getImagePath(req.user.id, req.params.pinId, 'o').file); + await fs.unlink(getImagePath(req.user.id, req.params.pinId, THUMBNAIL_IMAGE_SIZE).file); + + for ( let s = 0; s < ADDITIONAL_IMAGE_SIZES.length; ++s ){ + await fs.unlink(getImagePath(req.user.id, req.params.pinId, ADDITIONAL_IMAGE_SIZES[s]).file); + } console.log(`deleted pin#${req.params.pinId}`); res.send(OK); @@ -482,6 +533,77 @@ app.delete("/api/pins/:pinId", async (req, res) => { } }); +app.post("/up/", async (req, res) => { + console.log("got up!"); + console.log("content type = " + req.headers['content-type']); + let boardName = req.headers['board-name'].trim(); + console.log("board name = " + req.headers['board-name']); + console.log(typeof(req.body)); + + let result = db.prepare("SELECT id FROM boards WHERE name = @name and userId = @userId").get({name: boardName, userId: req.user.id}); + + let boardId = null; + + if ( result ){ + boardId = result.id; + } else { + result = db.prepare("INSERT INTO boards (name, userId, hidden, createDate) VALUES (@name, @userId, @hidden, @createDate)").run({name: boardName, userId: req.user.id, hidden: null, createDate: new Date().toISOString()}); + boardId = result.lastInsertRowid; + } + + console.log("boardId=" + boardId); + + let image = await processImage(req.body); + + result = db.prepare(`INSERT INTO PINS ( + boardId, + imageUrl, + siteUrl, + description, + sortOrder, + originalHeight, + originalWidth, + thumbnailHeight, + thumbnailWidth, + userId, + createDate + ) VALUES ( + @boardId, + @imageUrl, + @siteUrl, + @description, + @sortOrder, + @originalHeight, + @originalWidth, + @thumbnailHeight, + @thumbnailWidth, + @userId, + @createDate) + `).run({ + boardId: boardId, + imageUrl: null, + siteUrl: null, + description: null, + sortOrder: null, + originalHeight: image.original.height, + originalWidth: image.original.width, + thumbnailHeight: image.thumbnail.height, + thumbnailWidth: image.thumbnail.width, + userId: req.user.id, + createDate: new Date().toISOString() + }); + + let id = result.lastInsertRowid; + + await saveImage(req.user.id, id, image); + + // return the newly created row + let pin = db.prepare("SELECT * FROM pins WHERE userId = @userId and id = @pinId").get({userId: req.user.id, pinId: id}); + res.send(pin); + + return; +}); + // start listening @@ -490,7 +612,7 @@ app.listen(PORT, () => { console.log(''); }); -function initDb(){ +async function initDb(){ console.log("initializing database..."); @@ -600,10 +722,67 @@ function initDb(){ })(); } + if ( schemaVersion < 3 ){ + // image file re-organization, additional sizes + console.log(" running migration v3"); + + let pins = db.prepare(`SELECT * FROM pins`).all(); + + if ( require("fs").existsSync(`${IMAGE_PATH}`) ){ + let userdirs = await fs.readdir(IMAGE_PATH); + console.log(" migrating images"); + for ( let i = 0; i < userdirs.length; ++i ){ + if ( require("fs").existsSync(`${IMAGE_PATH}/${userdirs[i]}/images/originals`) ){ + await fs.rename(`${IMAGE_PATH}/${userdirs[i]}/images/originals`, `${IMAGE_PATH}/${userdirs[i]}/images/o`); + } + if ( require("fs").existsSync(`${IMAGE_PATH}/${userdirs[i]}/images/thumbnails`) ){ + await fs.rename(`${IMAGE_PATH}/${userdirs[i]}/images/thumbnails`, `${IMAGE_PATH}/${userdirs[i]}/images/400`); + } + } + } + + if ( pins.length > 0 ){ + console.log(" generating additional image sizes..."); + } + + for ( let i = 0; i < pins.length; ++i ){ + let pin = pins[i]; + let originalImagePath = getImagePath(pin.userId, pin.id, 'o'); + + for ( let i = 0; i < ADDITIONAL_IMAGE_SIZES.length; ++i ){ + let size = ADDITIONAL_IMAGE_SIZES[i]; + + let img = await sharp(originalImagePath.file); + let resizedImg = await img.resize({width: size, height: size, fit: 'inside'}) + let buf = await resizedImg.toBuffer(); + + let imgPath = getImagePath(pin.userId, pin.id, size); + await fs.mkdir(imgPath.dir, {recursive:true}); + await fs.writeFile(imgPath.file, buf); + console.log(` saved additional size ${size} for pin#${pin.id} to: ${imgPath.file}`); + } + + } + + if ( pins.length > 0 ){ + console.log(" finished generating addditional image sizes"); + } + + db.prepare(` + INSERT INTO migrations (id, createDate) VALUES ( @id, @createDate ) + `).run({id:3, createDate: new Date().toISOString()}); + + schemaVersion = 3; + } + console.log(`database ready - schema version v${schemaVersion}`); console.log(''); } +/** + * Downloads the image, converts it to JPG, and creates the thumbnail size so that standard dimensions can be taken + * @param {string} imageUrl + */ async function downloadImage(imageUrl){ let res = await fetch(imageUrl); @@ -614,11 +793,15 @@ async function downloadImage(imageUrl){ let buffer = await res.buffer(); - let original = sharp(buffer); - let originalMetadata = await original.metadata(); - let originalBuffer = await original.toFormat("jpg").toBuffer(); + return await processImage(buffer); +} - let thumbnail = await original.resize({ width: 400, height: 400, fit: 'inside' }); +async function processImage(buffer){ + let original = sharp(buffer); + let originalBuffer = await original.toFormat("jpg").toBuffer(); + let originalMetadata = await original.metadata(); + + let thumbnail = await original.resize({ width: THUMBNAIL_IMAGE_SIZE, height: THUMBNAIL_IMAGE_SIZE, fit: 'inside' }); let thumbnailBuffer = await thumbnail.toBuffer(); let thumbnailMetadata = await sharp(thumbnailBuffer).metadata(); @@ -636,17 +819,43 @@ async function downloadImage(imageUrl){ } } +// takes the response from downloadImage, creates ADDITIONAL_IMAGE_SIZE and writes all files to disk +async function saveImage(userId, pinId, image){ + + + let originalImagePath = getImagePath(userId, pinId, 'o'); + await fs.mkdir(originalImagePath.dir, {recursive: true}); + await fs.writeFile(originalImagePath.file, image.original.buffer); + console.log(`saved original to: ${originalImagePath.file}`); + + let thumbnailImagePath = getImagePath(userId, pinId, '400'); + await fs.mkdir(thumbnailImagePath.dir, {recursive: true}); + await fs.writeFile(thumbnailImagePath.file, image.thumbnail.buffer); + console.log(`saved thumbnail to: ${thumbnailImagePath.file}`); + + // this will enlarge images if necessary, as the lanczos3 resize algorithm will create better looking enlargements than the browser will + for ( let i = 0; i < ADDITIONAL_IMAGE_SIZES.length; ++i ){ + let size = ADDITIONAL_IMAGE_SIZES[i]; + + let img = await sharp(image.original.buffer); + let resizedImg = await img.resize({width: size, height: size, fit: 'inside'}) + let buf = await resizedImg.toBuffer(); + + let imgPath = getImagePath(userId, pinId, size); + await fs.mkdir(imgPath.dir, {recursive:true}); + await fs.writeFile(imgPath.file, buf); + console.log(`saved additional size ${size} to: ${imgPath.file}`); + } -function getOriginalImagePath(userId, pinId){ - let paddedId = pinId.toString().padStart(12, '0'); - let dir = `${IMAGE_PATH}/${userId}/images/originals/${paddedId[11]}/${paddedId[10]}/${paddedId[9]}/${paddedId[8]}`; - let file = `${dir}/${paddedId}.jpg`; - return {dir: dir, file: file}; } -function getThumbnailImagePath(userId, pinId){ + +function getImagePath(userId, pinId, size){ let paddedId = pinId.toString().padStart(12, '0'); - let dir = `${IMAGE_PATH}/${userId}/images/thumbnails/${paddedId[11]}/${paddedId[10]}/${paddedId[9]}/${paddedId[8]}`; + let dir = `${IMAGE_PATH}/${userId}/images/${size}/${paddedId[11]}/${paddedId[10]}/${paddedId[9]}/${paddedId[8]}`; let file = `${dir}/${paddedId}.jpg`; - return {dir: dir, file: file}; + return { dir: dir, file: file}; } + + +})(); \ No newline at end of file diff --git a/static/addpin.html b/static/addpin.html index 5d7a84e..d71075e 100644 --- a/static/addpin.html +++ b/static/addpin.html @@ -20,6 +20,8 @@ + +
@@ -28,6 +30,9 @@ +
+ + + + + - - diff --git a/static/lightgallery/js/lightgallery-custom.js b/static/lightgallery/js/lightgallery-custom.js index 67bc2d0..57e4e54 100644 --- a/static/lightgallery/js/lightgallery-custom.js +++ b/static/lightgallery/js/lightgallery-custom.js @@ -594,7 +594,7 @@ // tinypin -- add controls - this.outer.querySelector('.lg-toolbar').insertAdjacentHTML('beforeend', ''); + this.outer.querySelector('.lg-toolbar').insertAdjacentHTML('beforeend', ''); if (this.s.download) { this.outer.querySelector('.lg-toolbar').insertAdjacentHTML('beforeend', ''); @@ -1036,7 +1036,15 @@ } else { siteUrlEl.classList.add("lg-control-hide"); } + + let openOriginalEl = document.getElementById("lg-openOriginal"); + openOriginalEl.setAttribute("href", _this.s.dynamicEl[index].originalUrl); + let iosShareEl = document.getElementById("lg-iosShare"); + iosShareEl.setAttribute("href", "shortcuts://run-shortcut?name=Open%20In&input=" + encodeURIComponent("https://sktp.quikstorm.net/" + _this.s.dynamicEl[index].originalUrl)); + + // end tinypin + _lgUtils2.default.trigger(_this.el, 'onBeforeSlide', { prevIndex: _prevIndex, index: index, diff --git a/static/pulltorefresh.js b/static/pulltorefresh.js deleted file mode 100644 index 3388fa3..0000000 --- a/static/pulltorefresh.js +++ /dev/null @@ -1,7 +0,0 @@ -/*! - * pulltorefreshjs v0.1.21 - * (c) Rafael Soto - * Released under the MIT License. - */ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).PullToRefresh=t()}(this,function(){"use strict";var e={pullStartY:null,pullMoveY:null,handlers:[],styleEl:null,events:null,dist:0,state:"pending",timeout:null,distResisted:0,supportsPassive:!1,supportsPointerEvents:"undefined"!=typeof window&&!!window.PointerEvent};try{window.addEventListener("test",null,{get passive(){e.supportsPassive=!0}})}catch(e){}var t,n={setupDOM:function(t){if(!t.ptrElement){var n=document.createElement("div");t.mainElement!==document.body?t.mainElement.parentNode.insertBefore(n,t.mainElement):document.body.insertBefore(n,document.body.firstChild),n.classList.add(t.classPrefix+"ptr"),n.innerHTML=t.getMarkup().replace(/__PREFIX__/g,t.classPrefix),t.ptrElement=n,"function"==typeof t.onInit&&t.onInit(t),e.styleEl||(e.styleEl=document.createElement("style"),e.styleEl.setAttribute("id","pull-to-refresh-js-style"),document.head.appendChild(e.styleEl)),e.styleEl.textContent=t.getStyles().replace(/__PREFIX__/g,t.classPrefix).replace(/\s+/g," ")}return t},onReset:function(t){t.ptrElement.classList.remove(t.classPrefix+"refresh"),t.ptrElement.style[t.cssProp]="0px",setTimeout(function(){t.ptrElement&&t.ptrElement.parentNode&&(t.ptrElement.parentNode.removeChild(t.ptrElement),t.ptrElement=null),e.state="pending"},t.refreshTimeout)},update:function(t){var n=t.ptrElement.querySelector("."+t.classPrefix+"icon"),s=t.ptrElement.querySelector("."+t.classPrefix+"text");n&&("refreshing"===e.state?n.innerHTML=t.iconRefreshing:n.innerHTML=t.iconArrow),s&&("releasing"===e.state&&(s.innerHTML=t.instructionsReleaseToRefresh),"pulling"!==e.state&&"pending"!==e.state||(s.innerHTML=t.instructionsPullToRefresh),"refreshing"===e.state&&(s.innerHTML=t.instructionsRefreshing))}},s=function(t){return e.pointerEventsEnabled&&e.supportsPointerEvents?t.screenY:t.touches[0].screenY},r=function(){var r;function i(t){var i=e.handlers.filter(function(e){return e.contains(t.target)})[0];e.enable=!!i,i&&"pending"===e.state&&(r=n.setupDOM(i),i.shouldPullToRefresh()&&(e.pullStartY=s(t)),clearTimeout(e.timeout),n.update(i))}function o(t){r&&r.ptrElement&&e.enable&&(e.pullStartY?e.pullMoveY=s(t):r.shouldPullToRefresh()&&(e.pullStartY=s(t)),"refreshing"!==e.state?("pending"===e.state&&(r.ptrElement.classList.add(r.classPrefix+"pull"),e.state="pulling",n.update(r)),e.pullStartY&&e.pullMoveY&&(e.dist=e.pullMoveY-e.pullStartY),e.distExtra=e.dist-r.distIgnore,e.distExtra>0&&(t.cancelable&&t.preventDefault(),r.ptrElement.style[r.cssProp]=e.distResisted+"px",e.distResisted=r.resistanceFunction(e.distExtra/r.distThreshold)*Math.min(r.distMax,e.distExtra),"pulling"===e.state&&e.distResisted>r.distThreshold&&(r.ptrElement.classList.add(r.classPrefix+"release"),e.state="releasing",n.update(r)),"releasing"===e.state&&e.distResistedr.distThreshold)e.state="refreshing",r.ptrElement.style[r.cssProp]=r.distReload+"px",r.ptrElement.classList.add(r.classPrefix+"refresh"),e.timeout=setTimeout(function(){var e=r.onRefresh(function(){return n.onReset(r)});e&&"function"==typeof e.then&&e.then(function(){return n.onReset(r)}),e||r.onRefresh.length||n.onReset(r)},r.refreshTimeout);else{if("refreshing"===e.state)return;r.ptrElement.style[r.cssProp]="0px",e.state="pending"}n.update(r),r.ptrElement.classList.remove(r.classPrefix+"release"),r.ptrElement.classList.remove(r.classPrefix+"pull"),e.pullStartY=e.pullMoveY=null,e.dist=e.distResisted=0}}function a(){r&&r.mainElement.classList.toggle(r.classPrefix+"top",r.shouldPullToRefresh())}var d=e.supportsPassive?{passive:e.passive||!1}:void 0;return e.pointerEventsEnabled&&e.supportsPointerEvents?(window.addEventListener("pointerup",l),window.addEventListener("pointerdown",i),window.addEventListener("pointermove",o,d)):(window.addEventListener("touchend",l),window.addEventListener("touchstart",i),window.addEventListener("touchmove",o,d)),window.addEventListener("scroll",a),{onTouchEnd:l,onTouchStart:i,onTouchMove:o,onScroll:a,destroy:function(){e.pointerEventsEnabled&&e.supportsPointerEvents?(window.removeEventListener("pointerdown",i),window.removeEventListener("pointerup",l),window.removeEventListener("pointermove",o,d)):(window.removeEventListener("touchstart",i),window.removeEventListener("touchend",l),window.removeEventListener("touchmove",o,d)),window.removeEventListener("scroll",a)}}},i={distThreshold:60,distMax:80,distReload:50,distIgnore:0,mainElement:"body",triggerElement:"body",ptrElement:".ptr",classPrefix:"ptr--",cssProp:"min-height",iconArrow:"⇣",iconRefreshing:"…",instructionsPullToRefresh:"Pull down to refresh",instructionsReleaseToRefresh:"Release to refresh",instructionsRefreshing:"Refreshing",refreshTimeout:500,getMarkup:function(){return'\n
\n
\n
\n
\n
\n
\n'},getStyles:function(){return"\n.__PREFIX__ptr {\n box-shadow: inset 0 -3px 5px rgba(0, 0, 0, 0.12);\n pointer-events: none;\n font-size: 0.85em;\n font-weight: bold;\n top: 0;\n height: 0;\n transition: height 0.3s, min-height 0.3s;\n text-align: center;\n width: 100%;\n overflow: hidden;\n display: flex;\n align-items: flex-end;\n align-content: stretch;\n}\n\n.__PREFIX__box {\n padding: 10px;\n flex-basis: 100%;\n}\n\n.__PREFIX__pull {\n transition: none;\n}\n\n.__PREFIX__text {\n margin-top: .33em;\n color: rgba(0, 0, 0, 0.3);\n}\n\n.__PREFIX__icon {\n color: rgba(0, 0, 0, 0.3);\n transition: transform .3s;\n}\n\n/*\nWhen at the top of the page, disable vertical overscroll so passive touch\nlisteners can take over.\n*/\n.__PREFIX__top {\n touch-action: pan-x pan-down pinch-zoom;\n}\n\n.__PREFIX__release .__PREFIX__icon {\n transform: rotate(180deg);\n}\n"},onInit:function(){},onRefresh:function(){return location.reload()},resistanceFunction:function(e){return Math.min(1,e/2.5)},shouldPullToRefresh:function(){return!window.scrollY}},o=["mainElement","ptrElement","triggerElement"],l=function(t){var n={};return Object.keys(i).forEach(function(e){n[e]=t[e]||i[e]}),n.refreshTimeout="number"==typeof t.refreshTimeout?t.refreshTimeout:i.refreshTimeout,o.forEach(function(e){"string"==typeof n[e]&&(n[e]=document.querySelector(n[e]))}),e.events||(e.events=r()),n.contains=function(e){return n.triggerElement.contains(e)},n.destroy=function(){clearTimeout(e.timeout);var t=e.handlers.indexOf(n);e.handlers.splice(t,1)},n};return{setPassiveMode:function(t){e.passive=t},setPointerEventsMode:function(t){e.pointerEventsEnabled=t},destroyAll:function(){e.events&&(e.events.destroy(),e.events=null),e.handlers.forEach(function(e){e.destroy()})},init:function(t){void 0===t&&(t={});var n=l(t);return e.handlers.push(n),n},_:{setupHandler:l,setupEvents:r,setupDOM:n.setupDOM,onReset:n.onReset,update:n.update}}}); -//# sourceMappingURL=index.umd.min.js.map \ No newline at end of file diff --git a/static/utils.js b/static/utils.js index 147bdbc..32ced82 100644 --- a/static/utils.js +++ b/static/utils.js @@ -3,17 +3,18 @@ function getOriginalImagePath(pinId){ return ""; } let paddedId = pinId.toString().padStart(12, '0'); - let dir = `images/originals/${paddedId[11]}/${paddedId[10]}/${paddedId[9]}/${paddedId[8]}`; + let dir = `images/o/${paddedId[11]}/${paddedId[10]}/${paddedId[9]}/${paddedId[8]}`; let file = `${dir}/${paddedId}.jpg`; return file; } -function getThumbnailImagePath(pinId){ +function getImagePath(pinId, size){ if ( !pinId ){ return ""; } + let paddedId = pinId.toString().padStart(12, '0'); - let dir = `images/thumbnails/${paddedId[11]}/${paddedId[10]}/${paddedId[9]}/${paddedId[8]}`; + let dir = `images/${size}/${paddedId[11]}/${paddedId[10]}/${paddedId[9]}/${paddedId[8]}`; let file = `${dir}/${paddedId}.jpg`; return file; } @@ -59,3 +60,27 @@ function getPinIndexById(id){ function getPinById(id){ return store.data.board.pins[getPinIndexById(id)]; } + +// feature detection +if ( 'ontouchstart' in window ){ + window.isTouch = true; + document.body.classList.add("is-touch"); +} + +if ([ + 'iPad Simulator', + 'iPhone Simulator', + 'iPod Simulator', + 'iPad', + 'iPhone', + 'iPod' + ].includes(navigator.platform) + // iPad on iOS 13 detection + || (navigator.userAgent.includes("Mac") && "ontouchend" in document) ){ + + + window.iOS = true; + document.body.classList.add("is-ios"); +} else { + window.iOS = false; +} \ No newline at end of file diff --git a/utils/regen-thumbs.js b/utils/regen-thumbs.js new file mode 100644 index 0000000..0ca361c --- /dev/null +++ b/utils/regen-thumbs.js @@ -0,0 +1,42 @@ +const fs = require("fs").promises; +const sharp = require("sharp"); +const betterSqlite3 = require('better-sqlite3'); + + +const DB_PATH = "tinypin.db"; +const IMAGE_PATH = "images"; + +const db = betterSqlite3(DB_PATH); + +( async () => { + + +let pins = db.prepare("select * from pins").all(); + +for ( let i = 0; i < pins.length; ++i ){ + + let pin = pins[i]; + + let originalPath = getImagePath(pin.userId, pin.id, 'o'); + + let img = await sharp(originalPath.file); + + let resizedImg = await img.resize({width: 400, height: 400, fit: 'inside'}) + let buf = await resizedImg.toBuffer(); + + let thumbPath = getImagePath(pin.userId, pin.id, 't'); + await fs.mkdir(thumbPath.dir, {recursive: true}); + await fs.writeFile(thumbPath.file, buf); +} + + + + +function getImagePath(userId, pinId, size){ + let paddedId = pinId.toString().padStart(12, '0'); + let dir = `${IMAGE_PATH}/${userId}/images/${size}/${paddedId[11]}/${paddedId[10]}/${paddedId[9]}/${paddedId[8]}`; + let file = `${dir}/${paddedId}.jpg`; + return { dir: dir, file: file}; +} + +})();