ashpie/ily.li
ashpie
/
ily.li
1
0
Fork 0
Code Issues 3 Pull Requests 1 Releases 2 Wiki Activity

Merge branch 'develop'

This commit is contained in:
Alice Gaudon 2020-11-22 12:40:12 +01:00
parent cfed3b85a6 b5daa7c3b3
commit 4ad2e1bd59
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ily.li",
"version": "0.5.2",
"version": "0.5.3",
"description": "Self-hosted file pusher",
"repository": "https://gitlab.com/ArisuOngaku/ily.li",
"author": "Alice Gaudon <alice@gaudon.pro>",

31
src/controllers/LinkController.ts
View File

@ -1,6 +1,6 @@
import Controller from "wms-core/Controller";
import {NextFunction, Request, Response} from "express";
import {BadRequestError, ForbiddenHttpError, NotFoundHttpError, ServerError} from "wms-core/HttpError";
import {BadRequestError, NotFoundHttpError, ServerError} from "wms-core/HttpError";
import config from "config";
import {REQUIRE_REQUEST_AUTH_MIDDLEWARE} from "wms-core/auth/AuthComponent";
import URLRedirect from "../models/URLRedirect";
@ -10,6 +10,9 @@ import generateSlug from "../SlugGenerator";
import FileController, {FILE_UPLOAD_FORM_MIDDLEWARE} from "./FileController";
import * as fs from "fs";
import {encodeRFC5987ValueChars} from "../Utils";
import {promisify} from "util";
import * as buffer from "buffer";
import Logger from "wms-core/Logger";
export default class LinkController extends Controller {
routes(): void {
@ -35,16 +38,24 @@ export default class LinkController extends Controller {
return next();
}
// File type
const fileName = file.real_name!;
const parts = fileName.split('.');
res.type(parts[parts.length - 1]);
// File name
res.header('Content-Disposition', `inline; filename*=UTF-8''${encodeRFC5987ValueChars(fileName)}`);
switch (file.storage_type) {
case 'local':
const stats = await promisify(fs.stat)(file.storage_path!);
// If file is bigger than max supported one shot reading, fallback to express download
if (stats.size > buffer.constants.MAX_LENGTH) {
Logger.info(`Fallback to express download for file of size ${stats.size}`);
return res.download(file.storage_path!);
}
// File type
const fileName = file.real_name!;
const parts = fileName.split('.');
res.type(parts[parts.length - 1]);
// File name
res.header('Content-Disposition', `inline; filename*=UTF-8''${encodeRFC5987ValueChars(fileName)}`);
fs.readFile(file.storage_path!, (err, data) => {
if (err) return next(err);
res.send(data);
@ -94,4 +105,4 @@ export default class LinkController extends Controller {
}
next();
}
}
}