Merge 2c6d6ed161 into 5dbac313ae

yt_dlp/extractor/elemental_tv.py

@@ -1,3 +1,4 @@
+import json
 import re
 import time
 
@@ -74,16 +75,15 @@ def _perform_login(self, username, password):
             'rememberme': 'true',
         }
 
-        # Use double quotes (") as server returns error 400 while using apostrophe (')
-        post_data = str(post_data).replace("'", '"').encode(encoding='UTF-8')
+        post_data = json.dumps(post_data).encode()
 
-        res_api = self._download_json(url, self.channel_id, data=post_data)
+        res_api = self._download_json(url, self.channel_id, data=post_data).get('data')
 
-        if not res_api.get('data') or not res_api.get('data').get('access_token'):
+        if not res_api or not res_api.get('access_token'):
             raise ExtractorError('Accessing login token failed')
 
-        self.access_token = res_api.get('data').get('access_token')
-        token_type = res_api.get('data').get('token_type')
+        self.access_token = res_api.get('access_token')
+        token_type = res_api.get('token_type')
 
         if token_type != 'Bearer':
             raise ExtractorError('Unknown login token type')
@@ -110,8 +110,7 @@ def _real_extract(self, url):
             'id': self.channel_id,
             'formats': formats,
             'subtitles': subtitles,
+            **self.get_stream_metadata(),
         }
 
-        metadata = self.get_stream_metadata()
-
-        return {**result, **metadata}
+        return result