From e3553a41818f69fcd451fa95fea8397da93b8427 Mon Sep 17 00:00:00 2001 From: freearhey Date: Sat, 13 Mar 2021 02:34:20 +0300 Subject: [PATCH] wip --- .gh-pages/guides/ontvtonight.com.xml | 122 +++++++++++++-------------- bin/epg-grabber/utils.js | 7 +- 2 files changed, 63 insertions(+), 66 deletions(-) diff --git a/.gh-pages/guides/ontvtonight.com.xml b/.gh-pages/guides/ontvtonight.com.xml index 0a364901..6f09eb69 100644 --- a/.gh-pages/guides/ontvtonight.com.xml +++ b/.gh-pages/guides/ontvtonight.com.xml @@ -1,65 +1,65 @@ BBC One London BBC Two -Weather for the Week Ahead -Joins BBC News -Breakfast -Morning Live -Homes Under the Hammer -Crimewatch Roadshow -Defenders UK -Bargain Hunt -BBC News at One -BBC London News -Moving On -Home Is Where the Art Is -Escape to the Country -Ready Steady Cook -The Bidding Room -Pointless -BBC News at Six -BBC London News -The One Show -A Question of Sport -Masterchef -EastEnders -Gordon Ramsay's Bank Balance -BBC News at Ten -BBC London News -The Graham Norton Show -Fern Brady: Power & Chaos -Celebrity Best Home Cook -Being Bridget Jones -Sailing: America's Cup -This Is BBC TWO -My Unique B&B -Escape to the Country -Antiques Roadshow -Workout the Wright Way -BBC News -BBC News -Bitesize -Bitesize -Bitesize -Further Back in Time for Dinner -Put Your Money Where Your Mouth Is -Put Your Money Where Your Mouth Is -The Best House in Town -Flog It! -Richard Osman's House of Games -My Unique B&B -Match of the Day -River Walks -Gardeners' World -The Comedy Vaults: BBC2's Hidden Treasure -Later Live...With Jools Holland -Newsnight -BBC Weather -Festival of Funny: Shorts -Festival of Funny: Shorts -Festival of Funny: Shorts -Festival of Funny: Shorts -Festival of Funny: Shorts -Festival of Funny: Shorts -Battlestar Galactica +Weather for the Week Ahead +Joins BBC News +Breakfast +Morning Live +Homes Under the Hammer +Crimewatch Roadshow +Defenders UK +Bargain Hunt +BBC News at One +BBC London News +Moving On +Home Is Where the Art Is +Escape to the Country +Ready Steady Cook +The Bidding Room +Pointless +BBC News at Six +BBC London News +The One Show +A Question of Sport +Masterchef +EastEnders +Gordon Ramsay's Bank Balance +BBC News at Ten +BBC London News +The Graham Norton Show +Fern Brady: Power & Chaos +Celebrity Best Home Cook +Being Bridget Jones +Sailing: America's Cup +This Is BBC TWO +My Unique B&B +Escape to the Country +Antiques Roadshow +Workout the Wright Way +BBC News +BBC News +Bitesize +Bitesize +Bitesize +Further Back in Time for Dinner +Put Your Money Where Your Mouth Is +Put Your Money Where Your Mouth Is +The Best House in Town +Flog It! +Richard Osman's House of Games +My Unique B&B +Match of the Day +River Walks +Gardeners' World +The Comedy Vaults: BBC2's Hidden Treasure +Later Live...With Jools Holland +Newsnight +BBC Weather +Festival of Funny: Shorts +Festival of Funny: Shorts +Festival of Funny: Shorts +Festival of Funny: Shorts +Festival of Funny: Shorts +Festival of Funny: Shorts +Battlestar Galactica \ No newline at end of file diff --git a/bin/epg-grabber/utils.js b/bin/epg-grabber/utils.js index 3930dd7a..238fc269 100644 --- a/bin/epg-grabber/utils.js +++ b/bin/epg-grabber/utils.js @@ -7,10 +7,7 @@ const convert = require('xml-js') const glob = require('glob') const dayjs = require('dayjs') const utc = require('dayjs/plugin/utc') -const timezone = require('dayjs/plugin/timezone') dayjs.extend(utc) -dayjs.extend(timezone) -dayjs.tz.setDefault('UTC') axiosCookieJarSupport(axios) const utils = {} @@ -96,8 +93,8 @@ utils.convertToXMLTV = function ({ config, channels, programs }) { const title = this.escapeString(program.title) const description = this.escapeString(program.description) const category = this.escapeString(program.category) - const start = program.start ? dayjs(program.start).format('YYYYMMDDHHmmss ZZ') : '' - const stop = program.stop ? dayjs(program.stop).format('YYYYMMDDHHmmss ZZ') : '' + const start = program.start ? dayjs.utc(program.start).format('YYYYMMDDHHmmss ZZ') : '' + const stop = program.stop ? dayjs.utc(program.stop).format('YYYYMMDDHHmmss ZZ') : '' const lang = program.lang || config.lang if (start && title) {