From bca943f16a657aebf59a17267b7d5be40a959037 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Tue, 25 Jan 2022 18:25:48 +0300 Subject: [PATCH] Upgrade epg-grabber package --- package-lock.json | 14 +++++++------- package.json | 2 +- scripts/commands/create-database.js | 5 ++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec7103ac..86421396 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "commander": "^8.2.0", "csv-parser": "^3.0.0", "dayjs": "^1.10.4", - "epg-grabber": "^0.18.0", + "epg-grabber": "^0.19.0", "epg-parser": "^0.1.6", "form-data": "^4.0.0", "glob": "^7.2.0", @@ -2007,9 +2007,9 @@ } }, "node_modules/epg-grabber": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.18.0.tgz", - "integrity": "sha512-E+aKgjlMxAjGN3YdrJmP57l/NEffGlfi/mb8uy71jqnkcpB9bOpFKae7zM2G5a5v3Lpk7E8L618qkjeI3jCu1g==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.19.0.tgz", + "integrity": "sha512-qXqvhlfT9dqw7L/yo/VaSi4LETCrnQst21YPAqNTmbSsjCeABxF/MfvY5dtJVKf31TfMt0/aK5hPLGmYOsb9mA==", "dependencies": { "axios": "^0.21.1", "axios-cookiejar-support": "^1.0.1", @@ -6426,9 +6426,9 @@ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" }, "epg-grabber": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.18.0.tgz", - "integrity": "sha512-E+aKgjlMxAjGN3YdrJmP57l/NEffGlfi/mb8uy71jqnkcpB9bOpFKae7zM2G5a5v3Lpk7E8L618qkjeI3jCu1g==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.19.0.tgz", + "integrity": "sha512-qXqvhlfT9dqw7L/yo/VaSi4LETCrnQst21YPAqNTmbSsjCeABxF/MfvY5dtJVKf31TfMt0/aK5hPLGmYOsb9mA==", "requires": { "axios": "^0.21.1", "axios-cookiejar-support": "^1.0.1", diff --git a/package.json b/package.json index 17a449ff..02ae9568 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "commander": "^8.2.0", "csv-parser": "^3.0.0", "dayjs": "^1.10.4", - "epg-grabber": "^0.18.0", + "epg-grabber": "^0.19.0", "epg-parser": "^0.1.6", "form-data": "^4.0.0", "glob": "^7.2.0", diff --git a/scripts/commands/create-database.js b/scripts/commands/create-database.js index 61fa785b..edffef29 100644 --- a/scripts/commands/create-database.js +++ b/scripts/commands/create-database.js @@ -32,15 +32,14 @@ async function getChannels() { const files = await file.list(options.channels) for (const filepath of files) { const dir = file.dirname(filepath) - const filename = file.basename(filepath) - const [_, site] = filename.match(/([a-z0-9-.]+)_/i) || [null, null] + const { site, channels: items } = await parser.parseChannels(filepath) if (!site) continue const configPath = `${dir}/${site}.config.js` const config = require(file.resolve(configPath)) if (config.ignore) continue + const filename = file.basename(filepath) const [__, region] = filename.match(/_([a-z-]+)\.channels\.xml/i) || [null, null] const groupId = `${region}/${site}` - const items = await parser.parseChannels(filepath) for (const item of items) { if (!item.site || !item.site_id || !item.xmltv_id || !item.name) continue const key = `${item.site}:${item.site_id}`