- {{ epgProgram?.title[0]?.value }} | {{ channel.name }}
+ {{ epgProgram?.title }} | {{ channel.name }}
- {{ epgProgram?.desc[0]?.value }}
+ {{ epgProgram?.desc }}
- @if (item.icon[0]) {
+ @if (item.icon) {
}
@@ -99,7 +99,7 @@
@@ -118,7 +118,7 @@
[attr.x]="program.startPosition"
>
diff --git a/src/app/player/components/multi-epg/multi-epg-container.component.scss b/src/app/player/components/multi-epg/multi-epg-container.component.scss
index 17e51e4a6..e787f143a 100644
--- a/src/app/player/components/multi-epg/multi-epg-container.component.scss
+++ b/src/app/player/components/multi-epg/multi-epg-container.component.scss
@@ -28,7 +28,7 @@ rect {
#epg-container {
width: calc(100vw - 100px);
- height: calc(100vh - 73px);
+ height: calc(100vh - 42px);
overflow-x: scroll;
overflow-y: hidden;
}
@@ -53,7 +53,6 @@ rect {
#epg-navigation {
display: flex;
background-color: white;
- margin-top: 30px;
border-bottom: 2px solid #fff;
align-items: center;
}
diff --git a/src/app/player/components/video-player/toolbar/toolbar.component.html b/src/app/player/components/video-player/toolbar/toolbar.component.html
index 937ce8b4b..4ba9644bf 100644
--- a/src/app/player/components/video-player/toolbar/toolbar.component.html
+++ b/src/app/player/components/video-player/toolbar/toolbar.component.html
@@ -23,7 +23,8 @@
{{ activeChannel?.name }}
-
+ @let isEpgAvailable = isEpgAvailable$ | async;
+ @if (isEpgAvailable) {
-
+ }
diff --git a/src/app/player/components/video-player/video-player.component.html b/src/app/player/components/video-player/video-player.component.html
index 327a10371..8bbc053e6 100644
--- a/src/app/player/components/video-player/video-player.component.html
+++ b/src/app/player/components/video-player/video-player.component.html
@@ -90,6 +90,6 @@
-
diff --git a/src/app/player/components/video-player/video-player.component.ts b/src/app/player/components/video-player/video-player.component.ts
index 482869683..19da38575 100644
--- a/src/app/player/components/video-player/video-player.component.ts
+++ b/src/app/player/components/video-player/video-player.component.ts
@@ -118,7 +118,7 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
listeners = [];
- isElectron = this.dataService.isElectron;
+ isTauri = this.dataService.getAppEnvironment() === 'tauri';
sidebarView: SidebarView = 'CHANNELS';
@@ -210,7 +210,7 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
*/
setRendererListeners(): void {
this.commandsList.forEach((command) => {
- if (this.isElectron) {
+ if (this.isTauri) {
this.dataService.listenOn(command.id, (event, response) =>
this.ngZone.run(() => command.execute(response))
);
@@ -243,7 +243,7 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
}
ngOnDestroy() {
- if (this.isElectron) {
+ if (this.isTauri) {
this.dataService.removeAllListeners(PLAYLIST_PARSE_RESPONSE);
} else {
this.listeners.forEach((listener) =>
diff --git a/src/app/player/models/epg-channel.model.ts b/src/app/player/models/epg-channel.model.ts
index 1f3fbcb28..f0c47e4d1 100644
--- a/src/app/player/models/epg-channel.model.ts
+++ b/src/app/player/models/epg-channel.model.ts
@@ -1,6 +1,6 @@
export interface EpgChannel {
id: string;
- name: { lang: string; value: string }[];
+ name: string;
icon: string[];
url: string[];
}
diff --git a/src/app/services/epg.service.ts b/src/app/services/epg.service.ts
index a4b0c6d45..1164c2d7e 100644
--- a/src/app/services/epg.service.ts
+++ b/src/app/services/epg.service.ts
@@ -1,66 +1,125 @@
import { Injectable } from '@angular/core';
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import { MatSnackBar } from '@angular/material/snack-bar';
import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core';
-import { EPG_FETCH } from '../../../shared/ipc-commands';
-import { setEpgAvailableFlag } from '../state/actions';
-import { DataService } from './data.service';
+import { invoke } from '@tauri-apps/api/core';
+import { BehaviorSubject, from } from 'rxjs';
+import { catchError, map, tap } from 'rxjs/operators';
+import { EpgProgram } from '../player/models/epg-program.model';
+import * as PlaylistActions from '../state/actions';
@Injectable({
providedIn: 'root',
})
export class EpgService {
- /** Default options for epg snackbar notifications */
- epgSnackBarOptions: MatSnackBarConfig = {
- verticalPosition: 'bottom',
- horizontalPosition: 'start',
- };
+ private epgAvailable = new BehaviorSubject(false);
+ private currentEpgPrograms = new BehaviorSubject([]);
+
+ epgAvailable$ = this.epgAvailable.asObservable();
+ currentEpgPrograms$ = this.currentEpgPrograms.asObservable();
constructor(
- private store: Store,
- private electronService: DataService,
private snackBar: MatSnackBar,
- private translate: TranslateService
+ private translate: TranslateService,
+ private store: Store
) {}
/**
- * Fetches and updates EPG from the given sources
- * @param urls epg source urls
+ * Fetches EPG from the given URLs
*/
- fetchEpg(urls: string | string[]) {
- const urlsArray = Array.isArray(urls) ? urls : [urls];
- urlsArray.forEach((url) =>
- this.electronService.sendIpcEvent(EPG_FETCH, {
- url,
- })
- );
+ fetchEpg(urls: string[]): void {
this.showFetchSnackbar();
+
+ // Filter out empty URLs and send all URLs at once
+ const validUrls = urls.filter((url) => url?.trim());
+ if (validUrls.length === 0) return;
+
+ from(invoke('fetch_epg', { url: validUrls }))
+ .pipe(
+ tap(() => {
+ this.epgAvailable.next(true);
+ this.showSuccessSnackbar();
+ }),
+ catchError((err) => {
+ console.error('EPG fetch error:', err);
+ this.epgAvailable.next(false);
+ this.showErrorSnackbar();
+ throw err;
+ })
+ )
+ .subscribe();
}
- showFetchSnackbar() {
- this.snackBar.open(
- this.translate.instant('EPG.FETCH_EPG'),
- this.translate.instant('CLOSE'),
- this.epgSnackBarOptions
- );
+ /**
+ * Gets EPG programs for a specific channel
+ */
+ getChannelPrograms(channelId: string): void {
+ console.log('Fetching EPG for channel ID:', channelId);
+ from(invoke('get_channel_programs', { channelId }))
+ .pipe(
+ tap((programs) => {
+ console.log('Received programs:', programs);
+ }),
+ map((programs) =>
+ programs.map((program) => ({
+ ...program,
+ start: new Date(program.start).toISOString(),
+ stop: new Date(program.stop).toISOString(),
+ }))
+ ),
+ catchError((err) => {
+ console.error('EPG get programs error:', err);
+ this.showErrorSnackbar();
+ this.currentEpgPrograms.next([]);
+ throw err;
+ })
+ )
+ .subscribe((programs) => {
+ if (programs.length === 0) {
+ this.store.dispatch(
+ PlaylistActions.setEpgAvailableFlag({ value: false })
+ );
+ } else {
+ this.store.dispatch(
+ PlaylistActions.setEpgAvailableFlag({ value: true })
+ );
+ }
+ this.currentEpgPrograms.next(programs);
+ console.log('Updated programs:', programs); // Debug log
+ });
+ }
+
+ /**
+ * Shows fetch in progress snackbar
+ */
+ showFetchSnackbar(): void {
+ this.snackBar.open(this.translate.instant('EPG.FETCH_EPG'), null, {
+ duration: 2000,
+ horizontalPosition: 'start',
+ });
+ }
+
+ /**
+ * Shows success snackbar
+ */
+ private showSuccessSnackbar(): void {
+ this.snackBar.open(this.translate.instant('EPG.FETCH_SUCCESS'), null, {
+ duration: 2000,
+ horizontalPosition: 'start',
+ });
}
- onEpgFetchDone() {
- this.store.dispatch(setEpgAvailableFlag({ value: true }));
+ /**
+ * Shows error snackbar
+ */
+ private showErrorSnackbar(): void {
this.snackBar.open(
- this.translate.instant('EPG.DOWNLOAD_SUCCESS'),
- null,
+ this.translate.instant('EPG.ERROR'),
+ this.translate.instant('CLOSE'),
{
- ...this.epgSnackBarOptions,
duration: 2000,
+ horizontalPosition: 'start',
}
);
}
-
- onEpgError() {
- this.snackBar.open(this.translate.instant('EPG.ERROR'), null, {
- ...this.epgSnackBarOptions,
- duration: 2000,
- });
- }
}
diff --git a/src/app/services/tauri.service.ts b/src/app/services/tauri.service.ts
index 8727e1734..e83f28725 100644
--- a/src/app/services/tauri.service.ts
+++ b/src/app/services/tauri.service.ts
@@ -3,6 +3,7 @@ import { invoke } from '@tauri-apps/api/core';
import { fetch } from '@tauri-apps/plugin-http';
import { parse } from 'iptv-playlist-parser';
import {
+ EPG_GET_PROGRAM_DONE,
ERROR,
PLAYLIST_PARSE_BY_URL,
PLAYLIST_PARSE_RESPONSE,
@@ -66,6 +67,11 @@ export class TauriService extends DataService {
});
throw error;
});
+ } else if (type === 'EPG_FETCH_DONE') {
+ window.postMessage({
+ type: EPG_GET_PROGRAM_DONE,
+ payload,
+ });
} else {
console.log('Unknown type', type);
}
@@ -184,7 +190,10 @@ export class TauriService extends DataService {
}
removeAllListeners(type: string): void {
- throw new Error('Method not implemented.');
+ console.error(
+ 'Method not implemented. Following type was provided:',
+ type
+ );
}
listenOn(command: string, callback: (...args: any[]) => void): void {
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index 79c3a0ab5..842b07155 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -9,7 +9,7 @@
- {{ item.name[0].value }}
+ {{ item.name }}