fix(epg): check lower case, log error

jwplayer · Jan 15, 2024 · be774d4 · be774d4
1 parent 43c487c
commit be774d4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -42,7 +42,7 @@ export const CONTENT_TYPE = {
   // Page with a list of channels
   live: 'live',
   // Separate channel page
-  liveChannel: 'liveChannel',
+  liveChannel: 'livechannel',
   // Static page with markdown
   page: 'page',
   // Page with shelves list
@@ -75,6 +75,6 @@ export const DEFAULT_FEATURES = {
 };
 
 export const EPG_TYPE = {
-  JWP: 'JWP',
-  VIEW_NEXA: 'VIEW_NEXA',
+  jwp: 'jwp',
+  viewNexa: 'viewnexa',
 } as const;
diff --git a/src/modules/register.ts b/src/modules/register.ts
@@ -67,8 +67,8 @@ container.bind('INTEGRATION_TYPE').toDynamicValue((context) => {
 });
 
 // EPG services
-container.bind(EpgService).to(JWEpgService).whenTargetNamed(EPG_TYPE.JWP);
-container.bind(EpgService).to(ViewNexaEpgService).whenTargetNamed(EPG_TYPE.VIEW_NEXA);
+container.bind(EpgService).to(JWEpgService).whenTargetNamed(EPG_TYPE.jwp);
+container.bind(EpgService).to(ViewNexaEpgService).whenTargetNamed(EPG_TYPE.viewNexa);
 
 // Cleeng integration
 container.bind(CleengService).toSelf();

diff --git a/src/services/epg/viewNexa.epg.service.test.ts b/src/services/epg/viewNexa.epg.service.test.ts
@@ -28,15 +28,15 @@ describe('ViewNexaEpgService', () => {
 
   test('fetchSchedule performs a request', async () => {
     const mock = mockGet('/epg/viewNexaChannel.xml').willResolveOnce([]);
-    const data = await epgService.fetchSchedule({ ...livePlaylist.playlist[0], scheduleUrl: '/epg/viewNexaChannel.xml', scheduleType: EPG_TYPE.VIEW_NEXA });
+    const data = await epgService.fetchSchedule({ ...livePlaylist.playlist[0], scheduleUrl: '/epg/viewNexaChannel.xml', scheduleType: EPG_TYPE.viewNexa });
 
     expect(mock).toHaveFetched();
     expect(data).toEqual([]);
   });
 
   test('fetchSchedule parses xml content', async () => {
     const mock = mockGet('/epg/viewNexaChannel.xml').willResolveOnce(viewNexaChannel);
-    const data = await epgService.fetchSchedule({ ...livePlaylist.playlist[0], scheduleUrl: '/epg/viewNexaChannel.xml', scheduleType: EPG_TYPE.VIEW_NEXA });
+    const data = await epgService.fetchSchedule({ ...livePlaylist.playlist[0], scheduleUrl: '/epg/viewNexaChannel.xml', scheduleType: EPG_TYPE.viewNexa });
 
     expect(mock).toHaveFetched();
     expect(data[0]).toEqual({

diff --git a/src/stores/EpgController.ts b/src/stores/EpgController.ts
@@ -95,11 +95,11 @@ export default class EpgController {
   };
 
   getEpgService = (item: PlaylistItem) => {
-    const scheduleType = item?.scheduleType || EPG_TYPE.JWP;
-    const service = getNamedModule(EpgService, scheduleType);
+    const scheduleType = item?.scheduleType || EPG_TYPE.jwp;
+    const service = getNamedModule(EpgService, scheduleType?.toLowerCase());
 
     if (!service) {
-      throw Error(`No epg service was added for the ${scheduleType} schedule type`);
+      console.error(`No epg service was added for the ${scheduleType} schedule type`);
     }
 
     return service;

diff --git a/test/fixtures/livePlaylist.json b/test/fixtures/livePlaylist.json
@@ -50,7 +50,7 @@
       "pubdate": 1615480440,
       "description": "A 24x7 airing of long films released by Blender Open Movie Project, including Elephants Dream, Big Buck Bunny, Sintel, Tears Of Steel, and Cosmos Laundromat.",
       "tags": "live",
-      "scheduleType": "JWP",
+      "scheduleType": "jwp",
       "scheduleUrl": "/epg/jwChannel.json",
       "catchupHours": "7",
       "sources": [
@@ -104,7 +104,7 @@
       "pubdate": 1615480440,
       "description": "A 24x7 airing of long films released by Blender Open Movie Project, including Elephants Dream, Big Buck Bunny, Sintel, Tears Of Steel, and Cosmos Laundromat.",
       "tags": "live",
-      "scheduleType": "JW",
+      "scheduleType": "jwp",
       "scheduleUrl": "/epg/jwChannel.json",
       "sources": [
         {
@@ -157,7 +157,7 @@
       "pubdate": 1615480440,
       "description": "A 24x7 airing of long films released by Blender Open Movie Project, including Elephants Dream, Big Buck Bunny, Sintel, Tears Of Steel, and Cosmos Laundromat.",
       "tags": "live",
-      "scheduleType": "JW",
+      "scheduleType": "jwp",
       "scheduleUrl": "/epg/does-not-exist.json",
       "sources": [
         {
@@ -210,7 +210,7 @@
       "pubdate": 1615480440,
       "description": "A 24x7 airing of long films released by Blender Open Movie Project, including Elephants Dream, Big Buck Bunny, Sintel, Tears Of Steel, and Cosmos Laundromat.",
       "tags": "live",
-      "scheduleType": "JW",
+      "scheduleType": "jwp",
       "scheduleUrl": "/epg/network-error.json",
       "sources": [
         {