Merge pull request #955 from MoojMidge/master

v7.1.1+beta.4

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="7.1.1+beta.3" provider-name="anxdpanic, bromix, MoojMidge">
+<addon id="plugin.video.youtube" name="YouTube" version="7.1.1+beta.4" provider-name="anxdpanic, bromix, MoojMidge">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.requests" version="2.27.1"/>

changelog.txt

@@ -1,3 +1,19 @@
+## v7.1.1+beta.4
+### Fixed
+- Fix incorrectly determining Kodi release name
+- Fix search window history navigation when using direct links
+
+### Changed
+- Improve https server sleep and wakeup #810 #951
+- Update Setup Wizard to disable all alternative player settings if not required #938
+
+### New
+- Improvements to searching
+  - Add context menu items for changing sort order of saved searches #172
+  - Allow search parameters to be stored per search #172 #689
+  - Allow additional optional search parameters to be used #689
+  - Improve parsing of date offset when searching  for completed live events
+
 ## v7.1.1+beta.3
 ### Fixed
 - Fix not listing full stream details in selection dialog

resources/language/resource.language.en_gb/strings.po

@@ -39,7 +39,7 @@ msgstr ""
 # Kodion Settings
 
 msgctxt "#30000"
-msgid "General"
+msgid ""
 msgstr ""
 
 msgctxt "#30001"
@@ -153,7 +153,7 @@ msgid "Configure %s?"
 msgstr ""
 
 msgctxt "#30031"
-msgid "Advanced"
+msgid ""
 msgstr ""
 
 msgctxt "#30032"
@@ -220,7 +220,7 @@ msgid "Watch Later"
 msgstr ""
 
 msgctxt "#30108"
-msgid "Remove"
+msgid ""
 msgstr ""
 
 msgctxt "#30109"
@@ -240,7 +240,7 @@ msgid "Sign Out"
 msgstr ""
 
 msgctxt "#30113"
-msgid "Rename"
+msgid ""
 msgstr ""
 
 msgctxt "#30114"
@@ -260,7 +260,7 @@ msgid "Remove \"%s\"?"
 msgstr ""
 
 msgctxt "#30118"
-msgid "Delete"
+msgid ""
 msgstr ""
 
 msgctxt "#30119"
@@ -306,11 +306,11 @@ msgstr ""
 # empty strings from id 30206 to 30499
 
 msgctxt "#30500"
-msgid "Channels"
+msgid ""
 msgstr ""
 
 msgctxt "#30501"
-msgid "Playlists"
+msgid ""
 msgstr ""
 
 msgctxt "#30502"
@@ -390,15 +390,15 @@ msgid "Add to..."
 msgstr ""
 
 msgctxt "#30521"
-msgid "Select playlist"
+msgid ""
 msgstr ""
 
 msgctxt "#30522"
-msgid "New playlist..."
+msgid ""
 msgstr ""
 
 msgctxt "#30523"
-msgid "Language"
+msgid ""
 msgstr ""
 
 msgctxt "#30524"
@@ -430,19 +430,19 @@ msgid "I dislike this"
 msgstr ""
 
 msgctxt "#30531"
-msgid "Play all"
+msgid ""
 msgstr ""
 
 msgctxt "#30532"
-msgid "Default"
+msgid ""
 msgstr ""
 
 msgctxt "#30533"
 msgid "Reverse"
 msgstr ""
 
 msgctxt "#30534"
-msgid "Shuffle"
+msgid ""
 msgstr ""
 
 msgctxt "#30535"
@@ -462,7 +462,7 @@ msgid "Disliked Videos"
 msgstr ""
 
 msgctxt "#30539"
-msgid "Live"
+msgid ""
 msgstr ""
 
 msgctxt "#30540"
@@ -478,7 +478,7 @@ msgid "rtmpe streams are not supported"
 msgstr ""
 
 msgctxt "#30543"
-msgid "Refresh"
+msgid ""
 msgstr ""
 
 msgctxt "#30544"
@@ -498,15 +498,15 @@ msgid "You may be prompted to enable two applications so that YouTube is functio
 msgstr ""
 
 msgctxt "#30548"
-msgid "More..."
+msgid ""
 msgstr ""
 
 msgctxt "#30549"
 msgid "No videos streams found"
 msgstr ""
 
 msgctxt "#30550"
-msgid "Region"
+msgid ""
 msgstr ""
 
 msgctxt "#30551"
@@ -546,11 +546,11 @@ msgid "Delete settings.xml"
 msgstr ""
 
 msgctxt "#30560"
-msgid "Subtitle language"
+msgid ""
 msgstr ""
 
 msgctxt "#30561"
-msgid "None"
+msgid ""
 msgstr ""
 
 msgctxt "#30562"
@@ -570,7 +570,7 @@ msgid ""
 msgstr ""
 
 msgctxt "#30566"
-msgid "Prompt"
+msgid ""
 msgstr ""
 
 msgctxt "#30567"
@@ -614,7 +614,7 @@ msgid "Failed"
 msgstr ""
 
 msgctxt "#30577"
-msgid "Settings"
+msgid ""
 msgstr ""
 
 msgctxt "#30578"
@@ -638,7 +638,7 @@ msgid "Autoplay suggested videos"
 msgstr ""
 
 msgctxt "#30583"
-msgid "Automatic"
+msgid ""
 msgstr ""
 
 msgctxt "#30584"
@@ -698,15 +698,15 @@ msgid "Updated: %s"
 msgstr ""
 
 msgctxt "#30598"
-msgid "Personal API keys enabled"
+msgid ""
 msgstr ""
 
 msgctxt "#30599"
 msgid "Failed to enable personal API keys. Missing: %s"
 msgstr ""
 
 msgctxt "#30600"
-msgid "Subtitles"
+msgid ""
 msgstr ""
 
 msgctxt "#30601"
@@ -766,7 +766,7 @@ msgid ""
 msgstr ""
 
 msgctxt "#30615"
-msgid "Cancel"
+msgid ""
 msgstr ""
 
 msgctxt "#30616"
@@ -782,7 +782,7 @@ msgid ""
 msgstr ""
 
 msgctxt "#30619"
-msgid "Port"
+msgid ""
 msgstr ""
 
 msgctxt "#30620"
@@ -826,7 +826,7 @@ msgid "IP whitelist (comma delimited)"
 msgstr ""
 
 msgctxt "#30630"
-msgid "Save"
+msgid ""
 msgstr ""
 
 msgctxt "#30631"
@@ -1118,7 +1118,7 @@ msgid "Play with subtitles"
 msgstr ""
 
 msgctxt "#30703"
-msgid "Are you sure?"
+msgid ""
 msgstr ""
 
 msgctxt "#30704"
@@ -1254,11 +1254,11 @@ msgid "Shorts (1 minute or less)"
 msgstr ""
 
 msgctxt "#30737"
-msgid "Episodes"
+msgid ""
 msgstr ""
 
 msgctxt "#30738"
-msgid "Videos"
+msgid ""
 msgstr ""
 
 msgctxt "#30739"

resources/lib/youtube_plugin/kodion/constants/__init__.py

@@ -36,7 +36,11 @@
     '0': False,
     '1': True,
     'false': False,
+    'False': False,
     'true': True,
+    'True': True,
+    'None': None,
+    'null': None,
 }
 
 # Flags

resources/lib/youtube_plugin/kodion/context/abstract_context.py

@@ -120,6 +120,33 @@ class AbstractContext(Logger):
     _STRING_BOOL_PARAMS = {
         'reload_path',
     }
+    _SEARCH_PARAMS = {
+        'forMine',
+        'channelId',
+        'channelType',
+        'eventType',
+        'location',
+        'locationRadius',
+        'maxResults',
+        'order',
+        'pageToken'
+        'publishedAfter',
+        'publishedBefore',
+        'q',
+        'safeSearch',
+        'topicId',
+        'type',
+        'videoCaption',
+        'videoCategoryId',
+        'videoDefinition',
+        'videoDimension',
+        'videoDuration',
+        'videoEmbeddable',
+        'videoLicense',
+        'videoPaidProductPlacement',
+        'videoSyndicated',
+        'videoType',
+    }
 
     def __init__(self, path='/', params=None, plugin_id=''):
         self._access_manager = None
@@ -322,15 +349,13 @@ def parse_params(self, params, update=True):
         for param, value in params.items():
             try:
                 if param in self._BOOL_PARAMS:
-                    parsed_value = VALUE_FROM_STR.get(str(value).lower(), False)
+                    parsed_value = VALUE_FROM_STR.get(str(value), False)
                 elif param in self._INT_PARAMS:
-                    parsed_value = None
-                    if param in self._INT_BOOL_PARAMS:
-                        parsed_value = VALUE_FROM_STR.get(str(value).lower())
-                    if parsed_value is None:
-                        parsed_value = int(value)
-                    else:
-                        parsed_value = int(parsed_value)
+                    parsed_value = int(
+                        (VALUE_FROM_STR.get(str(value), value) or 0)
+                        if param in self._INT_BOOL_PARAMS else
+                        value
+                    )
                 elif param in self._FLOAT_PARAMS:
                     parsed_value = float(value)
                 elif param in self._LIST_PARAMS:
@@ -343,7 +368,7 @@ def parse_params(self, params, update=True):
                     parsed_value = to_str(value)
                     if param in self._STRING_BOOL_PARAMS:
                         parsed_value = VALUE_FROM_STR.get(
-                            parsed_value.lower(), parsed_value
+                            parsed_value, parsed_value
                         )
                     # process and translate deprecated parameters
                     elif param == 'action':
@@ -357,8 +382,15 @@ def parse_params(self, params, update=True):
                     elif params == 'playlist':
                         to_delete.append(param)
                         param = 'playlist_id'
+                elif param in self._SEARCH_PARAMS:
+                    parsed_value = to_str(value)
+                    parsed_value = VALUE_FROM_STR.get(
+                        parsed_value, parsed_value
+                    )
+                    if not parsed_value:
+                        raise ValueError
                 else:
-                    self.log_debug('Unknown parameter - |{0}: {1}|'.format(
+                    self.log_debug('Unknown parameter - |{0}: {1!r}|'.format(
                         param, value
                     ))
                     to_delete.append(param)