diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2018-04-12 02:34:51 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 02:34:51 +0900 |
| commit | 5172ef247bf5dbd9ef163241cedb565a47a85f4a (patch) | |
| tree | ee8c3d581a8ca9262e88cff58845f58e9996fcf7 /src | |
| parent | 🖌 (diff) | |
| download | sharkey-5172ef247bf5dbd9ef163241cedb565a47a85f4a.tar.gz sharkey-5172ef247bf5dbd9ef163241cedb565a47a85f4a.tar.bz2 sharkey-5172ef247bf5dbd9ef163241cedb565a47a85f4a.zip | |
動画はimagemagickで変換できない
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/file/index.ts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/server/file/index.ts b/src/server/file/index.ts index 22370ddd0d..658117e3ac 100644 --- a/src/server/file/index.ts +++ b/src/server/file/index.ts @@ -54,8 +54,14 @@ interface ISend { function thumbnail(data: stream.Readable, type: string, resize: number): ISend { const readable: stream.Readable = (() => { - // 動画か画像であれば - if (/^(?:video|image)\/.*$/.test(type) || type == 'application/xml') { + // 動画であれば + if (/^video\/.*$/.test(type)) { + // 実装は先延ばし + // 使わないことになったストリームはしっかり取り壊す + data.destroy(); + return fs.createReadStream(`${__dirname}/assets/thumbnail-not-available.png`); + // 画像であれば + } else if (/^image\/.*$/.test(type) || type == 'application/xml') { // 0フレーム目を送る try { return gm(data).selectFrame(0).stream(); |