graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 16:03:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

動画はimagemagickで変換できない

Browse source
This commit is contained in:
tamaina 2018-04-12 02:34:51 +09:00 committed by GitHub
parent 760b90a84b
commit 5172ef247b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/server/file/index.ts
View file

@ -54,8 +54,14 @@ interface ISend {
function thumbnail(data: stream.Readable, type: string, resize: number): ISend { function thumbnail(data: stream.Readable, type: string, resize: number): ISend {
const readable: stream.Readable = (() => { 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フレーム目を送る // 0フレーム目を送る
try { try {
return gm(data).selectFrame(0).stream(); return gm(data).selectFrame(0).stream();