iptv-org/epg
1
0
Fork 0
mirror of https://github.com/iptv-org/epg synced 2025-12-17 10:56:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2078 from iptv-org/fix-tv.mail.ru

Browse Source 
Fix tv.mail.ru
This commit is contained in:
PopeyeTheSai10r
2023-06-08 00:16:13 -07:00
committed by GitHub
parent 5d6ea2442d 8083b4881d
commit 3efe1d2dd2
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sites/tv.mail.ru/tv.mail.ru.config.js
View File

@@ -1,11 +1,4 @@
const dayjs = require('dayjs') const { DateTime } = require('luxon')
const utc = require('dayjs/plugin/utc')
const timezone = require('dayjs/plugin/timezone')
const customParseFormat = require('dayjs/plugin/customParseFormat')
dayjs.extend(utc)
dayjs.extend(timezone)
dayjs.extend(customParseFormat)
module.exports = { module.exports = {
site: 'tv.mail.ru', site: 'tv.mail.ru',
@@ -22,13 +15,13 @@ module.exports = {
const prev = programs[programs.length - 1] const prev = programs[programs.length - 1]
let start = parseStart(item, date) let start = parseStart(item, date)
if (prev) { if (prev) {
if (start.isBefore(prev.start)) { if (start < prev.start) {
start = start.add(1, 'd') start = start.plus({ days: 1 })
date = date.add(1, 'd') date = date.add(1, 'd')
} }
prev.stop = start prev.stop = start
} }
const stop = start.add(1, 'h') const stop = start.plus({ hours: 1 })
programs.push({ programs.push({
title: item.name, title: item.name,
category: parseCategory(item), category: parseCategory(item),
@@ -44,7 +37,7 @@ module.exports = {
function parseStart(item, date) { function parseStart(item, date) {
const dateString = `${date.format('YYYY-MM-DD')} ${item.start}` const dateString = `${date.format('YYYY-MM-DD')} ${item.start}`
return dayjs.tz(dateString, 'YYYY-MM-DD HH:mm', 'Europe/Moscow') return DateTime.fromFormat(dateString, 'yyyy-MM-dd HH:mm', { zone: 'Europe/Moscow' }).toUTC()
} }
function parseCategory(item) { function parseCategory(item) {

2
sites/tv.mail.ru/tv.mail.ru.test.js
View File

@@ -1,4 +1,4 @@
// npx epg-grabber --config=sites/tv.mail.ru/tv.mail.ru.config.js --channels=sites/tv.mail.ru/tv.mail.ru.channels.xml --output=guide.xml --days=2 // npx epg-grabber --config=sites/tv.mail.ru/tv.mail.ru.config.js --channels=sites/tv.mail.ru/tv.mail.ru.channels.xml --output=guide.xml
const { parser, url } = require('./tv.mail.ru.config.js') const { parser, url } = require('./tv.mail.ru.config.js')
const dayjs = require('dayjs') const dayjs = require('dayjs')