fix(epg): improve error handling

This commit is contained in:
4gray committed 2024-03-16 12:36:39 +01:00
1 parent 00bc683f65
commit 6768efe4de
2 files changed
+31 -30

No files matched your search

+27 -29
View File
@@ -36,34 +36,32 @@ describe('AppComponent', () => {
let whatsNewService: WhatsNewService;
const defaultLanguage = 'en';
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [AppComponent, MockPipe(TranslatePipe)],
providers: [
{ provide: WhatsNewService, useClass: WhatsNewServiceStub },
MockProviders(
TranslateService,
PlaylistsService,
NgxIndexedDBService,
MatSnackBar
),
SettingsService,
{
provide: DataService,
useClass: ElectronServiceStub,
},
provideMockStore(),
],
imports: [
MockModule(MatSnackBarModule),
MockModule(NgxWhatsNewModule),
RouterTestingModule,
HttpClientTestingModule,
],
}).compileComponents();
})
);
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [AppComponent, MockPipe(TranslatePipe)],
providers: [
{ provide: WhatsNewService, useClass: WhatsNewServiceStub },
MockProviders(
TranslateService,
PlaylistsService,
NgxIndexedDBService,
MatSnackBar
),
SettingsService,
{
provide: DataService,
useClass: ElectronServiceStub,
},
provideMockStore(),
],
imports: [
MockModule(MatSnackBarModule),
MockModule(NgxWhatsNewModule),
RouterTestingModule,
HttpClientTestingModule,
],
}).compileComponents();
}));
beforeEach(() => {
electronService = TestBed.inject(DataService);
@@ -203,7 +201,7 @@ describe('AppComponent', () => {
describe('Set initial settings', () => {
const theme = Theme.DarkTheme;
const language = 'es';
const epgUrl = 'http://localhost/epg.xml';
const epgUrl = ['http://localhost/epg.xml'];
beforeEach(() => {
jest.spyOn(electronService, 'sendIpcEvent');
+4 -1
View File
@@ -149,7 +149,10 @@ export class AppComponent {
.subscribe((settings: Settings) => {
if (settings && Object.keys(settings).length > 0) {
this.translate.use(settings.language ?? this.DEFAULT_LANG);
if (settings.epgUrl) {
if (
settings.epgUrl?.length > 0 &&
settings.epgUrl?.some((u) => u !== '')
) {
this.epgService.fetchEpg(settings.epgUrl);
}