Fix issue with Peacock links

Author: m0ngr31

README.md

@@ -1,4 +1,4 @@
-Current version: **0.1.2**
+Current version: **0.1.3**
 
 # About
 This allows you to fetch EPG data for linear streaming services such as Peacock and ABC, and transforms them so you can use them with [chrome-capture-for-channels](https://github.com/fancybits/chrome-capture-for-channels).

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-epg",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "scripts": {
     "start": "ts-node index.tsx",

package.json

@@ -20,7 +20,7 @@ export const generateM3u = async (): Promise<string> => {
       channel.gracenoteId ? `tvc-guide-stationid="${channel.gracenoteId}"` : ''
     } tvg-id="${channel.number}.ccEPG" channel-number="${channel.number}" tvg-chno="${channel.number}" tvg-name="${
       channel.name
-    }" group-title="ccEPG", ccEPG ${channel.number}`;
+    }" group-title="ccEPG", ${channel.name}`;
     m3uFile = `${m3uFile}\n${prefix}/stream?url=${channel.url}\n`;
   }
 

services/generate-m3u.ts

@@ -7,16 +7,16 @@ import {db} from './database';
 import {miscDbHandler} from './misc-db';
 
 interface IPeacockChannel {
-id: string;
-    gracenoteId: string;
-    scheduleItems: IPeacockEvent[];
-    serviceKey: string;
-    logo: {
-      Default: string;
-    };
-    name: string;
-    type: string;
-    epgNumber: number;
+  id: string;
+  gracenoteId: string;
+  scheduleItems: IPeacockEvent[];
+  serviceKey: string;
+  logo: {
+    Default: string;
+  };
+  name: string;
+  type: string;
+  epgNumber: number;
 }
 
 interface IPeacockRes {
@@ -48,30 +48,37 @@ const parseChannels = async (channels: IPeacockChannel[]): Promise<void> => {
   for (const channel of channels) {
     const channelExists = await db.channels.findOne<IChannel>({id: channel.id});
 
+    const channelData: Partial<IChannel> = {
+      epgNumber: channel.epgNumber,
+      from: 'Peacock',
+      gracenoteId: channel.gracenoteId,
+      id: channel.id,
+      image: channel.logo.Default.replace('{width}', '360').replace('{height}', '270'),
+      name: channel.name,
+      type: channel.type.indexOf('linear') > -1 ? 'linear' : 'vod',
+      url: `https://www.peacocktv.com/watch/playback/live/${channel.serviceKey}`,
+    };
+
     if (!channelExists) {
       console.log('Adding channel: ', channel.name);
 
       const numChannels = await db.channels.count({});
 
-      if (channel.gracenoteId) {
-        console.log('eyy lmao', channel.name, channel.gracenoteId);
-      }
-
       await db.channels.insert<IChannel>({
+        ...channelData,
         enabled: true,
-        epgNumber: channel.epgNumber,
-        from: 'Peacock',
-        gracenoteId: channel.gracenoteId,
-        id: channel.id,
-        image: channel.logo.Default.replace('{width}', '360').replace('{height}', '270'),
-        name: channel.name,
         number: numChannels + 1,
-        type: channel.type.indexOf('linear') > -1 ? 'linear' : 'vod',
-        url: `https://www.peacocktv.com/watch/playback/live/${channel.id}`,
-      });
+      } as IChannel);
+    } else {
+      await db.channels.update<IChannel>(
+        {id: channel.id},
+        {
+          $set: channelData,
+        },
+      );
     }
   }
-}
+};
 
 const parseAirings = async (events: IPeacockAirings): Promise<void> => {
   const now = moment();