waveringana/embedder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

cleaner code

Browse source
This commit is contained in:
waveringana 2022-12-04 09:14:16 +00:00
parent 44da6f3720
commit b6779a7d7c
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/routes/index.ts
View file

@ -24,12 +24,12 @@ function extension(str: String){
} }
const storage = multer.diskStorage({ const storage = multer.diskStorage({
destination: function (req, file, cb) { destination: (req, file, cb) => {
cb(null, "uploads/"); cb(null, "uploads/");
}, },
filename : function(req, file, cb) { filename : (req, file, cb) => {
let nameAndExtension = extension(file.originalname); let nameAndExtension = extension(file.originalname);
db.all("SELECT * FROM media WHERE path = ?", [nameAndExtension[0] + nameAndExtension[1]], function (err: Error, exists: []) { db.all("SELECT * FROM media WHERE path = ?", [nameAndExtension[0] + nameAndExtension[1]], (err: Error, exists: []) => {
if (exists.length != 0) { if (exists.length != 0) {
let suffix = new Date().getTime() / 1000; let suffix = new Date().getTime() / 1000;
@ -99,16 +99,16 @@ router.get("/", (req, res, next) => {
res.render("index", { user: req.user }); res.render("index", { user: req.user });
}); });
router.get("/gifv/:file", async function (req, res, next) { router.get("/gifv/:file", async (req, res, next) => {
let url = `${req.protocol}://${req.get("host")}/uploads/${req.params.file}`; let url = `${req.protocol}://${req.get("host")}/uploads/${req.params.file}`;
let width; let height; let width; let height;
let nameAndExtension = extension("uploads/" + req.params.file); let nameAndExtension = extension("uploads/" + req.params.file);
if (nameAndExtension[1] == ".mp4") { if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".mov" || nameAndExtension[1] == ".webm") {
ffmpeg() ffmpeg()
.input("uploads/" + req.params.file) .input("uploads/" + req.params.file)
.inputFormat("mp4") .inputFormat(nameAndExtension[1].substring(1))
.ffprobe(function(err, data) { .ffprobe((err: Error, data: ffmpeg.FfprobeData) => {
if (err) return next(err); if (err) return next(err);
width = data.streams[0].width; width = data.streams[0].width;
height = data.streams[0].height; height = data.streams[0].height;
@ -118,14 +118,14 @@ router.get("/gifv/:file", async function (req, res, next) {
ffmpeg() ffmpeg()
.input("uploads/" + req.params.file) .input("uploads/" + req.params.file)
.inputFormat("gif") .inputFormat("gif")
.ffprobe(function(err, data) { .ffprobe((err: Error, data: ffmpeg.FfprobeData) => {
if (err) return next(err); if (err) return next(err);
width = data.streams[0].width; width = data.streams[0].width;
height = data.streams[0].height; height = data.streams[0].height;
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: width, height: height }); return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: width, height: height });
}); });
} else { } else {
let imageData = await imageProbe(fs.createReadStream("uploads/" + req.params.file)); let imageData = await imageProbe(fs.createReadStream(`uploads/${req.params.file}`));
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: imageData.width, height: imageData.height }); return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: imageData.width, height: imageData.height });
} }
}); });
@ -139,8 +139,8 @@ router.post("/sharex", [checkAuth, upload.array("fileupload"), convert, handleUp
return res.send(`${req.protocol}://${req.get("host")}/uploads/${req.files[0].filename}`); return res.send(`${req.protocol}://${req.get("host")}/uploads/${req.files[0].filename}`);
}); });
router.post("/:id(\\d+)/delete", function(req, res, next) { router.post("/:id(\\d+)/delete", (req, res, next) => {
db.all("SELECT path FROM media WHERE id = ?", [ req.params.id ], function(err: Error, path: Array<any>) { db.all("SELECT path FROM media WHERE id = ?", [ req.params.id ], (err: Error, path: Array<any>) => {
if (err) { return next(err); } if (err) { return next(err); }
fs.unlink(`uploads/${path[0].path}`, (err => { fs.unlink(`uploads/${path[0].path}`, (err => {
if (err) { if (err) {

3
app/routes/middleware.ts
View file

@ -1,4 +1,3 @@
import type {MediaRow, UserRow} from '../types';
import type {RequestHandler as Middleware, Router, Request, Response} from 'express'; import type {RequestHandler as Middleware, Router, Request, Response} from 'express';
import ffmpeg from "fluent-ffmpeg"; import ffmpeg from "fluent-ffmpeg";
@ -34,7 +33,7 @@ export const checkAuth: Middleware = (req: Request, res: Response, next: Functio
} }
let shortKey = key.substr(0, 3) + "..."; let shortKey = key.substr(0, 3) + "...";
console.log("Authenicated user with key: " + shortKey); console.log(`Authenicated user with key: ${shortKey}`);
next(); next();
} }