continue cleaning + simplify mtel.ba (right now broken EPG on backend)

This commit is contained in:
theofficialomega
2025-07-18 23:49:04 +02:00
parent 6b3e17861a
commit 5e953b6955
11 changed files with 95 additions and 53 deletions

View File

@@ -28,7 +28,7 @@ module.exports = {
}
})
return programs.concat().sort(sortBy('start'))
return sortBy(programs, p => p.start.valueOf())
}
}

View File

@@ -1,8 +1,8 @@
const doFetch = require('@ntlab/sfetch')
const axios = require('axios')
const dayjs = require('dayjs')
const _ = require('lodash')
const crypto = require('crypto')
const { sortBy } = require('../../scripts/functions')
// API Configuration Constants
const NATCO_CODE = 'hr'
@@ -86,7 +86,7 @@ module.exports = {
}
})
items = _.sortBy(items, i => dayjs(i.start_time).valueOf())
items = sortBy(items, i => dayjs(i.start_time).valueOf())
// Fetch program details for each item
const programs = []

View File

@@ -1,9 +1,9 @@
const _ = require('lodash')
const doFetch = require('@ntlab/sfetch')
const dayjs = require('dayjs')
const utc = require('dayjs/plugin/utc')
const timezone = require('dayjs/plugin/timezone')
const customParseFormat = require('dayjs/plugin/customParseFormat')
const { sortBy } = require('../../scripts/functions')
dayjs.extend(utc)
dayjs.extend(timezone)
@@ -15,7 +15,7 @@ module.exports = {
url({ channel, date }) {
const [platform] = channel.site_id.split('#')
return `https://mtel.ba/hybris/ecommerce/b2c/v1/products/channels/epg?platform=tv-${platform}&currentPage=0&pageSize=1000&date=${date.format(
return `https://mtel.ba/hybris/ecommerce/b2c/v1/products/channels/epg?platform=tv-${platform}&pageSize=999&date=${date.format(
'YYYY-MM-DD'
)}`
},
@@ -31,7 +31,6 @@ module.exports = {
let programs = []
const items = parseItems(content, channel)
items.forEach(item => {
if (item.title === 'Nema informacija o programu') return
programs.push({
title: item.title,
description: item.description,
@@ -46,14 +45,14 @@ module.exports = {
},
async channels({ platform = 'msat' }) {
const platforms = {
msat: 'https://mtel.ba/hybris/ecommerce/b2c/v1/products/channels/search?pageSize=100&currentPage=<CURRENT_PAGE>&query=:relevantno:tv-kategorija:tv-msat',
iptv: 'https://mtel.ba/hybris/ecommerce/b2c/v1/products/channels/search?pageSize=100&currentPage=<CURRENT_PAGE>&query=:relevantno:tv-kategorija:tv-iptv:tv-iptv-paket:Svi+kanali'
msat: 'https://mtel.ba/hybris/ecommerce/b2c/v1/products/channels/search?pageSize=999&query=:relevantno:tv-kategorija:tv-msat',
iptv: 'https://mtel.ba/hybris/ecommerce/b2c/v1/products/channels/search?pageSize=999&query=:relevantno:tv-kategorija:tv-iptv'
}
const queue = [
{
platform,
url: platforms[platform].replace('<CURRENT_PAGE>', 0)
url: platforms[platform]
}
]
@@ -62,7 +61,7 @@ module.exports = {
if (data && data.pagination.currentPage < data.pagination.totalPages) {
queue.push({
platform: req.platform,
url: platforms[req.platform].replace('<CURRENT_PAGE>', ++data.pagination.currentPage)
url: platforms[req.platform]
})
}
@@ -102,8 +101,9 @@ function parseItems(content, channel) {
const [, channelId] = channel.site_id.split('#')
const channelData = data.products.find(channel => channel.code === channelId)
if (!channelData || !Array.isArray(channelData.programs)) return []
return _.sortBy(channelData.programs, p => parseStart(p).valueOf())
// filter out programs that have the sentence "no program information available"
channelData.programs = channelData.programs.filter(p => !p.title.includes('Nema informacija o programu'))
return sortBy(channelData.programs, p => parseStart(p).valueOf())
} catch {
return []
}

View File

@@ -12,7 +12,7 @@ const channel = { site_id: 'msat#ch-11-rtrs' }
it('can generate valid url', () => {
expect(url({ date, channel })).toBe(
'https://mtel.ba/hybris/ecommerce/b2c/v1/products/channels/epg?platform=tv-msat&currentPage=0&pageSize=1000&date=2025-02-04'
'https://mtel.ba/hybris/ecommerce/b2c/v1/products/channels/epg?platform=tv-msat&pageSize=999&date=2025-02-04'
)
})

View File

@@ -5,7 +5,7 @@ const cheerio = require('cheerio')
const utc = require('dayjs/plugin/utc')
const timezone = require('dayjs/plugin/timezone')
const customParseFormat = require('dayjs/plugin/customParseFormat')
const _ = require('lodash')
const { startCase } = require('../../scripts/functions')
dayjs.extend(utc)
dayjs.extend(timezone)
@@ -164,7 +164,7 @@ function parseDuration($item) {
function parseItems(content, date) {
if (!content) return []
const $ = cheerio.load(content)
const d = _.startCase(date.locale('es').format('DD MMMM YYYY'))
const d = startCase(date.locale('es').format('DD MMMM YYYY'))
return $(`.trProg[title*="${d}"]`).toArray()
}

View File

@@ -29,7 +29,7 @@ module.exports = {
})
})
programs = sortBy(uniqBy(programs, p => p.start), 'start')
programs = sortBy(uniqBy(programs, p => p.start), p => p.start.valueOf())
return programs
},