diff --git a/sites/dishtv.in/dishtv.in.channels.xml b/sites/dishtv.in/dishtv.in.channels.xml index 1be1562c..22f93099 100644 --- a/sites/dishtv.in/dishtv.in.channels.xml +++ b/sites/dishtv.in/dishtv.in.channels.xml @@ -1,338 +1,330 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 Sports + + 1Sport 9X Jhakaas - 9XM + 9X M 9X Tashan Aaj Tak - Aakaash Aath - Aastha India - Aastha Bhajan + Aakash Aath + AASTHA ABP Ananda - ABP Asmita - ABP Ganga ABP Majha - ABP News India + ABP News ABZY COOL - Alankar TV - Aljazeera English + Alankar + Al jazeera &FLIX - &Pictures - & privé HD + &Prive HD &Tv - Animal Planet India - Argus News - Arihant TV - Asianet - Asianet News - Assam Talks - B4U Bhojpuri - B4U Kadak - B4U Movies India - B4U Music India - Baby TV Asia - Balle Balle - BBC World News South Asia - Bflix Movies - Bhojpuri Cinema + ARGUS + Dharm Sandesh + Assam Talk + B4U BHOJPURI + B4U KADAK + B4U Movies + B4u Music + BALLE BALLE + BBC World News Big Ganga Big Magic - Bindass - Box Cinema - Cartoon Network India - Channel Divya - Channel WIN - Chardikla Time TV - Cinema TV - CNBC Awaaz + Cartoon Network + Divya TV + CHARDIKLA TIME TV + CINEMA TV INDIA + CNBC AWAAZ CNBC Bajar - CNBC TV18 - CNN International South Asia - CNN News 18 + CNN INTL + CNN NEWS 18 Colors Colors Bangla Colors Bangla Cinema COLORS CINEPLEX - Colors Cineplex Bollywood Colors Gujarati - Colors Gujarati Cinema + COLORS GUJARATI CINEMA Colors Infinity Colors Marathi - Colors Odia - Colors Rishtey Asia + Colors Oriya + COLORS RISHTEY Comedy Central - CTVN AKD Plus - Dangal TV - DD Arun Prabha - DD Assam + CTVN-AKD-PLUS + DD ARUNPRABHA + DD ASSAM DD Bangla DD Bharati DD Bihar DD Chandana - DD Chhattisgarh DD Girnar - DD Himachal Pradesh - DD Hissar - DD India - DD Jharkhand - DD Kashir - DD Kisan - DD Madhya Pradesh + DD HISAR + DD INDIA + DD KASHIR + DD KISAN + DD MP DD Malayalam - DD Manipur - DD Meghalaya - DD Mizoram - DD Nagaland DD National DD News - DD Odia + DD Oriya DD Podhigai - DD Punjabi - DD Rajasthan - DD Retro + DD PUNJABI + DD RAJASTHAN DD Sahyadri DD Saptagiri - DD Sports - DD Tripura - DD Urdu - DD Uttarakhand - DD Uttar Pradesh - DD Yadagiri - Dhinchaak - Dhinchaak 2 + DD URDU + DD UP + DD YADAGIRI + Goldmines Dhoom Music - Digi Shala - Discovery Channel India - Discovery Kids India + Discovery + Discovery Kids Discovery Science - Discovery Turbo India + Discovery Turbo + BUZZ SD 2 Dish Buzz - Dish Buzz 2 - Disney Channel India - Disney International HD - Disney Junior India - Dr Shuddhi - DY 36 - ENTER 10 BANGLA - Enterr10 Movies - Epic TV + Disney Channel + DISNEY INTERNATIONAL HD + Disney Jr. + DY 365 + Epic ET Now ET NOW SWADESH ETV Telugu - Eurosport India - E-Vidya 6 - EZMall - Fakt Marathi - Filamchi - Flowers TV + Ezmall + FAKT MARATHI + FILAMCHI BHOJPURI Fox life - Gemini TV GOOD NEWS TODAY - Gubbare + GUBBARE GULISTAN NEWS - Gyandarshan - Hare Krsna TV + HARE KRSNAHARE KRSNA History tv 18 - Hungama TV + Hungama tv IBC 24 - ILove India News - India News Haryana - India News Uttar Pradesh - India Today - India TV - Indradhanu - Investigation Discovery India - Ishara TV + INDIA NEWS HARYANA + INDIA TODAY + INDIA TV + INDRADHANU + INVESTIGATION DISCOVERY + ISHARA TV ISHWAR BHAKTI' Jalsha Movies - Jinvani Channel - Jonack - Jyotish Duniya - Kalinga TV - Kanak News - KBS World - Khushboo TV Bangla + JINVANI + JONACK TV + KANAK NEWS + Khusboo Bangla Kolkata TV - Lok Sabha TV - Lokshahi News - Maiboli - Manjari TV - Manoranjan Grand + SANSAD TV SD + LOKSHAHI + Mailboli + MANORANJAN GRAND Manoranjan Movies Manoranjan TV - Marvel HQ + SUPER HUNGAMA Mastiii - Mazhavil Manorama MBC TV - Mh 1 Music - Mirror Now + MH1 + MIRROR NOW MNX - Movie Plus + NEWS INDIA 24X7 Movies Now - Movies Now + + MN+ HD + MTV MTV Beats - MTV India Music India - Naaptol Tamil - Nandighosha TV + NAAPTOL + NANDIGHOSHA TV National Geographic Channel National Geographic Wild Naxatra News - NDTV 24x7 + NDTV 24X7 NDTV India - Nepal 1 - News 18 Assam & North-East - News 18 Bengali - News 18 Bihar & Jharkhand - News 18 Gujarati - News 18 India - News 18 Lokmat - News 18 Madhya Pradesh & Chhattisgarh - News 18 Odia - News 18 Punjab & Haryana & Himachal Pradesh - News 18 Rajasthan - News 18 Urdu - News 18 Uttar Pradesh & Uttarakhand - News 24 - News Daily 24 - News India 24x7 + Nepal One + News18 Assam North East + News18 Bangla + News18 Bihar/Jharkhand + News18 Gujarati + News18 India + News18 Lokmat + News18 Madhya Pradesh/Chhattisgarh + News18 Oriya + News18 Rajasthan + NEWS18 JK/HIMACHAL + NEWS24 THINK FIRST News Live News Nation - News State UP & UK - NewsTime Bangla + NEWS STATE UP/UK + News Time News X - Nickelodeon India - Sonic Nickelodeon + Nickelodeon + Sonic Nick HD+ - Nick Jr India NK TV24X7 NORTH EAST LIVE - Odisha TV - Paras Gold - Peace of Mind TV - Pitaara + OTV + Paras Gold One + PEACE OF MIND + PITAARA TV Pogo - Prag News - Prameya News 7 + PRAG TV + Prameya News7 Prarthana TV Pratidin Time Ptc Chakde - PTC Music + PTC MUSIC PTC News PTC Punjabi - PTC Punjabi Gold - PTC Simran - Punjabi Hits - Rajya Sabha TV + PTC PUNJABI GOLD + PTC SIMRAN + PUNJABI HITS RAMDHENU Rang - Rengoni - Republic Bangla - Republic Bharat - Republic TV - Rishtey Cineplex - Romedy Now - Rongeen TV - R Plus - RT News - Rupasi Bangla - Saam TV - Sadhna TV + RENGONI TV + R. BANGLA + REPUBLIC TV + COLORS CINEPLEX SUPERHITS + RONGEEN TV + Russia Today + RUPASI BANGLA + SAAM TV + SADHNA TV Sandesh News Sangeet Bangla - Sangeet Bhojpuri - SANSAD TV HD - Sanskar TV - Santvani Channel - Satsang TV - Shemaroo Marathi Bana + SANGEET BHOJPURI + SANSKAR + SANT WANI + Satsang + SHEMAROO MARATHIBANA Shemaroo TV SHOWBOX - Shubh TV + Shubh Tv SIDHARTH BHAKTI - Songdew TV + SONGDEW Sony Aath Sony BBC Earth - SET India + SONY ENTERTAINMENT TELEVISION HD Sony Marathi - Sony Max 2 - Sony Pal + SONY MAX 2 + SONY PAL SONY PIX SONY SAB SONY SPORTS TEN 1 SONY SPORTS TEN 2 SONY SPORTS TEN 3 SONY SPORTS TEN 5 - Sony Wah - Sony Yay! + SONY WAH + SONY YAY SPORTS18 1 STAR BHARAT - Star Gold Star Gold 2 + Star Gold STAR GOLD SELECT Star Jalsha - Star Maa - Star Maa Movies + STAR Maa Star Movies STAR MOVIES SELECT Star Plus @@ -340,80 +332,32 @@ Star Sports 1 STAR SPORTS 1 HINDI Star sports 2 - Star Sports 3 - Star Sports First + STAR SPORTS 3 + STAR SPORTS FIRST STAR SPORTS SELECT 1 STAR SPORTS SELECT 2 - Star Utsav - Star Utsav Movies - Star World HD India - Star World Premiere HD - Sudarshan News - Sun Bangla + STAR UTSAV + STAR UTSAV Movies + SUDARSHAN NEWS + SUN BANGLA SUN MARATHI - Sun TV - Surya TV - SWADESH NEWS - Swayam Prabha 1 - Swayam Prabha 10 - Swayam Prabha 11 - Swayam Prabha 12 - Swayam Prabha 13 - Swayam Prabha 14 - Swayam Prabha 15 - Swayam Prabha 16 - Swayam Prabha 17 - Swayam Prabha 18 - Swayam Prabha 19 - Swayam Prabha 2 - Swayam Prabha 20 - Swayam Prabha 21 - Swayam Prabha 22 - Swayam Prabha 3 - Swayam Prabha 4 - Swayam Prabha 5 - Swayam Prabha 6 - Swayam Prabha 7 - Swayam Prabha 8 - Swayam Prabha 9 + SUN TV Tarang Music - Tarang TV - The Q India + Tarang + THE Q Times Now - Times Now World + TIMES NOW WORLD HD TLC Topper TV - Travel XP HD - TV 9 Bangla + TV9 BANGLA TV9 Bharatvash - TV 9 Gujarati - TV 9 Kannada - TV 9 Marathi - Udaya TV - VANDE Gujarat 1 - VANDE Gujarat 10 - VANDE Gujarat 11 - VANDE Gujarat 12 - VANDE Gujarat 13 - VANDE Gujarat 14 - VANDE Gujarat 15 - VANDE Gujarat 16 - VANDE Gujarat 2 - VANDE Gujarat 3 - VANDE Gujarat 4 - VANDE Gujarat 5 - VANDE Gujarat 6 - VANDE Gujarat 7 - VANDE Gujarat 8 - VANDE Gujarat 9 - VEDIC - VH1 India - Vijay TV + TV9 gujarati + TV9 Maharashtra + VH1 VIP NEWS - VTV News + V TV WION - Wow Cinema One - Zee 24 Ghanta + 24 Ghanta TV Zee 24 Kalak Zee 24 Taas Zee Action @@ -421,38 +365,33 @@ Zee Anmol Cinema ZEE Bangla Zee Bangla Cinema - Zee Bihar Jharkhand - Zee Biskope + ZEE BIHAR JHARKHAND + ZEE BIOSKOPE Zee Bollywood Zee Business Zee Cafe - Zee Chitramandir + ZEE CHITRA MANDIR Zee Cinema - Zee Cinema Asia + Zee Cinema HD ZEE CINEMALU - Zee Classic + ZEE CLASSIC ZEE DELHI NCR HARYANA - Zee Hindustan - Zee Kannada - Zee Keralam - Zee Madhya Pradesh Chhattisgarh + Zee Bharat + ZEE Kannada + Zee MP Chattisgarh ZEE Marathi Zee News - Zee Odisha Zee Punjab Haryana Himachal - Zee Punjabi - Zee Rajasthan + ZEE PUNJABI + Zee Rajasthan news Zee Salaam - Zee Sarthak + ZEE SARTHAK ZEE TALKIES - Zee Tamil Zee Telugu Zee TV - Zee Uttar Pradesh Uttarakhand - Zee Vajwa + Zee UP Uttrakhand Zee Yuva Zee Zest - Zing Asia - Zing Home + Zing Zoom diff --git a/sites/dishtv.in/dishtv.in.config.js b/sites/dishtv.in/dishtv.in.config.js index cab65646..6a9d3f18 100644 --- a/sites/dishtv.in/dishtv.in.config.js +++ b/sites/dishtv.in/dishtv.in.config.js @@ -43,74 +43,92 @@ module.exports = { return programs }, async channels() { - const channelguide = await axios - .get('https://www.dishtv.in/channelguide/') - .then(r => r.data) - .catch(console.log) - const $channelguide = cheerio.load(channelguide) + let channels = [] - let ids = [] - $channelguide('#MainContent_recordPagging li').each((i, item) => { - const onclick = $channelguide(item).find('a').attr('onclick') - const [, list] = onclick.match(/ShowNextPageResult\('([^']+)/) || [null, null] - - ids = ids.concat(list.split(',')) - }) - ids = ids.filter(Boolean) - - const channels = {} - const channelList = await axios - .post('https://www.dishtv.in/WebServiceMethod.aspx/GetChannelListFromMobileAPI', { - strChannel: '' - }) - .then(r => r.data) - .catch(console.log) - const $channelList = cheerio.load(channelList.d) - $channelList('#tblpackChnl > div').each((i, item) => { - let num = $channelList(item).find('p:nth-child(2)').text().trim() - const name = $channelList(item).find('p').first().text().trim() - - if (num === '') return - - channels[parseInt(num)] = { - name - } - }) - - const date = dayjs().add(1, 'd') - const promises = [] - for (let id of ids) { - const promise = axios + const pages = await loadPageList() + for (let page of pages) { + const data = await axios .post( 'https://www.dishtv.in/WhatsonIndiaWebService.asmx/LoadPagginResultDataForProgram', - { - Channelarr: id, - fromdate: date.format('YYYYMMDD[0000]'), - todate: date.format('YYYYMMDD[2300]') - }, - { timeout: 5000 } + page, + { timeout: 30000 } ) .then(r => r.data) - .then(data => { - const $channelGuide = cheerio.load(data.d) - - const num = $channelGuide('.cnl-fav > a > span').text().trim() - - if (channels[num]) { - channels[num].site_id = id - } - }) .catch(console.log) - promises.push(promise) + const $ = cheerio.load(data.d) + $('.pgrid').each((i, el) => { + const onclick = $(el).find('.chnl-logo').attr('onclick') + const number = $(el).find('.cnl-fav > a > span').text().trim() + const [, name, site_id] = onclick.match(/ShowChannelGuid\('([^']+)','([^']+)'/) || [ + null, + '', + '' + ] + + channels.push({ + lang: 'en', + number, + site_id + }) + }) } - await Promise.allSettled(promises) + const names = await loadChannelNames() + channels = channels + .map(channel => { + channel.name = names[channel.number] - return Object.values(channels) + return channel + }) + .filter(channel => channel.name) + + return channels } } +async function loadPageList() { + const data = await axios + .get('https://www.dishtv.in/channelguide/') + .then(r => r.data) + .catch(console.log) + + let pages = [] + const $ = cheerio.load(data) + $('#MainContent_recordPagging li').each((i, el) => { + const onclick = $(el).find('a').attr('onclick') + const [, Channelarr, fromdate, todate] = onclick.match( + /ShowNextPageResult\('([^']+)','([^']+)','([^']+)'/ + ) || [null, '', '', ''] + + pages.push({ Channelarr, fromdate, todate }) + }) + + return pages +} + +async function loadChannelNames() { + const names = {} + const data = await axios + .post('https://www.dishtv.in/WebServiceMethod.aspx/GetChannelListFromMobileAPI', { + strChannel: '' + }) + .then(r => r.data) + .catch(console.log) + + const $ = cheerio.load(data.d) + $('#tblpackChnl > div').each((i, el) => { + const num = $(el).find('p:nth-child(2)').text().trim() + const name = $(el).find('p').first().text().trim() + + if (num === '') return + + names[num] = name + }) + + return names +} + function parseTitle(item) { const $ = cheerio.load(item)