Merge pull request #26 from tzagim/3.6.0

3.6.0

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-	<addon id="plugin.video.idanplus" name="עידן+ פלוס" version="3.5.9" provider-name="Fishenzon">
+	<addon id="plugin.video.idanplus" name="עידן+ פלוס" version="3.6.0" provider-name="Fishenzon">
 		<requires>
 			<import addon="script.module.requests"/>
 			<import addon="script.module.xmltodict"/>
@@ -8,8 +8,8 @@
 			<provides>video</provides>
 		</extension>
 		<extension point="xbmc.service" library="resources/lib/service.py" start="[login|startup]"/>
-		<extension point="xbmc.python.module" library="resources/" />
-		<extension point="xbmc.python.module" library="resources/lib/" />
+		<extension library="resources/" point="xbmc.python.module" />
+		<extension library="resources/lib/" point="xbmc.python.module" />
 		<extension point="xbmc.addon.metadata">
 			<reuselanguageinvoker>true</reuselanguageinvoker>
 			<assets>
@@ -19,7 +19,7 @@
 			<platform>all</platform>
 			<summary lang="en">צפיה בערוצי עידן פלוס ובתכניות מהאתרים הרשמיים.</summary>
 			<description lang="en">צפיה בערוצי עידן פלוס ובתכניות מהאתרים הרשמיים.[CR]אפשרויות שונות בהגדרות ההרחבה ובקליק ימני על פריט ברשימה.</description>
-			<news>- Addon loads faster.[CR]- Fix for Reshet old site VODs.</news>
+			<news>- Added i24News channel.</news>
 			<supportedcontent>
 				<content>tvshows</content>
 			</supportedcontent>

changelog.txt

@@ -1,3 +1,6 @@
+v3.6.0 -  30/06/2024
+- Added i24News channel.
+
 v3.5.9 -  05/06/2024
 - Addon loads faster.
 - Fix for Reshet old site VODs.

resources/language/English/strings.xml

@@ -87,6 +87,7 @@
 	<string id="30640">כאן חינוכית 23 - דיילימושן</string>
 	<string id="30641">מכאן 33 - גיבוי</string>
 	<string id="30642">מכאן 33 - דיילימושן</string>
+	<string id="30643">i24news</string>
 	<string id="30651">איכות שידור (ריק לאיכות מירבית)</string>
 	<string id="30652">טלויזיה בלקוח טלויזיה חיה</string>
 

resources/language/resource.language.en_gb/strings.po

@@ -343,6 +343,10 @@ msgctxt "#30642"
 msgid "מכאן 33 - דיילימושן"
 msgstr ""
 
+msgctxt "#30643"
+msgid "i24news"
+msgstr ""
+
 msgctxt "#30651"
 msgid "איכות שידור (ריק לאיכות מירבית)"
 msgstr ""

resources/lib/baseChannels.py

@@ -31,7 +31,8 @@
 	{'ch':'ch_100', 'index': 16, 'nameID': 30726, 'channelID':'100fm', 'mode': 10, 'image':'100fm.jpg', 'module':'tv', 'resKey':'', 'tvgID':'100fm', 'type':'tv'},
 	{'ch':'ch_891', 'index': 17, 'nameID': 30734, 'channelID':'891fm', 'mode': 10, 'image':'891fm.png', 'module':'tv', 'resKey':'', 'tvgID':'891fm', 'type':'tv'},
 	{'ch':'ch_kabru', 'index': 18, 'nameID': 30629, 'channelID':'18', 'mode': 10, 'image':'kabbalah.jpg', 'module':'kabbalah', 'resKey':'ch_kabru_res', 'tvgID':'', 'type':'tv'},
-	{'ch':'ch_musayof', 'index': 19, 'nameID': 30635, 'channelID':'musayof', 'mode': 10, 'image':'musayof.jpg', 'module':'tv', 'resKey':'ch_musayof', 'tvgID':'', 'type':'tv'},
+	{'ch':'ch_musayof', 'index': 19, 'nameID': 30635, 'channelID':'musayof', 'mode': 10, 'image':'musayof.jpg', 'module':'tv', 'resKey':'ch_musayof_res', 'tvgID':'', 'type':'tv'},
+	{'ch':'ch_i24news', 'index': 20, 'nameID': 30643, 'channelID':'i24news', 'mode': 10, 'image':'i24news.png', 'module':'tv', 'resKey':'ch_i24news_res', 'tvgID':'i24news', 'type':'tv'},
 	#{'ch':'ch_refresh', 'index': 100, 'nameID': 30618, 'channelID':'refresh', 'mode': 6, 'image': icon, 'module':'', 'resKey':'', 'tvgID':'', 'type':'refresh'}
 ]
 

resources/lib/kan.py

@@ -38,6 +38,8 @@ def GetCategoriesList(iconimage):
 def GetSeriesList(url, catName):
 	#text = common.GetCF(url, userAgent)
 	text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+	if text==[]:
+		text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 	#if not ('kankids' in url):
 	domain = baseKidsUrl if 'kankids' in url else baseUrl
 	kanSeriesNames = common.GetUpdatedList(kanSeriesNamesFile, kanSeriesNamesURL, headers={'Referer': 'http://idan-{0}.Kodi-{1}.fish'.format(common.AddonVer, common.GetKodiVer())}, deltaInSec=86400, isZip=True)
@@ -118,6 +120,8 @@ def AddSeries(matches, catName):
 			try:
 				#t = common.GetCF(link, userAgent)
 				t = cache.get(common.GetCF, 24, link, userAgent, table='pages')
+				if t==[]:
+						t = cache.get(common.GetCF, 0, link, userAgent, table='pages')
 				#t = common.OpenURL(link)
 				m = re.compile('magazine_info_link w-inline-block\s*"\s*href=\'.*?catid=(.*?)&').findall(t)
 				link = m[0]
@@ -139,6 +143,8 @@ def GetSeasonsList(data, iconimage, moreData=''):
 		return
 	#text = common.GetCF(data)
 	text = cache.get(common.GetCF, 24, data, table='pages')
+	if text==[]:
+		text = cache.get(common.GetCF, 0, data, table='pages')
 	seasons = re.compile('<div class="dropdown">(.*?)</div>', re.S).findall(text)
 	if len(seasons) == 0:
 		GetEpisodesList(data, iconimage, moreData)
@@ -159,6 +165,8 @@ def GetEpisodesList(url, iconimage, moreData=''):
 	catName = '' if len(md) < 2 else md[1]
 	#text = common.GetCF(url)
 	text = cache.get(common.GetCF, 24, url, table='pages')
+	if text==[]:
+		text = cache.get(common.GetCF, 0, url, table='pages')
 	#text = common.OpenURL(url)
 	body = re.compile('<main id="main"(.*?)</main>', re.S).findall(text)
 	if 'kankids' in url:
@@ -215,6 +223,8 @@ def GetKidsEpisodesList(data, iconimage, moreData=''):
 		url = 'https://www.kankids.org.il/program/getMoreProgram.aspx?count={0}&catId={1}'.format(page, catId)
 		#text = common.GetCF(url, userAgent).replace('\u200b', '')
 		text = cache.get(common.GetCF, 24, url, userAgent, table='pages').replace('\u200b', '')
+		if text==[]:
+			text = cache.get(common.GetCF, 0, url, userAgent, table='pages').replace('\u200b', '')
 		#text = common.OpenURL(url)
 		matches = re.compile('program_list_videoblock">.*?url\(\'(.*?)\'\).*?"application/json">(.*?)</script>.*?"content_title">(.*?)</h2>.*?<p>(.*?)</p>', re.S).findall(text)
 		for image, link, name, description in matches:
@@ -275,6 +285,8 @@ def GetRadioEpisodesList(data, iconimage, catName):
 		url = '{0}?currentPage={1}'.format(progUrl, page)
 		#text = common.GetCF(url, userAgent)
 		text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+		if text==[]:
+			text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 		#text = common.OpenURL(url)
 		matches = re.compile('radio-title">(.*?)</h3>.*?data-player-src="(.*?)"', re.S).findall(text)
 		for name, link in matches:
@@ -311,6 +323,8 @@ def Play(url, name='', iconimage='', quality='best'):
 		#text = common.OpenURL(url)
 		#text = common.GetCF(url, userAgent)
 		text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+		if text==[]:
+			text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 		matches = re.compile('AudioUrl":"(.+?)"').findall(text)
 		if len(matches) == 0:
 			return
@@ -320,7 +334,9 @@ def Play(url, name='', iconimage='', quality='best'):
 		#final = url
 	elif 'kan/podcasts' in url or 'kids-podcasts' in url:
 		#text = common.GetCF(url, userAgent)
-		cache.get(common.GetCF, 24, url, userAgent, table='pages')
+		text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+		if text==[]:
+			text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 		matches = re.compile('data-player-src="(.*?)"').findall(text)
 		final = '{0}|User-Agent={1}'.format(matches[-1], userAgent)
 	elif 'kaltura' in url:
@@ -341,6 +357,8 @@ def GetPlayerKanUrl(url, headers={}, quality='best'):
 	url = url.replace('HLS/HLS', 'HLS')
 	#text = common.GetCF(url, userAgent)
 	text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+	if text==[]:
+		text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 	#text = common.OpenURL(url, headers=headers)
 	if 'kanPlayers' in url:
 		match = re.compile("dailymotion.*?video:\s*?'(.*?)'", re.S).findall(text)
@@ -356,6 +374,8 @@ def GetPlayerKanUrl(url, headers={}, quality='best'):
 	elif 'kaltura' in url:
 		#text = common.GetCF(url, userAgent)
 		text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+		if text==[]:
+			text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 		#text = common.OpenURL(url, headers=headers)
 		match = re.compile('window\.kalturaIframePackageData\s*=\s*{(.*?)};').findall(text)
 		result = json.loads('{'+match[0]+'}')
@@ -453,6 +473,8 @@ def GetPodcastsList():
 	url = '{0}/lobby/aod/'.format(baseUrl)
 	#text = common.GetCF(url, userAgent)
 	text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+	if text==[]:
+		text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 	#text = common.OpenURL(url)
 	matches = re.compile('class="podcast-item".*?<a href="(.*?)".*?title="(.*?)".*?src="(.*?)".*?"text">(.*?)</div>', re.S).findall(text)
 	for link, name, image, description in matches:
@@ -471,6 +493,8 @@ def GetPodcastEpisodesList(data, iconimage):
 		url = '{0}?currentPage={1}'.format(progUrl, page)
 		#ext = common.GetCF(url, userAgent)
 		text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+		if text==[]:
+			text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 		#text = common.OpenURL(url)
 		body = re.compile('<div class="card card-row">(.*?)</li>', re.S).findall(text)
 		for b in body:
@@ -497,6 +521,8 @@ def GetKidsPodcastsList():
 	url = 'https://www.kankids.org.il/umbraco/surface/RecommendedPodcast/GetRecommended?nodeId=419086&currentPageNumber=0&itemsPerPage=10000&componentItemsToSkip=0&componentItemsToTake=2147483647'
 	#text = common.GetCF(url, userAgent)
 	text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+	if text==[]:
+		text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 	#text = common.OpenURL(url)
 	matches = re.compile('<img src="(.*?)".*?<a href="(.*?)".*?"card-title">(.*?)</.*?"description">(.*?)</div>', re.S|re.I).findall(text)
 	for image, link, name, description in matches:
@@ -519,6 +545,8 @@ def GetArchiveCategoriesList(url, iconimage, catName):
 def GetArchiveSeriesList(url, iconimage, catName):
 	#text = common.GetCF(url, userAgent)
 	text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+	if text==[]:
+		text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 	#text = common.OpenURL(url)
 	series = re.compile('<div class="archiveItem topImg articlePage">\s*<div class="embed-responsive embed-responsive-16by9">.*?"background-image:url\((.*?)\);".*?<a href="(.*?)" title="(.*?)".*?<p class="spoiler">(.*?)</p>', re.S).findall(text)
 
@@ -554,6 +582,8 @@ def GetArchiveSeriesList(url, iconimage, catName):
 def GetArchiveEpisodesList(url, iconimage, catName):
 	#text = common.GetCF(url, userAgent)
 	text = cache.get(common.GetCF, 24, url, userAgent, table='pages')
+	if text==[]:
+		text = cache.get(common.GetCF, 0, url, userAgent, table='pages')
 	#text = common.OpenURL(url)
 	GetArchiveEpisodes(url, iconimage, text, catName)
 

resources/lib/keshet.py

@@ -43,6 +43,8 @@ def GetSeriesList(url, iconimage):
 	url = "{0}&{1}".format(url, endings) if "?" in url else "{0}?{1}".format(url, endings)
 	#prms = GetJson(url)
 	prms = cache.get(GetJson, 72, url, table='pages')
+	if prms==[]:
+		prms = cache.get(GetJson, 0, url, table='pages')
 	if prms is None:
 		"Cannot get list for url {0}".format(url)
 		return
@@ -70,6 +72,8 @@ def GetProgramUrl(url):
 def GetSeasonsList(url, iconimage):
 	#data = GetJson(GetProgramUrl(url))["pageProps"]["data"]
 	data = cache.get(GetJson, 24, GetProgramUrl(url), table='pages')["pageProps"]["data"]
+	if data==[]:
+		data = cache.get(GetJson, 0, GetProgramUrl(url), table='pages')["pageProps"]["data"]
 	#if iconimage == common.GetIconFullPath('search.jpg'):
 	iconimage = data["seo"]["image"]
 	seasons = data.get("seasons", [])

resources/lib/reshet.py

@@ -43,6 +43,8 @@ def GetUrlJson(url, root=False):
 def GetSeriesListOld(url, iconimage):
 	#result = GetUrlJson(url)
 	result = cache.get(GetUrlJson, 24, url, table='pages')
+	if result==[]:
+		result = cache.get(GetUrlJson,0, url, table='pages')
 	if len(result) < 1:
 		return
 	grids_arr = []
@@ -125,6 +127,8 @@ def GetSeasonListOld(url, iconimage):
 def GetEpisodesListOld(url, iconimage):
 	#result = GetUrlJson(url)
 	result = cache.get(GetUrlJson, 24, url, table='pages')
+	if result==[]:
+		result = cache.get(GetUrlJson, 0, url, table='pages')
 	seasons, episodes = GetLinks(url, result, iconimage)
 	ShowEpisodes(episodes, iconimage)
 	ShowPaging(result, iconimage)
@@ -394,6 +398,8 @@ def GetSeriesList(url, iconimage):
 	#result = GetUrlJson(url, root=True)
 	root = True
 	result = cache.get(GetUrlJson, 72, url, root, table='pages')
+	if result==[]:
+		result = cache.get(GetUrlJson, 0, url, root, table='pages')
 	if len(result) < 1:
 		return
 	buildId = result['buildId']
@@ -422,6 +428,8 @@ def GetSeasonList(url, iconimage, buildId):
 		#result = GetUrlJson('{0}/all-shows/all-shows-list/'.format(baseUrl), root=True)
 		root=True
 		result = cache.get(GetUrlJson, 24, '{0}/all-shows/all-shows-list/'.format(baseUrl),  root, table='pages')
+		if result==[]:
+			result = cache.get(GetUrlJson, 0, '{0}/all-shows/all-shows-list/'.format(baseUrl),  root, table='pages')
 		if len(result) < 1:
 			return
 		buildId = result['buildId']
@@ -439,7 +447,7 @@ def GetSeasonList(url, iconimage, buildId):
 				for season in grid["episodesSeasonsMap"]:
 					name = common.GetLabelColor(season["name"], keyColor="timesColor", bold=True)
 					grids_arr.append(("0", name, url, iconimage, {"Title": name, "Plot": name}))
-	grids_sorted = sorted(grids_arr,key=lambda grids_arr: grids_arr[0], reverse=True)
+	grids_sorted = sorted(grids_arr,key=lambda grids_arr: grids_arr[1], reverse=True)
 	for key, name, link, icon, infos in grids_sorted:
 		common.addDir(name, link, 2, icon, infos={"Title": name}, moreData=key, module=module)
 

resources/lib/tv.py

@@ -22,7 +22,8 @@ def WatchLive(url, name='', iconimage='', quality='best'):
 		'33b2': {'link': 'https://www.dailymotion.com/video/k2slq6Tpsh2bm4wA43P', 'final': True},
 		'bbb': {'link': 'https://d2lckchr9cxrss.cloudfront.net/out/v1/c73af7694cce4767888c08a7534b503c/index.m3u8', 'referer': 'https://13tv.co.il/home/bb-livestream/', 'final': True},
 		'musayof': {'link': 'http://wowza.media-line.co.il/Musayof-Live/livestream.sdp/playlist.m3u8', 'referer': 'http://media-line.co.il/Media-Line-Player/musayof/livePlayer.aspx'},
-		'ynet': {'link': 'https://ynet-live-01.ynet-pic1.yit.co.il/ynet/live.m3u8', 'final': True}
+		'ynet': {'link': 'https://ynet-live-01.ynet-pic1.yit.co.il/ynet/live.m3u8', 'final': True},
+		'i24news': {'link': 'https://bcovlive-a.akamaihd.net/54b8e6b753e3409c91856201d1f08731/eu-central-1/5377161796001/playlist.m3u8'}
 	}
 	userAgent = common.GetUserAgent()
 	headers={"User-Agent": userAgent}

resources/settings.xml

@@ -37,6 +37,7 @@
 		<setting id="ch_891" type="labelenum" label="30734" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|100" default="17" />
 		<setting id="ch_kabru" type="labelenum" label="30629" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|100" default="18" />
 		<setting id="ch_musayof" type="labelenum" label="30635" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|100" default="19" />
+		<setting id="ch_i24news" type="labelenum" label="30643" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|100" default="20" />
 		<!--<setting id="ch_refresh" type="labelenum" label="30618" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|19|20|100" default="0" />-->
 		<setting label="30651" type="lsep"/>
 		<setting id="ch_11_res" type="text" label="30602" default="" />
@@ -57,6 +58,8 @@
 		<setting id="ch_ynet_res" type="text" label="30622" default="" />
 		<setting id="ch_walla_res" type="text" label="30624" default="" />
 		<setting id="ch_kabru_res" type="text" label="30629" default="" />
+		<setting id="ch_musayof_res" type="text" label="30635" default="" />
+		<setting id="ch_i24news_res" type="text" label="30643" default="" />
 	</category>
 	<category label="30700">
 		<setting label="30701" type="lsep"/>