Bluemedia/muse
1
0
Fork 0
mirror of https://github.com/BluemediaGER/muse.git synced 2024-09-19 19:15:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix position tracking bug and catch ffmpeg errors

Browse source
This commit is contained in:
Max Isom 2020-03-25 17:32:43 -05:00
parent e1c9f988c3
commit dc70a37e96
2 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/commands/queue.ts
View file

@ -16,7 +16,8 @@ export default class implements Command {
public name = 'queue'; public name = 'queue';
public aliases = ['q']; public aliases = ['q'];
public examples = [ public examples = [
['queue', 'shows current queue'] ['queue', 'shows current queue'],
['queue 2', 'shows second page of queue']
]; ];
private readonly playerManager: PlayerManager; private readonly playerManager: PlayerManager;

47
src/services/player.ts
View file

@ -180,6 +180,8 @@ export default class {
manualForward(): void { manualForward(): void {
if (this.queuePosition < this.queue.length) { if (this.queuePosition < this.queue.length) {
this.queuePosition++; this.queuePosition++;
this.positionInSeconds = 0;
this.stopTrackingPosition();
} else { } else {
throw new Error('No songs in queue to forward to.'); throw new Error('No songs in queue to forward to.');
} }
@ -189,6 +191,7 @@ export default class {
if (this.queuePosition - 1 >= 0) { if (this.queuePosition - 1 >= 0) {
this.queuePosition--; this.queuePosition--;
this.positionInSeconds = 0; this.positionInSeconds = 0;
this.stopTrackingPosition();
if (this.status !== STATUS.PAUSED) { if (this.status !== STATUS.PAUSED) {
await this.play(); await this.play();
@ -286,7 +289,7 @@ export default class {
const cachedPath = this.getCachedPath(url); const cachedPath = this.getCachedPath(url);
let ffmpegInput = ''; let ffmpegInput = '';
const ffmpegInputOptions = []; const ffmpegInputOptions: string[] = [];
let shouldCacheVideo = false; let shouldCacheVideo = false;
if (await this.isCached(url)) { if (await this.isCached(url)) {
@ -345,25 +348,41 @@ export default class {
} }
// Create stream and pipe to capacitor // Create stream and pipe to capacitor
const youtubeStream = ffmpeg(ffmpegInput).inputOptions(ffmpegInputOptions).noVideo().audioCodec('libopus').outputFormat('webm').pipe() as PassThrough; return new Promise((resolve, reject) => {
const youtubeStream = ffmpeg(ffmpegInput)
.inputOptions(ffmpegInputOptions)
.noVideo()
.audioCodec('libopus')
.outputFormat('webm')
.on('error', error => {
console.error(error);
reject(error);
})
.pipe() as PassThrough;
const capacitor = new WriteStream(); const capacitor = new WriteStream();
youtubeStream.pipe(capacitor); youtubeStream.pipe(capacitor);
// Cache video if necessary // Cache video if necessary
if (shouldCacheVideo) { if (shouldCacheVideo) {
const cacheTempPath = this.getCachedPathTemp(url); const cacheTempPath = this.getCachedPathTemp(url);
const cacheStream = createWriteStream(cacheTempPath); const cacheStream = createWriteStream(cacheTempPath);
cacheStream.on('finish', async () => { cacheStream.on('finish', async () => {
await fs.rename(cacheTempPath, cachedPath); // Only move if size is non-zero (may have errored out)
}); const stats = await fs.stat(cacheTempPath);
capacitor.createReadStream().pipe(cacheStream); if (stats.size !== 0) {
} await fs.rename(cacheTempPath, cachedPath);
}
});
return capacitor.createReadStream(); capacitor.createReadStream().pipe(cacheStream);
}
resolve(capacitor.createReadStream());
});
} }
private startTrackingPosition(initalPosition?: number): void { private startTrackingPosition(initalPosition?: number): void {