diff --git a/sites/rotana.net/__data__/content_ar.html b/sites/rotana.net/__data__/content_ar.html index fb783989a..f4efe7c79 100644 --- a/sites/rotana.net/__data__/content_ar.html +++ b/sites/rotana.net/__data__/content_ar.html @@ -1,51 +1,241 @@
-
- +

- الأحد - 2023-12-10 -

-
- -
- -
-
- -
- - 00:36 - - - كتكوت -
-
- - -
- + data-delay-in="0.6" style="opacity: 1; animation-delay: 0.6s">الثلاثاء 2024-11-26
- -
-
- +
+
- - 02:46 - - - عيار ناري + data-delay-in="0.6" style="opacity: 1; animation-delay: 0.6s">05:00 المولد
- - + +
+
+
+
+
+
23:00 خيانة + مشروعة
+
+ +
+
+
+
+
+
21:00 عسل + إسود
+
+ +
+
+
+
+
+
+
19:00 ولاد + العم
+
+ +
+
+
+
+
+
16:30 كتكوت +
+
+ +
+
+
+
+
+
14:00 أربعة في مهمة + رسمية
+
+ +
+
+
+
+
+
12:00 غاوي + حب
+
+ +
+
+
+
+
+
10:00 بنك + الحظ
+
+ +
+
+
+
+
+
09:00 عرب + وود
+
+ +
+
+
+
+
+
07:00 سمير وشهير + وبهير
+
+ +
+
+
+
+
+
03:00 خط دم +
+
+ +
+
+
+
+
+
01:00 الكنز الحب + والمصير
+
+ +
+
+
+

الأربعاء 2024-11-27

+
+
+
+
+
23:00 دكان + شحاتة
+
+ +
+
+
+
+
+
21:00 القرموطي في + أرض النار
+
+ +
+
+
+
+
+
19:00 حملة + فريزر
+
+ +
+
+
+
+
+
16:30 + المصلحة
+
+ +
+
+
+
+
+
14:00 نأسف لهذا + الخطأ
+
+ +
+
+
+
+
+
10:00 ولاد + العم
+
+ +
+
+
+
+
+
07:30 كتكوت +
+
+ +
+
+
+
+
+
05:00 أربعة في مهمة + رسمية
+
+ +
+
+
+
+
+
03:00 غاوي + حب
+
+ +
+
+
+
+
+
01:00 بنك + الحظ
+
+ +
+
+
+
+
+
12:00 عسل + إسود
+
+
-
\ No newline at end of file diff --git a/sites/rotana.net/__data__/content_en.html b/sites/rotana.net/__data__/content_en.html index 9a9e9ecf4..6700c2bb3 100644 --- a/sites/rotana.net/__data__/content_en.html +++ b/sites/rotana.net/__data__/content_en.html @@ -1,51 +1,241 @@
-
- +

- Sunday - 2023-12-10 -

-
- -
- -
-
- -
- - 00:36 - - - Katkout -
-
- - -
- + data-delay-in="0.6" style="opacity: 1; animation-delay: 0.6s">Tuesday 2024-11-26
- -
-
- +
+
- - 02:46 - - - Gunshot -
-
- - + +
+
+
+
+
+
23:00 Khiyana + Mashroua
+
+ +
+
+
+
+
+
21:00 Black + Honey
+
+ +
+
+
+
+
+
19:00 + Cousins
+
+ +
+
+
+
+
+
+
16:30 + Katkout
+
+ +
+
+
+
+
+
14:00 Four on an + Official Mission
+
+ +
+
+
+
+
+
12:00 Ghawy + Hob
+
+ +
+
+
+
+
+
10:00 + Monopoly
+
+ +
+
+
+
+
+
09:00 + Arabwood
+
+ +
+
+
+
+
+
07:00 Samir and + Shahir and Bahir
+
+ +
+
+
+
+
+
03:00 Blood + Line
+
+ +
+
+
+
+
+
01:00 The Treasure + 2 Love and Destiny
+
+ +
+
+
+

Wednesday 2024-11-27

+
+
+
+
+
23:00 Dokan + Shehata
+
+ +
+
+
+
+
+
21:00 El Qarmouti + in the Land of Fire
+
+ +
+
+
+
+
+
19:00 Freezer + Mission
+
+ +
+
+
+
+
+
16:30 Al + Maslaha
+
+ +
+
+
+
+
+
14:00 Nasaf lhdha + alkhata
+
+ +
+
+
+
+
+
10:00 + Cousins
+
+ +
+
+
+
+
+
07:30 + Katkout
+
+ +
+
+
+
+
+
05:00 Four on an + Official Mission
+
+ +
+
+
+
+
+
03:00 Ghawy + Hob
+
+ +
+
+
+
+
+
01:00 + Monopoly
+
+ +
+
+
+
+
+
12:00 Black + Honey
+
+
-
\ No newline at end of file diff --git a/sites/rotana.net/__data__/program_ar.html b/sites/rotana.net/__data__/program_ar.html index 2da8a5251..a8a7a5c52 100644 --- a/sites/rotana.net/__data__/program_ar.html +++ b/sites/rotana.net/__data__/program_ar.html @@ -1,240 +1,131 @@ -
-
- كتكوت -
-
-
-
-
-
-
-
- كتكوت -
-
- -
    -
  • - - التصنيف -
    • -
  • - كوميديا , عائلة , إثارة - - -
    • - +
    +
    +
    خيانة مشروعة
    +
    +
    +
    +
    +
    +
    +
    خيانة مشروعة
    +
    + - - -
    - - - +

    +

    يعلم هشام البحيري أن والده قد حرمه من الميراث، ووهب كل ثروته لشقيقه اﻷكبر، وهو ما يدفعه لتدبير جريمة قتل شقيقه لتبدو وكأنها دفاع عن الشرف، وذلك حين يقتل هشام زوجته مع شقيقه.

    + البلد : مصر
    + سنة الإصدار :2006
    + التصنيف : فيلم
    + اللغة : عربي
    + المخرج : خالد يوسف

    +
    -
    - - - -

    - - في إطار كوميدي تدور أحداث الفيلم، حول (كتكوت) الصعيدي الذي تحاول عمته كبيرة العائلة الصعيدية إجباره على تقديم نفسه للقتل ليفدي عائلته، ولكنه يهرب وتخطفه جهة أمنية لاكتشاف شبه كبير بينه وبين (يوسف خوري... -

    - - البلد - : - مصر - -
    - سنة الإصدار - : - 2006 - -
    - - التصنيف - : - فيلم - -
    - - - - - - اللغة - : - عربي - -
    -
    - - -     - -
    -
    -
    -
    - طاقم العمل -
    + data-delay-in="0.6" style="opacity: 1; animation-delay: 0.6s">طاقم العمل
    -
    -
    +
    \ No newline at end of file diff --git a/sites/rotana.net/__data__/program_en.html b/sites/rotana.net/__data__/program_en.html index ba3f772c5..e91590c94 100644 --- a/sites/rotana.net/__data__/program_en.html +++ b/sites/rotana.net/__data__/program_en.html @@ -1,240 +1,132 @@ -
    -
    - Katkout -
    -
    -
    -
    -
    -
    -
    -
    - Katkout -
    -
    - -
      -
    • - - Genres +
      +
      +
      Khiyana Mashroua
      +
      +
      +
      +
      +
      +
      +
      Khiyana Mashroua
      +
      + - - -
      - - - +

      +

      Hisham knows that his father has given all his wealth to his elder brother. This leads him to plan to kill his brother to make it look like a defense of honor, which he does by killing his wife along...

      + Country : Egypt
      + Release Year : 2006
      + Category : Movie
      + Language : Arabic
      + Director : Khaled Youssef

      +
      -
      - - - -

      - - In a comic framework, the events of the film revolve around (Katkoot) Al-Saedi, whose aunt, the eldest of the Al-Saedi family, tries to force him to kill himself in order to ransom his family. A time... -

      - - Country - : - Egypt - -
      - Release Year - : - 2006 - -
      - - Category - : - Movie - -
      - - - - - - Language - : - Arabic - -
      -
      - - -       - -
      -
      -
      -
      - Cast -
      + data-delay-in="0.6" style="opacity: 1; animation-delay: 0.6s">Cast
      -
      -
      +
      \ No newline at end of file diff --git a/sites/rotana.net/rotana.net.config.js b/sites/rotana.net/rotana.net.config.js index 912e8b3f1..50da4de92 100644 --- a/sites/rotana.net/rotana.net.config.js +++ b/sites/rotana.net/rotana.net.config.js @@ -10,6 +10,9 @@ dayjs.extend(timezone) dayjs.extend(utc) dayjs.extend(customParseFormat) +const tz = 'Asia/Riyadh' +const nworker = 25 + const headers = { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36 OPR/104.0.0.0' @@ -33,11 +36,33 @@ module.exports = { } const items = parseItems(content, date) - for (const item of items) { - const program = await parseProgram(item, channel) - if (program) { - programs.push(program) + if (items.length) { + const workers = [] + const n = Math.min(nworker, items.length) + while (workers.length < n) { + const worker = () => { + if (items.length) { + const item = items.shift() + parseProgram(item, channel) + .then(() => { + programs.push(item) + worker() + }) + } else { + workers.splice(workers.indexOf(worker), 1) + } + } + workers.push(worker) + worker() } + await new Promise(resolve => { + const interval = setInterval(() => { + if (workers.length === 0) { + clearInterval(interval) + resolve() + } + }, 500) + }) } return programs @@ -58,85 +83,116 @@ module.exports = { } } -async function parseProgram(item, channel, options = {}) { - options = options || {} - const deep = options.deep !== undefined ? options.deep : true - const raw = options.raw !== undefined ? options.raw : false - const top = item.find('.iq-accordion-block') - const info = top.find('.iq-accordion-title .big-title span') - if (info.length) { - const [time, title] = info.text().split('\n') - const [d, m, y] = item._date.split('-') - const start = dayjs.tz(`${y}-${m}-${d} ${time.trim()}`, 'YYYY-MM-DD HH:mm', 'Asia/Riyadh') - let description, image, stop - if (deep) { - const pid = top.attr('id').split('-')[1] - if (pid) { - const url = `https://rotana.net/${channel.lang}/streams?channel=${channel.site_id}&itemId=${pid}` - const params = { - headers: Object.assign({}, headers, { 'X-Requested-With': 'XMLHttpRequest' }), - Cookie: cookies[channel.lang] - } - debug(`fetching description ${url}`) - const result = await axios - .get(url, params) - .then(response => response.data) - .catch(console.error) +async function parseProgram(item, channel) { + if (item.program) { + const url = `https://rotana.net/${channel.lang}/streams?channel=${channel.site_id}&itemId=${item.program}` + const params = { + headers: Object.assign({}, headers, { 'X-Requested-With': 'XMLHttpRequest' }), + Cookie: cookies[channel.lang] + } + debug(`fetching description ${url}`) + const result = await axios + .get(url, params) + .then(response => response.data) + .catch(console.error) - const $ = cheerio.load(result) - const details = $('.trending-info div > span') - if (details.length) { - description = details.text().split('\n')[3].trim() - } - const img = $('.row > div > img') - if (img.length) { - image = img.attr('src') - } - } - if (item._next) { - const next = await parseProgram(item._next, channel, { deep: false, raw: true }) - if (next.start) { - stop = next.start + const $ = cheerio.load(result) + const details = $('.trending-info .row div > span') + if (details.length) { + for (const el of details[0].children) { + switch (el.constructor.name) { + case 'Text': + if (item.description === undefined) { + const desc = $(el).text().trim() + if (desc) { + item.description = desc + } + } + break; + case 'Element': + if (el.name === 'span') { + const [k, v] = $(el).text().split(':').map(a => a.trim()) + switch (k) { + case 'Category': + case 'التصنيف': + item.category = v; + break; + case 'Country': + case 'البلد': + item.country = v; + break; + case 'Director': + case 'المخرج': + item.director = v; + break; + case 'Language': + case 'اللغة': + item.language = v; + break; + case 'Release Year': + case 'سنة الإصدار': + item.date = v; + break; + } + } + break; } } } - return { - title: title?.trim(), - description: description?.trim(), - image, - start: raw ? start : start?.toISOString(), - stop: raw ? stop : stop?.toISOString() + const img = $('.row > div > img') + if (img.length) { + item.image = img.attr('src') } + delete item.program } } function parseItems(content, date) { - const result = [] const $ = cheerio.load(content) - const expectedId = `item-${date.format('DD-MM-YYYY')}` - let lastId + const items = [] + let curDate $('.hour > div').each((_, item) => { const $item = $(item) if ($item.hasClass('bg')) { - lastId = $item.attr('id') + curDate = $item.attr('id') + curDate = curDate.substr(curDate.indexOf('-') + 1).split('-') } else if ($item.hasClass('iq-accordion')) { - $item._date = lastId.substr(lastId.indexOf('-') + 1) - // is date match? - if (lastId === expectedId) { - // set next item - if (result.length) { - result[result.length - 1]._next = $item - } - result.push($item) - } else if (result.length && !result[result.length - 1]._next) { - // set next item - result[result.length - 1]._next = $item + const top = $item.find('.iq-accordion-block') + const heading = top.find('.iq-accordion-title .big-title') + if (heading.length) { + const progId = top.attr('id') + const title = heading.find('span:eq(1)').text() + .split('\n') + .map(a => a.trim()) + .join(' ') + const time = heading.find('span:eq(0)').text() + const [d, m, y] = curDate + items.push({ + program: progId.substr(progId.indexOf('-') + 1), + title: title ? title.trim() : title, + start: `${y}-${m}-${d} ${time.trim()}`, + }) } } }) - - return result + items.sort((a, b) => a.start.localeCompare(b.start)) + for (let i = 0; i < items.length; i++) { + if (i < items.length - 2) { + items[i].stop = items[i + 1].start + } else { + const dt = dayjs.tz(items[i].start).add(1, 'd') + items[i].stop = `${dt.format('YYYY-MM-DD')} 00:00` + } + } + const expectedDate = `${date.format('YYYY-MM-DD')}` + return items + .filter(a => a.start.startsWith(expectedDate) || a.stop.startsWith(expectedDate)) + .map(a => { + a.start = dayjs.tz(a.start, tz) + a.stop = dayjs.tz(a.stop, tz) + return a + }) } function parseCookies(headers) { diff --git a/sites/rotana.net/rotana.net.test.js b/sites/rotana.net/rotana.net.test.js index 0a2b0cd7a..1718f7150 100644 --- a/sites/rotana.net/rotana.net.test.js +++ b/sites/rotana.net/rotana.net.test.js @@ -11,7 +11,7 @@ dayjs.extend(utc) jest.mock('axios') -const date = dayjs.utc('2023-12-10').startOf('d') +const date = dayjs.utc('2024-11-26').startOf('d') const channel = { lang: 'en', site_id: '439', @@ -20,12 +20,12 @@ const channel = { const channelAr = Object.assign({}, channel, { lang: 'ar' }) axios.get.mockImplementation((url, opts) => { - if (url === 'https://rotana.net/en/streams?channel=439&itemId=239849') { + if (url === 'https://rotana.net/en/streams?channel=439&itemId=736970') { return Promise.resolve({ data: fs.readFileSync(path.resolve(__dirname, '__data__/program_en.html')) }) } - if (url === 'https://rotana.net/ar/streams?channel=439&itemId=239849') { + if (url === 'https://rotana.net/ar/streams?channel=439&itemId=736970') { return Promise.resolve({ data: fs.readFileSync(path.resolve(__dirname, '__data__/program_ar.html')) }) @@ -52,34 +52,50 @@ it('can generate valid arabic url', () => { }) it('can parse english response', async () => { - const result = await parser({ + let result = await parser({ channel, date, content: fs.readFileSync(path.join(__dirname, '/__data__/content_en.html')) }) - expect(result[0]).toMatchObject({ - start: '2023-12-09T21:36:00.000Z', - stop: '2023-12-09T23:46:00.000Z', - title: 'Katkout', + result = result.map(a => { + a.start = a.start.toJSON() + a.stop = a.stop.toJSON() + return a + }) + + expect(result.length).toBe(12) + expect(result[11]).toMatchObject({ + start: '2024-11-26T20:00:00.000Z', + stop: '2024-11-26T22:00:00.000Z', + title: 'Khiyana Mashroua', description: - 'In a comic framework, the events of the film revolve around (Katkoot) Al-Saedi, whose aunt, the eldest of the Al-Saedi family, tries to force him to kill himself in order to ransom his family. A time...', - image: 'https://imgsrv.rotana.net/spider_storage/1398X1000/1690882129.webp?w=450&fit=max' + 'Hisham knows that his father has given all his wealth to his elder brother. This leads him to plan to kill his brother to make it look like a defense of honor, which he does by killing his wife along...', + image: 'https://s3.eu-central-1.amazonaws.com/rotana.website/spider_storage/1398X1000/1687084565', + category: 'Movie' }) }) it('can parse arabic response', async () => { - const result = await parser({ + let result = await parser({ channel: channelAr, date, content: fs.readFileSync(path.join(__dirname, '/__data__/content_ar.html')) }) - expect(result[0]).toMatchObject({ - start: '2023-12-09T21:36:00.000Z', - stop: '2023-12-09T23:46:00.000Z', - title: 'كتكوت', + result = result.map(a => { + a.start = a.start.toJSON() + a.stop = a.stop.toJSON() + return a + }) + + expect(result.length).toBe(12) + expect(result[11]).toMatchObject({ + start: '2024-11-26T20:00:00.000Z', + stop: '2024-11-26T22:00:00.000Z', + title: 'خيانة مشروعة', description: - 'في إطار كوميدي تدور أحداث الفيلم، حول (كتكوت) الصعيدي الذي تحاول عمته كبيرة العائلة الصعيدية إجباره على تقديم نفسه للقتل ليفدي عائلته، ولكنه يهرب وتخطفه جهة أمنية لاكتشاف شبه كبير بينه وبين (يوسف خوري...', - image: 'https://imgsrv.rotana.net/spider_storage/1398X1000/1690882129.webp?w=450&fit=max' + 'يعلم هشام البحيري أن والده قد حرمه من الميراث، ووهب كل ثروته لشقيقه اﻷكبر، وهو ما يدفعه لتدبير جريمة قتل شقيقه لتبدو وكأنها دفاع عن الشرف، وذلك حين يقتل هشام زوجته مع شقيقه.', + image: 'https://s3.eu-central-1.amazonaws.com/rotana.website/spider_storage/1398X1000/1687084565', + category: 'فيلم' }) }) diff --git a/sites/rotana.net/rotana.net_ar.channels.xml b/sites/rotana.net/rotana.net_ar.channels.xml index 6082c9099..71f674a0d 100644 --- a/sites/rotana.net/rotana.net_ar.channels.xml +++ b/sites/rotana.net/rotana.net_ar.channels.xml @@ -3,11 +3,8 @@ روتانا أتش دي روتانا سينما فرنسا الرساله - قناة رسالة الدولية - ضحك وبس إل بي سي M+ HD - رومانس روتانا أفلام روتانا أمريكا روتانا سينما مصر @@ -19,5 +16,4 @@ روتانا خليجية روتانا كيدز روتانا موسيقي - سيدة الشاشة diff --git a/sites/rotana.net/rotana.net_en.channels.xml b/sites/rotana.net/rotana.net_en.channels.xml index 43b72ef24..be5baea48 100644 --- a/sites/rotana.net/rotana.net_en.channels.xml +++ b/sites/rotana.net/rotana.net_en.channels.xml @@ -3,11 +3,8 @@ Rotana HD Rotana Cinema France Al Resalah - Al Resalah International - Dahk wa Bass LBC M+ HD - Romance Rotana Aflam Rotana USA Rotana Cinema Masr @@ -19,5 +16,4 @@ Rotana Khalijea HD Rotana Kids Rotana Music - Sayedat Alshasha