From 8f1021a89f0fffbc5bfab1abdd8551cae4e257a6 Mon Sep 17 00:00:00 2001 From: bassdart Date: Sun, 23 Feb 2025 13:26:34 +0100 Subject: [PATCH 1/5] Fix typo in changelog.txt --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index dd33f00..d382520 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,4 @@ -1.0.0-alpha.1 +1.0.0-rc.1 - finally push an initial 1.0.0-rc.1 with all the additions and fixes added in the last years 0.9.9 - play with new Vimeo Add-on from jaylinski if it's available and otherwise fallback to youtube-dl From 91e02dfaae405b8b50bef99670b6bbb4a0a4cf90 Mon Sep 17 00:00:00 2001 From: bassdart Date: Sun, 23 Feb 2025 14:24:14 +0100 Subject: [PATCH 2/5] handle direct download video_url's (e.g. Heroero.com) --- default.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/default.py b/default.py index 258f9ee..7524658 100644 --- a/default.py +++ b/default.py @@ -740,17 +740,22 @@ def resolveprovider(entry): provider = str(entry["sources"][0]["provider"]) videoid = str(entry["sources"][0]["videoid"]) restricted = int(entry["sources"][0]["age_limit"]) + video_url = str(entry["sources"][0]["video_url"]) elif entry["sources"][1]["provider"] == preferedprovider: provider = str(entry["sources"][1]["provider"]) videoid = str(entry["sources"][1]["videoid"]) restricted = int(entry["sources"][1]["age_limit"]) + video_url = str(entry["sources"][1]["video_url"]) else: provider = str(entry["sources"][0]["provider"]) videoid = str(entry["sources"][0]["videoid"]) restricted = int(entry["sources"][0]["age_limit"]) + video_url = str(entry["sources"][0]["video_url"]) else: provider = str(entry["sources"][0]["provider"]) videoid = str(entry["sources"][0]["videoid"]) + video_url = str(entry["sources"][0]["video_url"]) + agerestricted = 0 agerestricted = int(entry["sources"][0]["age_limit"]) slug = str(entry["slug"]) @@ -835,6 +840,9 @@ def resolveprovider(entry): % (videoid) ) provider = addonvevo + elif len(video_url) > 0: + url = video_url + if provider == "script.module.youtube.dl": import YDStreamExtractor From 34d448ae1ff211d38f4de3d9e6024be40219d890 Mon Sep 17 00:00:00 2001 From: bassdart Date: Sun, 23 Feb 2025 14:30:02 +0100 Subject: [PATCH 3/5] remove not needed if in function camelot --- default.py | 60 ++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/default.py b/default.py index 7524658..c0f7ee6 100644 --- a/default.py +++ b/default.py @@ -493,37 +493,35 @@ def numbers(): def camelot(): - #fanart = "resources/img/camelot/camleot.png" - if sort == "random" or sort == "date": - num1 = 0 - for num in range(1, 13): - # logic to get get all the different translation strings from camelot wheel - minor = 30149 + num + num1 - major = 30149 + num + num1 + 1 - log( - msg="camelotnumber=%s, minor=%s, major=%s" % (num, minor, major), - level=xbmc.LOGINFO, - ) - fanart = os.path.join( - addonDir, "resources/img/camelot/" + str(num) + "A.png" - ) - addDir( - translation(minor), - "&limit=camelot&sort=" + sort + "&start=" + str(num) + "A", - "sortTitlesBy", - fanart, - ) - fanart = os.path.join( - addonDir, "resources/img/camelot/" + str(num) + "B.png" - ) - addDir( - translation(major), - "&limit=camelot&sort=" + sort + "&start=" + str(num) + "B", - "sortTitlesBy", - fanart, - ) - num1 += 1 - endOfDirectory() + num1 = 0 + for num in range(1, 13): + # logic to get get all the different translation strings from camelot wheel + minor = 30149 + num + num1 + major = 30149 + num + num1 + 1 + log( + msg="camelotnumber=%s, minor=%s, major=%s" % (num, minor, major), + level=xbmc.LOGINFO, + ) + fanart = os.path.join( + addonDir, "resources/img/camelot/" + str(num) + "A.png" + ) + addDir( + translation(minor), + "&limit=camelot&sort=" + sort + "&start=" + str(num) + "A", + "sortTitlesBy", + fanart, + ) + fanart = os.path.join( + addonDir, "resources/img/camelot/" + str(num) + "B.png" + ) + addDir( + translation(major), + "&limit=camelot&sort=" + sort + "&start=" + str(num) + "B", + "sortTitlesBy", + fanart, + ) + num1 += 1 + endOfDirectory() def opensettings(): From 8b3187e33f1444cfa31f5df77d3fd3b527800dce Mon Sep 17 00:00:00 2001 From: bassdart Date: Sun, 23 Feb 2025 17:43:29 +0100 Subject: [PATCH 4/5] minimal cleanup for agesrestricted variable --- default.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/default.py b/default.py index c0f7ee6..4dceba9 100644 --- a/default.py +++ b/default.py @@ -737,25 +737,25 @@ def resolveprovider(entry): ): provider = str(entry["sources"][0]["provider"]) videoid = str(entry["sources"][0]["videoid"]) - restricted = int(entry["sources"][0]["age_limit"]) + agerestricted = int(entry["sources"][0]["age_limit"]) video_url = str(entry["sources"][0]["video_url"]) elif entry["sources"][1]["provider"] == preferedprovider: provider = str(entry["sources"][1]["provider"]) videoid = str(entry["sources"][1]["videoid"]) - restricted = int(entry["sources"][1]["age_limit"]) + agerestricted = int(entry["sources"][1]["age_limit"]) video_url = str(entry["sources"][1]["video_url"]) else: provider = str(entry["sources"][0]["provider"]) videoid = str(entry["sources"][0]["videoid"]) - restricted = int(entry["sources"][0]["age_limit"]) + agerestricted = int(entry["sources"][0]["age_limit"]) video_url = str(entry["sources"][0]["video_url"]) else: + # we should never end up here? provider = str(entry["sources"][0]["provider"]) videoid = str(entry["sources"][0]["videoid"]) + agerestricted = int(entry["sources"][0]["age_limit"]) video_url = str(entry["sources"][0]["video_url"]) - agerestricted = 0 - agerestricted = int(entry["sources"][0]["age_limit"]) slug = str(entry["slug"]) addonyoutube = addon.getSetting("addon-youtube") addonyoutubeagerestricted = addon.getSetting("addon-youtube-age-restricted") From b899c1475e035a39a5a3fc369a84818b75fd39d8 Mon Sep 17 00:00:00 2001 From: bassdart Date: Sun, 23 Feb 2025 21:58:14 +0100 Subject: [PATCH 5/5] bump version to 1.0.0-rc.2 --- addon.xml | 7 +++++-- changelog.txt | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addon.xml b/addon.xml index ea08e3c..886af73 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -33,7 +33,10 @@ resources/img/kodi/clearlogo.png - 1.0.0-alpha.1 + 1.0.0-rc.2 +- handle direct download video_url's (e.g. Heroero.com) +- minimal cleanups +1.0.0-rc.1 - finally push an initial 1.0.0-rc.1 with all the additions and fixes added in the last years 0.9.9 - play with new Vimeo Add-on from jaylinski if it's available and otherwise fallback to youtube-dl diff --git a/changelog.txt b/changelog.txt index d382520..c2290b6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +1.0.0-rc.2 +- handle direct download video_url's (e.g. Heroero.com) +- minimal cleanups 1.0.0-rc.1 - finally push an initial 1.0.0-rc.1 with all the additions and fixes added in the last years 0.9.9