From 68dd17e4fc39b1a183560a1348eb88b2ae56b8f6 Mon Sep 17 00:00:00 2001 From: 4gray Date: Fri, 8 Dec 2023 21:01:26 +0100 Subject: [PATCH] test: update mock data --- .../html-video-player.component.spec.ts | 3 +++ .../html-video-player.component.ts | 18 ++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/app/player/components/html-video-player/html-video-player.component.spec.ts b/src/app/player/components/html-video-player/html-video-player.component.spec.ts index 29720b288..21a16d12b 100644 --- a/src/app/player/components/html-video-player/html-video-player.component.spec.ts +++ b/src/app/player/components/html-video-player/html-video-player.component.spec.ts @@ -16,6 +16,9 @@ describe('HtmlVideoPlayerComponent', () => { group: { title: 'News group', }, + http: { + 'user-agent': 'localhost', + }, }; beforeEach(waitForAsync(() => { diff --git a/src/app/player/components/html-video-player/html-video-player.component.ts b/src/app/player/components/html-video-player/html-video-player.component.ts index 643bbecdb..3a55d43e6 100644 --- a/src/app/player/components/html-video-player/html-video-player.component.ts +++ b/src/app/player/components/html-video-player/html-video-player.component.ts @@ -9,9 +9,9 @@ import { } from '@angular/core'; import Hls from 'hls.js'; import { Channel } from '../../../../../shared/channel.interface'; +import { CHANNEL_SET_USER_AGENT } from '../../../../../shared/ipc-commands'; import { getExtensionFromUrl } from '../../../../../shared/playlist.utils'; import { DataService } from '../../../services/data.service'; -import { CHANNEL_SET_USER_AGENT } from '../../../../../shared/ipc-commands'; /** * This component contains the implementation of HTML5 based video player @@ -26,7 +26,7 @@ export class HtmlVideoPlayerComponent implements OnChanges, OnDestroy { /** Channel to play */ @Input() channel: Channel; dataService: DataService; // Declare the dataService property - + constructor(dataService: DataService) { this.dataService = dataService; // Inject the DataService } @@ -60,6 +60,11 @@ export class HtmlVideoPlayerComponent implements OnChanges, OnDestroy { if (channel.url) { const url = channel.url + (channel.epgParams ?? ''); const extension = getExtensionFromUrl(channel.url); + this.dataService.sendIpcEvent(CHANNEL_SET_USER_AGENT, { + userAgent: channel.http['user-agent'], + referer: channel.http.referrer, + }); + if ( extension !== 'mp4' && extension !== 'mpv' && @@ -70,10 +75,7 @@ export class HtmlVideoPlayerComponent implements OnChanges, OnDestroy { this.hls = new Hls(); this.hls.attachMedia(this.videoPlayer.nativeElement); this.hls.loadSource(url); - this.dataService.sendIpcEvent(CHANNEL_SET_USER_AGENT, { - userAgent: channel.http['user-agent'], - referer: channel.http.referrer, - }); + this.handlePlayOperation(); } else { console.error('something wrong with hls.js init...'); @@ -82,10 +84,6 @@ export class HtmlVideoPlayerComponent implements OnChanges, OnDestroy { url, 'video/mp4' ); - this.dataService.sendIpcEvent(CHANNEL_SET_USER_AGENT, { - userAgent: channel.http['user-agent'], - referer: channel.http.referrer, - }); this.videoPlayer.nativeElement.play(); } }