3.7.0

tzagim · Feb 10, 2025 · afac08e · afac08e
1 parent c4bac45
commit afac08e
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 13 deletions.
diff --git a/plugin.video.idanplus/addon.xml b/plugin.video.idanplus/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-	<addon id="plugin.video.idanplus" name="עידן+ פלוס" version="3.6.8" provider-name="Fishenzon">
+	<addon id="plugin.video.idanplus" name="עידן+ פלוס" version="3.7.0" provider-name="Fishenzon">
 		<requires>
 			<import addon="script.module.requests"/>
 			<import addon="script.module.xmltodict"/>
@@ -19,7 +19,7 @@
 			<platform>all</platform>
 			<summary lang="en">צפיה בערוצי עידן פלוס ובתכניות מהאתרים הרשמיים.</summary>
 			<description lang="en">צפיה בערוצי עידן פלוס ובתכניות מהאתרים הרשמיים.[CR]אפשרויות שונות בהגדרות ההרחבה ובקליק ימני על פריט ברשימה.</description>
-			<news>- Fix Reshet 13 channel.[CR]- Removed 21tv channel (Shopings channel).[CR]- Added 10tv channel (Economy channel).</news>
+			<news>- Fix channel 14 VOD.[CR]- Added an option to autoplay channel on Kodi start.</news>
 			<supportedcontent>
 				<content>tvshows</content>
 			</supportedcontent>

diff --git a/plugin.video.idanplus/changelog.txt b/plugin.video.idanplus/changelog.txt
@@ -1,3 +1,10 @@
+v3.7.0 -  10/02/2025
+- Bugfix in add-on settings.
+
+v3.6.9 -  10/02/2025
+- Fix channel 14 VOD.
+- Added an option to autoplay channel on Kodi start.
+
 v3.6.8 -  12/01/2025
 - Fix Reshet 13 channel.
 - Removed 21tv channel (Shopings channel).

diff --git a/plugin.video.idanplus/resources/language/resource.language.en_gb/strings.po b/plugin.video.idanplus/resources/language/resource.language.en_gb/strings.po
@@ -565,4 +565,16 @@ msgstr ""
 
 msgctxt "#32005"
 msgid "נוקה"
+msgstr ""
+
+msgctxt "#32001"
+msgid "ניגון ערוץ טלויזיה בפתיחת קודי"
+msgstr ""
+
+msgctxt "#32002"
+msgid "ניגון ערוץ רדיו בפתיחת קודי"
+msgstr ""
+
+msgctxt "#32003"
+msgid "ללא"
 msgstr ""
diff --git a/plugin.video.idanplus/resources/lib/14tv.py b/plugin.video.idanplus/resources/lib/14tv.py
@@ -7,7 +7,7 @@
 module = '14tv'
 moduleIcon = common.GetIconFullPath("14tv.png")
 baseUrl = 'https://www.now14.co.il'
-userAgent = common.GetUserAgent()
+userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:133.0) Gecko/20100101 Firefox/133.0'
 
 def GetCategoriesList(iconimage):
 	sortString = common.GetLocaleString(30002) if sortBy == 0 else common.GetLocaleString(30003)
@@ -19,8 +19,9 @@ def GetCategoriesList(iconimage):
 def GetSeriesList(iconimage):
 	#text = common.OpenURL(baseUrl)
 	#text = common.OpenURL('{0}/tochniot_haarutz/%D7%94%D7%9E%D7%94%D7%93%D7%95%D7%A8%D7%94-%D7%94%D7%9E%D7%A8%D7%9B%D7%96%D7%99%D7%AA/'.format(baseUrl))
-	text = cache.get(common.OpenURL, 24, '{0}/tochniot_haarutz/%D7%94%D7%9E%D7%94%D7%93%D7%95%D7%A8%D7%94-%D7%94%D7%9E%D7%A8%D7%9B%D7%96%D7%99%D7%AA/'.format(baseUrl), table='pages')
-	match = re.compile 	('<ul class="navbar2">(.*?)</ul>', re.S).findall(text)
+	text = cache.get(common.OpenURL, 24, '{0}/tochniot_haarutz/%D7%94%D7%9E%D7%94%D7%93%D7%95%D7%A8%D7%94-%D7%94%D7%9E%D7%A8%D7%9B%D7%96%D7%99%D7%AA/'.format(baseUrl), {"User-agent": userAgent}, table='pages')
+	match = re.compile('<ul class="navbar2">(.*?)</ul>', re.S).findall(text)
+	xbmc.log(str(len(match)), 5)
 	match = re.compile('<a href=(.*?)>(.*?)</a>', re.S).findall(match[0])
 	grids_arr = []
 	for link, name in match[1:]:
@@ -41,7 +42,7 @@ def GetQuoteUrl(url):
 def GetEpisodesList(url, image):
 	bitrate = common.GetAddonSetting('{0}_res'.format(module))
 	#text = common.OpenURL(url)
-	text = cache.get(common.OpenURL, 24, url, table='pages')
+	text = cache.get(common.OpenURL, 24, url, {"User-agent": userAgent}, table='pages')
 	episodes = re.compile('<div class="katan-unit(.*?)</div>\s*</div>\s*</div>', re.S).findall(text)
 	for episode in episodes:
 		match = re.compile('data-videoid="(.*?)".*?src=["\'](.*?)["\'].*?<div class="the-title">(.*?)</div>.*?<div class="episode_air_date"\s*?>(.*?)</div>', re.S).findall(episode)

diff --git a/plugin.video.idanplus/resources/lib/common.py b/plugin.video.idanplus/resources/lib/common.py
@@ -248,6 +248,8 @@ def OpenURL(url, headers={}, user_data=None, session=None, cookies=None, retries
 		headers['Accept-encoding'] = 'gzip'
 	if headers.get('User-agent', '') == '':
 		headers['User-agent'] = userAgent
+	if headers.get('User-Agent', '') == '':
+		headers['User-Agent'] = userAgent
 	for i in range(retries):
 		try:
 			if session is None:

diff --git a/plugin.video.idanplus/resources/lib/kan.py b/plugin.video.idanplus/resources/lib/kan.py
@@ -2,7 +2,7 @@
 import xbmc, xbmcgui, xbmcplugin
 import re, json, os
 import resources.lib.common as common
-from resources.lib import cache as  cache
+from resources.lib import cache as cache
 
 module = 'kan'
 moduleIcon = common.GetIconFullPath("kan.jpg")

diff --git a/plugin.video.idanplus/resources/lib/service.py b/plugin.video.idanplus/resources/lib/service.py
@@ -1,13 +1,35 @@
 import xbmc
 from time import time
+import common, baseChannels
 
 end_pause = time() + 15
 monitor = xbmc.Monitor()
 wait_for_abort = monitor.waitForAbort
 
+channels = None
+startup_ch = common.GetAddonSetting("startup_ch")
+startup_rd = common.GetAddonSetting("startup_rd")
+
+if startup_ch != u'ללא':	
+	channels = baseChannels.TvChannels
+	startup_name = startup_ch
+elif startup_rd != u'ללא':	
+	channels = baseChannels.RadioChannels
+	startup_name = startup_rd
+
+if channels is not None:
+	channel = None
+	for ch in channels:
+		if common.GetLocaleString(ch['nameID']) == startup_name: 
+			channel = ch
+			break
+	if channel is not None:
+		autoplayCommand = 'PlayMedia(plugin://plugin.video.idanplus/?mode=5&url={0})'.format(channel['ch'])
+		xbmc.executebuiltin(autoplayCommand)
+
 while not monitor.abortRequested():
-    while time() < end_pause: wait_for_abort(1)
-    refreshCommand = 'RunPlugin(plugin://plugin.video.idanplus/?mode=7)'
-    xbmc.executebuiltin(refreshCommand)
-    xbmc.executebuiltin('AlarmClock(idanplus,{0},12:00:00,silent,loop)'.format(refreshCommand))
-    break
+	while time() < end_pause: wait_for_abort(1)
+	refreshCommand = 'RunPlugin(plugin://plugin.video.idanplus/?mode=7)'
+	xbmc.executebuiltin(refreshCommand)
+	xbmc.executebuiltin('AlarmClock(idanplus,{0},12:00:00,silent,loop)'.format(refreshCommand))
+	break
diff --git a/plugin.video.idanplus/resources/settings.xml b/plugin.video.idanplus/resources/settings.xml
@@ -2,6 +2,8 @@
 <settings>
 	<category label="32000">
 		<setting id="actUpdateEPG" type="action" label="30014" action="RunPlugin(plugin://plugin.video.idanplus/?mode=3&amp;module=epg)" option="close" />
+		<setting id="startup_ch" type="labelenum" label="32001" lvalues="32003|30602|30633|30637|30603|30605|30626|30604|30634|30644|30631|30606|30619|30607|30639|30608|30621|30625|30609|30641|30610|30612|30613|30622|30624|30632|30726|30734|30629|30635|30643|30645|30646|30647" default="32003" />
+		<setting id="startup_rd" type="labelenum" label="32002" lvalues="32003|30702|30703|30724|30725|30704|30726|30727|30728|30705|30729|30706|30730|30731|30707|30708|30709|30710|30711|30712|30738|30632|30713|30734|30737|30714|30733|30739|30740|30741|30742|30743|30745" default="32003" />
 	</category>
 	<category label="30600">
 		<setting label="30601" type="lsep"/>

diff --git a/ver.txt b/ver.txt
@@ -1 +1 @@
-3.6.8
+3.7.0