Skip to content

Commit

Permalink
Merge pull request #542 from MoojMidge/wip-unstable
Browse files Browse the repository at this point in the history 
Bug fixes + local Watch Later and History lists
  • Loading branch information
@MoojMidge
MoojMidge authored Dec 26, 2023
2 parents bebc8ef + 56e9244 commit e69fa0c
Show file tree
Hide file tree
Showing 152 changed files with 11,928 additions and 8,811 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/make-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
xmlstarlet ed -L -u '/addon/@version' -v "${version}+matrix.1" addon.xml
xmlstarlet ed -L -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' addon.xml
xmlstarlet ed -L -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.7' addon.xml
xmlstarlet ed -L -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.0' addon.xml
xmlstarlet ed -L -d '/addon/requires/import[@addon="script.module.infotagger"]' addon.xml
filename=${{ github.event.repository.name }}-${version}.matrix.1.zip
cd ..
Expand All @@ -115,6 +115,7 @@ jobs:
version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
xmlstarlet ed -L -u '/addon/@version' -v "${version}+matrix.unofficial.1" addon.xml
xmlstarlet ed -L -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' addon.xml
xmlstarlet ed -L -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.0' addon.xml
xmlstarlet ed -L -d '/addon/requires/import[@addon="script.module.infotagger"]' addon.xml
filename=${{ github.event.repository.name }}-${version}.matrix.unofficial.1.zip
cd ..
Expand Down
2 changes: 1 addition & 1 deletion .patches/unofficial.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ index ff8ffd44..1306ca2c 100644
def _process_wizard(self, context):
+ def _setup_views(_context, _view):
+ view_manager = utils.ViewManager(_context)
+ if not view_manager.update_view_mode(_context.localize(self._local_map['kodion.wizard.view.%s' % _view]),
+ if not view_manager.update_view_mode(_context.localize('setup_wizard.view.%s' % _view]),
+ _view):
+ return
+
Expand Down
4 changes: 2 additions & 2 deletions addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.youtube" name="YouTube" version="7.0.2.2" provider-name="anxdpanic, bromix">
<addon id="plugin.video.youtube" name="YouTube" version="7.0.3+beta.1" provider-name="anxdpanic, bromix">
<requires>
<import addon="xbmc.python" version="3.0.1"/>
<import addon="script.module.requests" version="2.12.4"/>
<import addon="inputstream.adaptive" version="20.3.1"/>
<import addon="inputstream.adaptive" version="20.0.0"/>
<import addon="script.module.inputstreamhelper" version="0.2.2" optional="true"/>
<import addon="script.module.infotagger" version="0.0.5"/>
</requires>
Expand Down
44 changes: 36 additions & 8 deletions resources/language/resource.language.en_au/strings.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ msgstr ""

# empty strings from id 30003 to 30006
msgctxt "#30007"
msgid "Use MPEG-DASH"
msgid "Use InputStream Adaptive"
msgstr ""

msgctxt "#30008"
Expand Down Expand Up @@ -455,7 +455,7 @@ msgid "Play with..."
msgstr ""

msgctxt "#30541"
msgid "Show channel name in description"
msgid "Show channel name and video details in description"
msgstr ""

msgctxt "#30542"
Expand Down Expand Up @@ -607,7 +607,7 @@ msgid "Force SSL certificate verification"
msgstr ""

msgctxt "#30579"
msgid "MPEG-DASH is enabled in the YouTube settings, however InputStream Adaptive appears to be disabled. Would you like to enable InputStream Adaptive now?"
msgid "InputStream Adaptive is activated in the YouTube settings, however the add-on has been disabled. Would you like to enable InputStream Adaptive now?"
msgstr ""

msgctxt "#30580"
Expand Down Expand Up @@ -759,11 +759,11 @@ msgid "Must be signed in."
msgstr ""

msgctxt "#30617"
msgid "MPEG-DASH"
msgid "InputStream Adaptive"
msgstr ""

msgctxt "#30618"
msgid "Enable mpeg-dash proxy"
msgid "Enable MPEG-DASH proxy"
msgstr ""

msgctxt "#30619"
Expand All @@ -775,7 +775,7 @@ msgid "Port %s already in use. Cannot start http server."
msgstr ""

msgctxt "#30621"
msgid "Proxy is required for mpeg-dash vods (see HTTP Server)"
msgid "Proxy is required for MPEG-DASH VODs (see HTTP Server)"
msgstr ""

msgctxt "#30622"
Expand Down Expand Up @@ -1043,7 +1043,7 @@ msgid "data cache"
msgstr ""

msgctxt "#30688"
msgid "Use for videos"
msgid "Use MPEG-DASH for videos"
msgstr ""

msgctxt "#30689"
Expand Down Expand Up @@ -1183,7 +1183,7 @@ msgid "Enable HDR video"
msgstr ""

msgctxt "#30723"
msgid "Proxy is required for mpeg-dash vods (see HTTP Server)[CR]> 1080p and HDR requires InputStream Adaptive >= 2.3.14"
msgid "Proxy is required for MPEG-DASH VODs (see HTTP Server)[CR]HDR and >1080p video requires InputStream Adaptive >= 2.3.14"
msgstr ""

msgctxt "#30724"
Expand Down Expand Up @@ -1345,3 +1345,31 @@ msgstr ""
msgctxt "#30763"
msgid "Multi-audio"
msgstr ""

msgctxt "#30764"
msgid "Requests connect timeout"
msgstr ""

msgctxt "#30765"
msgid "Requests read timeout"
msgstr ""

msgctxt "#30766"
msgid "Premieres"
msgstr ""

msgctxt "#30767"
msgid "Views"
msgstr ""

msgctxt "#30768"
msgid "Disable high framerate video at maximum video quality"
msgstr ""

msgctxt "#30769"
msgid "Clear Watch Later list"
msgstr ""

msgctxt "#30770"
msgid "Are you sure you want to clear your Watch Later list?"
msgstr ""
44 changes: 36 additions & 8 deletions resources/language/resource.language.en_gb/strings.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ msgstr ""
# empty strings from id 30003 to 30006

msgctxt "#30007"
msgid "Use MPEG-DASH"
msgid "Use InputStream Adaptive"
msgstr ""

msgctxt "#30008"
Expand Down Expand Up @@ -462,7 +462,7 @@ msgid "Play with..."
msgstr ""

msgctxt "#30541"
msgid "Show channel name in description"
msgid "Show channel name and video details in description"
msgstr ""

msgctxt "#30542"
Expand Down Expand Up @@ -614,7 +614,7 @@ msgid "Force SSL certificate verification"
msgstr ""

msgctxt "#30579"
msgid "MPEG-DASH is enabled in the YouTube settings, however InputStream Adaptive appears to be disabled. Would you like to enable InputStream Adaptive now?"
msgid "InputStream Adaptive is activated in the YouTube settings, however the add-on has been disabled. Would you like to enable InputStream Adaptive now?"
msgstr ""

msgctxt "#30580"
Expand Down Expand Up @@ -766,11 +766,11 @@ msgid "Must be signed in."
msgstr ""

msgctxt "#30617"
msgid "MPEG-DASH"
msgid "InputStream Adaptive"
msgstr ""

msgctxt "#30618"
msgid "Enable mpeg-dash proxy"
msgid "Enable MPEG-DASH proxy"
msgstr ""

msgctxt "#30619"
Expand All @@ -782,7 +782,7 @@ msgid "Port %s already in use. Cannot start http server."
msgstr ""

msgctxt "#30621"
msgid "Proxy is required for mpeg-dash vods (see HTTP Server)"
msgid "Proxy is required for MPEG-DASH VODs (see HTTP Server)"
msgstr ""

msgctxt "#30622"
Expand Down Expand Up @@ -1050,7 +1050,7 @@ msgid "data cache"
msgstr ""

msgctxt "#30688"
msgid "Use for videos"
msgid "Use MPEG-DASH for videos"
msgstr ""

msgctxt "#30689"
Expand Down Expand Up @@ -1190,7 +1190,7 @@ msgid "Enable HDR video"
msgstr ""

msgctxt "#30723"
msgid "Proxy is required for mpeg-dash vods (see HTTP Server)[CR]> 1080p and HDR requires InputStream Adaptive >= 2.3.14"
msgid "Proxy is required for MPEG-DASH VODs (see HTTP Server)[CR]HDR and >1080p video requires InputStream Adaptive >= 2.3.14"
msgstr ""

msgctxt "#30724"
Expand Down Expand Up @@ -1352,3 +1352,31 @@ msgstr ""
msgctxt "#30763"
msgid "Multi-audio"
msgstr ""

msgctxt "#30764"
msgid "Requests connect timeout"
msgstr ""

msgctxt "#30765"
msgid "Requests read timeout"
msgstr ""

msgctxt "#30766"
msgid "Premieres"
msgstr ""

msgctxt "#30767"
msgid "Views"
msgstr ""

msgctxt "#30768"
msgid "Disable high framerate video at maximum video quality"
msgstr ""

msgctxt "#30769"
msgid "Clear Watch Later list"
msgstr ""

msgctxt "#30770"
msgid "Are you sure you want to clear your Watch Later list?"
msgstr ""
44 changes: 36 additions & 8 deletions resources/language/resource.language.en_nz/strings.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ msgstr ""

# empty strings from id 30003 to 30006
msgctxt "#30007"
msgid "Use MPEG-DASH"
msgid "Use InputStream Adaptive"
msgstr ""

msgctxt "#30008"
Expand Down Expand Up @@ -455,7 +455,7 @@ msgid "Play with..."
msgstr ""

msgctxt "#30541"
msgid "Show channel name in description"
msgid "Show channel name and video details in description"
msgstr ""

msgctxt "#30542"
Expand Down Expand Up @@ -607,7 +607,7 @@ msgid "Force SSL certificate verification"
msgstr ""

msgctxt "#30579"
msgid "MPEG-DASH is enabled in the YouTube settings, however InputStream Adaptive appears to be disabled. Would you like to enable InputStream Adaptive now?"
msgid "InputStream Adaptive is activated in the YouTube settings, however the add-on has been disabled. Would you like to enable InputStream Adaptive now?"
msgstr ""

msgctxt "#30580"
Expand Down Expand Up @@ -759,11 +759,11 @@ msgid "Must be signed in."
msgstr ""

msgctxt "#30617"
msgid "MPEG-DASH"
msgid "InputStream Adaptive"
msgstr ""

msgctxt "#30618"
msgid "Enable mpeg-dash proxy"
msgid "Enable MPEG-DASH proxy"
msgstr ""

msgctxt "#30619"
Expand All @@ -775,7 +775,7 @@ msgid "Port %s already in use. Cannot start http server."
msgstr ""

msgctxt "#30621"
msgid "Proxy is required for mpeg-dash vods (see HTTP Server)"
msgid "Proxy is required for MPEG-DASH VODs (see HTTP Server)"
msgstr ""

msgctxt "#30622"
Expand Down Expand Up @@ -1043,7 +1043,7 @@ msgid "data cache"
msgstr ""

msgctxt "#30688"
msgid "Use for videos"
msgid "Use MPEG-DASH for videos"
msgstr ""

msgctxt "#30689"
Expand Down Expand Up @@ -1183,7 +1183,7 @@ msgid "Enable HDR video"
msgstr ""

msgctxt "#30723"
msgid "Proxy is required for mpeg-dash vods (see HTTP Server)[CR]> 1080p and HDR requires InputStream Adaptive >= 2.3.14"
msgid "Proxy is required for MPEG-DASH VODs (see HTTP Server)[CR]HDR and >1080p video requires InputStream Adaptive >= 2.3.14"
msgstr ""

msgctxt "#30724"
Expand Down Expand Up @@ -1345,3 +1345,31 @@ msgstr ""
msgctxt "#30763"
msgid "Multi-audio"
msgstr ""

msgctxt "#30764"
msgid "Requests connect timeout"
msgstr ""

msgctxt "#30765"
msgid "Requests read timeout"
msgstr ""

msgctxt "#30766"
msgid "Premieres"
msgstr ""

msgctxt "#30767"
msgid "Views"
msgstr ""

msgctxt "#30768"
msgid "Disable high framerate video at maximum video quality"
msgstr ""

msgctxt "#30769"
msgid "Clear Watch Later list"
msgstr ""

msgctxt "#30770"
msgid "Are you sure you want to clear your Watch Later list?"
msgstr ""
Loading

5 comments on commit e69fa0c

@DjDiabolik
Copy link
Contributor

@DjDiabolik DjDiabolik commented on e69fa0c Jan 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IT'S NOT WORK @anxdpanic and also @MoojMidge this commit no WORK on current nexus. Can login but can't obtain "My Subscription" or every section do not works......

Also another BUG...... the SETUP WIZARD it's not completable....... it's reproposed in infinite loop.

Last update and my feedback:
After a completely uninstall and complete reinstall apparently the 7.0.2.2unofficial works on current nexus.

Apparently there's the best solution........

@MoojMidge
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just be patient. There are a few things to add before a beta release is available for testing.

The issue with the Setup Wizard is a bug in Kodi that is fixed in v20.3 and v21

@DjDiabolik
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just be patient. There are a few things to add before a beta release is available for testing.

The issue with the Setup Wizard is a bug in Kodi that is fixed in v20.3 and v21

lol... simply to made a feedback. I periodically check if there is anything new and I like to do these trivial tests.

About kodi 20.3 for example........little OT i will stay to try to understand because it's not released on linux ppa. Strange because it's reported as already released.

@MoojMidge
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good. Testing is appreciated since I can't really do it myself, but things are currently in a state of flux. Should be ready to test again once #551 is completed and merged.

Regarding v20.3, I think the flatpak is currently the only "official" up-to-date release channel for Linux

@DjDiabolik
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good. Testing is appreciated since I can't really do it myself, but things are currently in a state of flux. Should be ready to test again once #551 is completed and merged.

Regarding v20.3, I think the flatpak is currently the only "official" up-to-date release channel for Linux

about 20.3: in fact, on the flatpack 20.3 seems to have already been released. I haven't understood if I can switch to using the flatpack while maintaining the current grip on the PP but I don't think so.
I think you have to do a complete cleaning using "purge" or other commands suggested in official guide.
it must be said that in the official release note there is this final "note" that I quote:

Application deployment on different platforms (notably the Microsoft Store) can vary considerably due to circumstances outside of our control, so just be patient, and the update will inevitably find its way through.

I hadn't noticed this right away... maybe we just have to wait.. i hope (leaving aside stupid comments made in the forum by "flame generators")

Please sign in to comment.