Merge pull request anxdpanic#519 from MoojMidge/master

v7.0.2.2
JimmyS83 · Sep 30, 2023 · 434441a · 434441a
2 parents 86434a0 + 0058b1d
commit 434441a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 21 deletions.
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -73,7 +73,8 @@ jobs:
           rm -rf .??*
           rm *.md
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          filename=${{ github.event.repository.name }}-unofficial-${version}.zip
+          xmlstarlet ed -L -u '/addon/@version' -v "${version}+unofficial.1" addon.xml
+          filename=${{ github.event.repository.name }}-${version}.unofficial.1.zip
           cd ..
           zip -r $filename ${{ github.event.repository.name }}
           mv .git ${{ github.event.repository.name }}
@@ -90,6 +91,7 @@ jobs:
           rm -rf .??*
           rm *.md
           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 -d '/addon/requires/import[@addon="script.module.infotagger"]' addon.xml
@@ -111,9 +113,10 @@ jobs:
           rm -rf .??*
           rm *.md
           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 -d '/addon/requires/import[@addon="script.module.infotagger"]' addon.xml
-          filename=${{ github.event.repository.name }}-unofficial-${version}.matrix.1.zip
+          filename=${{ github.event.repository.name }}-${version}.matrix.unofficial.1.zip
           cd ..
           zip -r $filename ${{ github.event.repository.name }}
           mv .git ${{ github.event.repository.name }}

diff --git a/.patches/unofficial.patch b/.patches/unofficial.patch
@@ -1,9 +1,3 @@
-From cb73ff623ea6474ccc4ec1d5bd7e8653d90cd1aa Mon Sep 17 00:00:00 2001
-From: anxdpanic <[email protected]>
-Date: Fri, 7 Feb 2020 16:44:38 -0500
-Subject: [PATCH] unofficial patch
-
----
  addon.xml                                     |   1 +
  .../kodion/abstract_provider.py               |  21 ++-
  .../kodion/constants/const_settings.py        |   4 +
@@ -22,10 +16,10 @@ Subject: [PATCH] unofficial patch
  create mode 100644 resources/lib/youtube_plugin/kodion/utils/view_manager.py
 
 diff --git a/addon.xml b/addon.xml
-index 44bece4a..41282ace 100644
+index 57d0b3c6..13eba70c 100644
 --- a/addon.xml
 +++ b/addon.xml
-@@ -105,3 +105,4 @@
+@@ -107,3 +107,4 @@
          <disclaimer lang="zh_TW">此附加元件未由Google支持</disclaimer>
      </extension>
  </addon>
@@ -106,15 +100,15 @@ index 7ed3feff..46eabf26 100644
          raise NotImplementedError()
 
 diff --git a/resources/lib/youtube_plugin/kodion/impl/abstract_settings.py b/resources/lib/youtube_plugin/kodion/impl/abstract_settings.py
-index 47ec7ed2..a07a260d 100644
+index 47ec7ed2..4a314d65 100644
 --- a/resources/lib/youtube_plugin/kodion/impl/abstract_settings.py
 +++ b/resources/lib/youtube_plugin/kodion/impl/abstract_settings.py
 @@ -90,6 +90,9 @@ class AbstractSettings(object):
      def is_setup_wizard_enabled(self):
          return self.get_bool(SETTINGS.SETUP_WIZARD, False)
 
 +    def is_override_view_enabled(self):
-+        return self.get_bool(constants.setting.VIEW_OVERRIDE, False)
++        return self.get_bool(SETTINGS.VIEW_OVERRIDE, False)
 +
      def is_support_alternative_player_enabled(self):
          return self.get_bool(SETTINGS.SUPPORT_ALTERNATIVE_PLAYER, False)
@@ -619,6 +613,3 @@ index 70429df9..65206514 100644
                  <setting id="youtube.language" type="string" label="30523" help="">
                      <level>0</level>
                      <default>en-US</default>
--- 
-2.40.0.windows.1
-
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="7.0.2.1" provider-name="anxdpanic, bromix">
+<addon id="plugin.video.youtube" name="YouTube" version="7.0.2.2" provider-name="anxdpanic, bromix">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="script.module.requests" version="2.12.4"/>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+7.0.2.2
+[fix] Fix Matrix compatibility
+[fix] Update unofficial patch
+
 7.0.2.1
 [fix] fix Matrix InputStream.Adaptive dependency version
 

diff --git a/resources/lib/youtube_plugin/kodion/impl/xbmc/xbmc_items.py b/resources/lib/youtube_plugin/kodion/impl/xbmc/xbmc_items.py
@@ -14,17 +14,18 @@
     from infotagger.listitem import ListItemInfoTag
 except ImportError:
     class ListItemInfoTag:
-        __slots__ = (__li__, )
+        __slots__ = ('__li__', '__type__' )
 
-        def __init__(self, list_item):
+        def __init__(self, list_item, tag_type):
             self.__li__ = list_item
+            self.__type__ = tag_type
 
         def add_stream_info(self, *args, **kwargs):
             return self.__li__.addStreamInfo(*args, **kwargs)
-        
+
         def set_info(self, *args, **kwargs):
-            return self.__li__.setInfo(*args, **kwargs)
-            
+            return self.__li__.setInfo(self.__type__, *args, **kwargs)
+
 
 from ...items import VideoItem, AudioItem, UriItem
 from ... import utils