Skip to content

Commit

Permalink
3.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
tzagim authored Aug 15, 2024
1 parent bf4c65f commit 19fb982
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 18 deletions.
4 changes: 2 additions & 2 deletions addon.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.idanplus" name="עידן+ פלוס" version="3.6.1" provider-name="Fishenzon">
<addon id="plugin.video.idanplus" name="עידן+ פלוס" version="3.6.2" provider-name="Fishenzon">
<requires>
<import addon="script.module.requests"/>
<import addon="script.module.xmltodict"/>
Expand All @@ -19,7 +19,7 @@
<platform>all</platform>
<summary lang="en">צפיה בערוצי עידן פלוס ובתכניות מהאתרים הרשמיים.</summary>
<description lang="en">צפיה בערוצי עידן פלוס ובתכניות מהאתרים הרשמיים.[CR]אפשרויות שונות בהגדרות ההרחבה ובקליק ימני על פריט ברשימה.</description>
<news>- Fixes for some TV channels and Radio stations.</news>
<news>- Fix for openning Reshet-13 series from favorites.</news>
<supportedcontent>
<content>tvshows</content>
</supportedcontent>
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v3.6.2 - 14/08/2024
- Fix for openning Reshet-13 series from favorites.

v3.6.1 - 31/07/2024
- Fixes for some TV channels and Radio stations.

Expand Down
4 changes: 2 additions & 2 deletions resources/language/resource.language.en_gb/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@ msgid "ערוץ הקניות 21"
msgstr ""

msgctxt "#30621"
msgid "האח הגדול 26 - מנותקים"
msgid "האח הגדול 26"
msgstr ""

msgctxt "#30625"
msgid "האח הגדול 26 - מנותקים - גיבוי"
msgid "האח הגדול 26 - גיבוי"
msgstr ""

msgctxt "#30622"
Expand Down
29 changes: 15 additions & 14 deletions resources/lib/reshet.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,39 +402,40 @@ def GetSeriesList(url, iconimage):
result = cache.get(GetUrlJson, 0, url, root, table='pages')
if len(result) < 1:
return
buildId = result['buildId']
result = result['props']['pageProps']['page']
grids_arr = []
grids = result.get('Content', {}).get('PageGrid', {})
for grid in grids:
for serie in grid.get('shows', {}):
try:
if serie['url'] == "":
continue
if serie['id'] == '613':
serie['url'] = '/all-shows/vort/'
else:
continue
name = common.encode(serie['title'], 'utf-8')
name = common.GetLabelColor(name, keyColor="prColor", bold=True)
grids_arr.append((name, serie['url'], serie['poster'], {"Title": name, "Plot": name,'mediatype': 'movie'}))
except Exception as ex:
xbmc.log('SerieID: {0}\n{1}'.format(serie['id'], str(ex)), 3)
grids_sorted = grids_arr if sortBy == 0 else sorted(grids_arr,key=lambda grids_arr: grids_arr[0])
for name, link, icon, infos in grids_sorted:
common.addDir(name, '{0}{1}'.format(baseUrl, link), 1, str(icon), infos=infos, moreData=buildId, module=module)
common.addDir(name, '{0}{1}'.format(baseUrl, link), 1, str(icon), infos=infos, module=module)

def GetSeasonList(url, iconimage, buildId):
def GetSeasonList(url, iconimage):
if len(url) > 0 and url[-1] != '/':
url += '/'
serie = url[url.rfind('/', 0, len(url)-1)+1:-1]
if len(buildId) < 1:
#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']
buildId = common.GetAddonSetting("reshetSiteBuildID")
url = "{0}/_next/data/{1}/he/all-shows/{2}.json?all=all-shows&all={2}".format(baseUrl, buildId, serie)
result = common.OpenURL(url, headers={"User-Agent": userAgent}, responseMethod='json')
if result is None:
result = GetUrlJson('{0}/all-shows/all-shows-list/'.format(baseUrl), root=True)
buildId = result['buildId']
common.SetAddonSetting("reshetSiteBuildID", buildId)
url = "{0}/_next/data/{1}/he/all-shows/{2}.json?all=all-shows&all={2}".format(baseUrl, buildId, serie)
result = common.OpenURL(url, headers={"User-Agent": userAgent}, responseMethod='json')

grids = result['pageProps']['page']['Content']['PageGrid']
grids_arr = []
for grid in grids:
Expand Down Expand Up @@ -484,7 +485,7 @@ def Run(name, url, mode, iconimage='', moreData=''):
elif mode == 0:
GetSeriesList(url, moduleIcon) # Series
elif mode == 1:
GetSeasonList(url, iconimage, moreData) # Seasons
GetSeasonList(url, iconimage) # Seasons
elif mode == 2:
GetEpisodesList(url, iconimage, moreData) # Episodes
elif mode == 3:
Expand Down
1 change: 1 addition & 0 deletions resources/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
<category label="30200">
<setting id="reshetSortBy" type="enum" label="30001" lvalues="30002|30003" default="0" />
<setting id="reshet_res" type="text" label="30023" default="" />
<setting id="reshetSiteBuildID" type="text" option="hidden" visible="false" default="" />
</category>
<category label="30500">
<setting id="14tvSortBy" type="enum" label="30001" lvalues="30002|30003" default="0" />
Expand Down

0 comments on commit 19fb982

Please sign in to comment.