DebaucheryLibrarian/traxxx
2
1
Fork 1
Code Issues 39 Pull Requests 1 Releases Wiki Activity

Added m3u8 stream support to media module. Added Elegant Angel. Added regex parameter to qu's number method. Various tags.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2020-07-17 03:39:13 +02:00
parent 66d6322c1d
commit a88c2f0760
27 changed files with 222 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/media.js
View File

@@ -10,7 +10,7 @@ const stream = require('stream');
const nanoid = require('nanoid/non-secure');
const mime = require('mime');
// const fileType = require('file-type');
const youtubeDl = require('youtube-dl');
const ffmpeg = require('fluent-ffmpeg');
const sharp = require('sharp');
const blake2 = require('blake2');
@@ -418,22 +418,21 @@ async function fetchHttpSource(source, tempFileTarget, hashStream) {
};
}
async function fetchStreamSource(source, tempFileTarget, hashStream) {
const video = youtubeDl(source.stream);
async function fetchStreamSource(source, tempFileTarget, tempFilePath, hashStream) {
const meta = { mimetype: 'video/mp4' };
video.on('info', (info) => {
console.log(info);
logger.verbose(`Starting fetching stream from ${source.stream}`);
});
video.on('end', (info) => {
console.log(info);
logger.verbose(`Finished fetching stream from ${source.stream}`);
});
const video = ffmpeg(source.stream)
.format('mp4')
.outputOptions(['-movflags frag_keyframe+empty_moov'])
.on('start', cmd => logger.verbose(`Fetching stream from ${source.stream} with "${cmd}"`))
.on('error', error => logger.error(`Failed to fetch stream from ${source.stream}: ${error.message}`))
.pipe();
await pipeline(video, hashStream, tempFileTarget);
return { mimetype: null };
logger.verbose(`Finished fetching stream from ${source.stream}`);
return meta;
}
async function fetchSource(source, baseMedia) {
@@ -457,7 +456,7 @@ async function fetchSource(source, baseMedia) {
});
const { mimetype } = source.stream
? await fetchStreamSource(source, tempFileTarget, hashStream)
? await fetchStreamSource(source, tempFileTarget, tempFilePath, hashStream)
: await fetchHttpSource(source, tempFileTarget, hashStream);
hasher.end();