1.10.1
This commit is contained in:
parent
604692ca2a
commit
bd30f3ec85
9 changed files with 121 additions and 66 deletions
|
@ -123,7 +123,7 @@ export const ffmpegDownscale = (
|
|||
path: string,
|
||||
filename: string,
|
||||
extension: string,
|
||||
) => {
|
||||
): Promise<void> => {
|
||||
const startTime = Date.now();
|
||||
const outputOptions = [
|
||||
"-vf",
|
||||
|
@ -143,8 +143,11 @@ export const ffmpegDownscale = (
|
|||
.input(path)
|
||||
.outputOptions(outputOptions)
|
||||
.output(`uploads/720p-${filename}${extension}`)
|
||||
.on("progress", function(progress) {
|
||||
fs.writeFileSync(progressFile, JSON.stringify({ progress: progress.percent / 100 }));
|
||||
.on("progress", function (progress) {
|
||||
fs.writeFileSync(
|
||||
progressFile,
|
||||
JSON.stringify({ progress: progress.percent / 100 }),
|
||||
);
|
||||
})
|
||||
.on("end", () => {
|
||||
console.log(
|
||||
|
@ -189,7 +192,7 @@ export const ffmpegConvert = (
|
|||
path: string,
|
||||
filename: string,
|
||||
extension: string,
|
||||
) => {
|
||||
): Promise<void> => {
|
||||
const startTime = Date.now();
|
||||
const outputOptions = [
|
||||
"-vf",
|
||||
|
@ -225,8 +228,11 @@ export const ffmpegConvert = (
|
|||
.output("uploads/")
|
||||
.outputFormat(outputFormat)
|
||||
.output(`uploads/${filename}${outputFormat}`)
|
||||
.on("progress", function(progress) {
|
||||
fs.writeFileSync(progressFile, JSON.stringify({ progress: progress.percent / 100 }));
|
||||
.on("progress", function (progress) {
|
||||
fs.writeFileSync(
|
||||
progressFile,
|
||||
JSON.stringify({ progress: progress.percent / 100 }),
|
||||
);
|
||||
})
|
||||
.on("end", function () {
|
||||
console.log(
|
||||
|
@ -246,7 +252,10 @@ export const ffProbe = async (
|
|||
extension: string,
|
||||
) => {
|
||||
return new Promise<FfprobeData>((resolve, reject) => {
|
||||
if (!videoExtensions.includes(extension) && !imageExtensions.includes(extension)) {
|
||||
if (
|
||||
!videoExtensions.includes(extension) &&
|
||||
!imageExtensions.includes(extension)
|
||||
) {
|
||||
console.log(`Extension is ${extension}`);
|
||||
reject(`Submitted file is neither a video nor an image: ${path}`);
|
||||
}
|
||||
|
|
|
@ -44,7 +44,14 @@ export const checkSharexAuth: Middleware = (req, res, next) => {
|
|||
next();
|
||||
};
|
||||
|
||||
/**Creates oembed json file for embed metadata */
|
||||
/**
|
||||
* Creates oembed data for uploaded files
|
||||
*
|
||||
* @param {Express Request Object} Express request object
|
||||
* @param {Express Response Object} Express response object
|
||||
* @param {Express NextFunction variable} Express next function
|
||||
*
|
||||
*/
|
||||
export const createEmbedData: Middleware = async (req, res, next) => {
|
||||
const files = req.files as Express.Multer.File[];
|
||||
for (const file in files) {
|
||||
|
@ -90,7 +97,14 @@ export const createEmbedData: Middleware = async (req, res, next) => {
|
|||
next();
|
||||
};
|
||||
|
||||
/**Creates a 720p copy of video for smaller file */
|
||||
/**
|
||||
* Creates a 720p copy of uploaded videos
|
||||
*
|
||||
* @param {Express Request Object} req Express request object
|
||||
* @param {Express Response Object} res Express response object
|
||||
* @param {Express NextFunction} next Express next function
|
||||
*
|
||||
*/
|
||||
export const convertTo720p: Middleware = (req, res, next) => {
|
||||
const files = req.files as Express.Multer.File[];
|
||||
console.log("convert to 720p running");
|
||||
|
@ -103,7 +117,6 @@ export const convertTo720p: Middleware = (req, res, next) => {
|
|||
fileExtension !== ".gif"
|
||||
) {
|
||||
console.log(`${files[file].filename} is not a video file`);
|
||||
console.log(fileExtension);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ export const fileStorage = multer.diskStorage({
|
|||
console.log(err);
|
||||
callback(err, null);
|
||||
}
|
||||
|
||||
if (exists.length != 0) {
|
||||
const suffix = new Date().getTime() / 1000;
|
||||
|
||||
|
@ -41,15 +42,9 @@ export const fileStorage = multer.diskStorage({
|
|||
request.body.title == null ||
|
||||
request.body.title == undefined
|
||||
) {
|
||||
callback(
|
||||
null,
|
||||
filename + "-" + suffix + fileExtension,
|
||||
);
|
||||
callback(null, filename + "-" + suffix + fileExtension);
|
||||
} else {
|
||||
callback(
|
||||
null,
|
||||
request.body.title + "-" + suffix + fileExtension,
|
||||
);
|
||||
callback(null, request.body.title + "-" + suffix + fileExtension);
|
||||
}
|
||||
} else {
|
||||
if (
|
||||
|
@ -67,7 +62,7 @@ export const fileStorage = multer.diskStorage({
|
|||
},
|
||||
});
|
||||
|
||||
export const allowedMimeTypes = [
|
||||
export let allowedMimeTypes = [
|
||||
"image/png",
|
||||
"image/jpg",
|
||||
"image/jpeg",
|
||||
|
@ -80,6 +75,10 @@ export const allowedMimeTypes = [
|
|||
"audio/ogg",
|
||||
];
|
||||
|
||||
export const setAllowedMimeTypes = (mimeTypes: string[]): void => {
|
||||
allowedMimeTypes = mimeTypes;
|
||||
};
|
||||
|
||||
export const fileFilter = (
|
||||
request: Request,
|
||||
file: Express.Multer.File,
|
||||
|
@ -91,4 +90,3 @@ export const fileFilter = (
|
|||
callback(null, false);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue