🥅 - Remove references to all_info

providerModules/a4kOfficial/core/__init__.py

@@ -35,43 +35,43 @@ def _return_results(self, source_type, sources, preemptive=False):
 
         return sources
 
-    def _make_source(self, item, ids, simple_info, all_info, **kwargs):
+    def _make_source(self, item, ids, simple_info, info, **kwargs):
         source = {
             "scraper": self._scraper,
         }
         source.update(ids)
 
         return source
 
-    def _make_episode_source(self, item, ids, simple_info, all_info, **kwargs):
-        return self._make_source(item, ids, simple_info, all_info, base_url=self._episode_url, type="episode", **kwargs)
+    def _make_episode_source(self, item, ids, simple_info, info, **kwargs):
+        return self._make_source(item, ids, simple_info, info, base_url=self._episode_url, type="episode", **kwargs)
 
-    def _make_movie_source(self, item, ids, simple_info, all_info, **kwargs):
-        return self._make_source(item, ids, simple_info, all_info, base_url=self._movie_url, type="movie", **kwargs)
+    def _make_movie_source(self, item, ids, simple_info, info, **kwargs):
+        return self._make_source(item, ids, simple_info, info, base_url=self._movie_url, type="movie", **kwargs)
 
-    def _process_movie_item(self, item, simple_info, all_info, **kwargs):
-        source = self._process_item(item, simple_info, all_info, type="movie", **kwargs)
+    def _process_movie_item(self, item, simple_info, info, **kwargs):
+        source = self._process_item(item, simple_info, info, type="movie", **kwargs)
         return source
 
-    def _process_show_item(self, item, simple_info, all_info, **kwargs):
+    def _process_show_item(self, item, simple_info, info, **kwargs):
         source = self._process_item(
             item,
             simple_info,
-            all_info,
+            info,
             type="episode",
             **kwargs,
         )
         return source
 
-    def episode(self, simple_info, all_info, **kwargs):
+    def episode(self, simple_info, info, **kwargs):
         if self._api is None:
             return self._return_results("episode", self._return_results("episode", []))
 
         try:
             items = self._make_show_query(simple_info=simple_info)
 
             for item in items:
-                source = self._process_show_item(item, simple_info, all_info, **kwargs)
+                source = self._process_show_item(item, simple_info, info, **kwargs)
                 if source is not None:
                     self.sources.append(source)
                 if kwargs.get("single"):
@@ -81,15 +81,15 @@ def episode(self, simple_info, all_info, **kwargs):
 
         return self._return_results("episode", self.sources)
 
-    def movie(self, title, year, imdb, simple_info, all_info, **kwargs):
+    def movie(self, title, year, imdb, simple_info, info, **kwargs):
         if self._api is None:
             return self._return_results("movie", self._return_results("movie", []))
 
         try:
             items = self._make_movie_query(title=simple_info["title"], year=int(simple_info["year"]))
 
             for item in items:
-                source = self._process_movie_item(item, simple_info, all_info, **kwargs)
+                source = self._process_movie_item(item, simple_info, info, **kwargs)
                 if source is not None:
                     self.sources.append(source)
                 if kwargs.get("single"):

providerModules/a4kOfficial/core/justwatch.py

@@ -30,7 +30,7 @@ def __init__(self, providers, scheme="standard_web"):
         self._episode_url = self._base_url + "{episode_url}"
 
     @staticmethod
-    def _make_release_title(item, simple_info, all_info, type):
+    def _make_release_title(item, simple_info, info, type):
         if type == "movie":
             return simple_info['title']
         elif type == "episode":
@@ -40,11 +40,11 @@ def _make_release_title(item, simple_info, all_info, type):
         else:
             return item['title']
 
-    def _make_source(self, item, ids, simple_info, all_info, **kwargs):
-        source = super()._make_source(item, ids, simple_info, all_info, **kwargs)
+    def _make_source(self, item, ids, simple_info, info, **kwargs):
+        source = super()._make_source(item, ids, simple_info, info, **kwargs)
         source.update(
             {
-                "release_title": JustWatchCore._make_release_title(item, simple_info, all_info, kwargs["type"]),
+                "release_title": JustWatchCore._make_release_title(item, simple_info, info, kwargs["type"]),
                 "quality": self._get_offered_resolutions(item),
                 "info": self._get_info_from_settings(),
                 "plugin": self._plugin,
@@ -98,7 +98,7 @@ def _make_show_query(self, **kwargs):
 
         return items
 
-    def _process_item(self, item, simple_info, all_info, type, **kwargs):
+    def _process_item(self, item, simple_info, info, type, **kwargs):
         source = None
         if not self._get_service_offers(item):
             return None
@@ -107,15 +107,15 @@ def _process_item(self, item, simple_info, all_info, type, **kwargs):
         external_ids = jw_title.get("external_ids", {})
         tmdb_ids = [i["external_id"] for i in external_ids if i["provider"] == "tmdb"]
 
-        tmdb_id = all_info["info"].get("tmdb_show_id" if type == "episode" else "tmdb_id")
+        tmdb_id = info["info"].get("tmdb_show_id" if type == "episode" else "tmdb_id")
         season = int(simple_info.get("season_number", 0))
         episode = int(simple_info.get("episode_number", 0))
         if len(tmdb_ids) >= 1 and int(tmdb_ids[0]) == tmdb_id:
             service_id = self._get_service_id(item, season, episode)
             if not service_id:
                 return None
 
-            source = self._make_movie_source(item, {"movie_id": service_id}, simple_info, all_info, **kwargs)
+            source = self._make_movie_source(item, {"movie_id": service_id}, simple_info, info, **kwargs)
 
             if type == "episode":
                 episodes = self._api.get_episodes(item["id"])["items"]
@@ -132,7 +132,7 @@ def _process_item(self, item, simple_info, all_info, type, **kwargs):
                 if not ids.get("episode_id"):
                     return None
 
-                source = self._make_episode_source(episode_item, ids, simple_info, all_info, **kwargs)
+                source = self._make_episode_source(episode_item, ids, simple_info, info, **kwargs)
 
         return source
 

providerModules/a4kOfficial/core/library.py

@@ -119,7 +119,7 @@ def _make_movie_query(self, **kwargs):
 
         return result.get("movies", {})
 
-    def _process_item(self, db_item, simple_info, all_info, type, **kwargs):
+    def _process_item(self, db_item, simple_info, info, type, **kwargs):
         source = None
         db_details = None
         external_ids = None
@@ -138,9 +138,9 @@ def _process_item(self, db_item, simple_info, all_info, type, **kwargs):
 
             external_ids = db_details.get("uniqueid", {})
             ids = {
-                "tmdb": all_info["info"].get("tmdb_id"),
-                "imdb": all_info["info"].get("imdb_id"),
-                "trakt": all_info["info"].get("trakt_id"),
+                "tmdb": info["info"].get("tmdb_id"),
+                "imdb": info["info"].get("imdb_id"),
+                "trakt": info["info"].get("trakt_id"),
             }
         elif type == "episode":
             db_details = self.__make_query(
@@ -153,12 +153,12 @@ def _process_item(self, db_item, simple_info, all_info, type, **kwargs):
                             {
                                 "field": "season",
                                 "operator": "is",
-                                "value": str(all_info["info"]["season"]),
+                                "value": str(info["info"]["season"]),
                             },
                             {
                                 "field": "episode",
                                 "operator": "is",
-                                "value": str(all_info["info"]["episode"]),
+                                "value": str(info["info"]["episode"]),
                             },
                         ]
                     },
@@ -172,18 +172,15 @@ def _process_item(self, db_item, simple_info, all_info, type, **kwargs):
             db_details = db_details[0]
             external_ids = db_item.get("uniqueid", {})
             ids = {
-                "tmdb": all_info["info"].get("tmdb_show_id"),
-                "tvdb": all_info["info"].get("tvdb_show_id"),
-                "trakt": all_info["info"].get("trakt_show_id"),
+                "tmdb": info["info"].get("tmdb_show_id"),
+                "tvdb": info["info"].get("tvdb_show_id"),
+                "trakt": info["info"].get("trakt_show_id"),
             }
 
         if all(
-            [
-                int(external_ids.get(i, -1)) if not i == "imdb" else external_ids.get(i, -1) in [-1, ids[i]]
-                for i in ids
-            ]
+            [int(external_ids.get(i, -1)) if not i == "imdb" else external_ids.get(i, -1) in [-1, ids[i]] for i in ids]
         ):
             source_info = self.get_file_info(db_details)
             source = self._make_source(None, ids, source_info, db_details)
-        
+
         return source

providerModules/a4kOfficial/core/plex.py

@@ -56,8 +56,8 @@ def _get_auth(self):
 
         return client_id, token
 
-    def _make_source(self, item, url, simple_info, all_info, **kwargs):
-        source = super()._make_source(item, url, simple_info, all_info, **kwargs)
+    def _make_source(self, item, url, simple_info, info, **kwargs):
+        source = super()._make_source(item, url, simple_info, info, **kwargs)
 
         source.update(
             {
@@ -108,7 +108,7 @@ def _make_movie_query(self, **kwargs):
 
         return result
 
-    def _process_item(self, item, simple_info, all_info, type, **kwargs):
+    def _process_item(self, item, simple_info, info, type, **kwargs):
         try:
             item_type = item.get("type", "")
             resource = item.get("resource", ())
@@ -173,7 +173,7 @@ def _process_item(self, item, simple_info, all_info, type, **kwargs):
                 source,
                 url,
                 simple_info,
-                all_info,
+                info,
                 **kwargs,
             )
         elif type == "episode":
@@ -192,7 +192,7 @@ def _process_item(self, item, simple_info, all_info, type, **kwargs):
                 return
 
             url.update({"episode_id": key})
-            return self._make_episode_source(source, url, simple_info, all_info, **kwargs)
+            return self._make_episode_source(source, url, simple_info, info, **kwargs)
 
     @staticmethod
     def get_listitem(return_data):

providers/a4kOfficial/en/adaptive/iplayer.py

@@ -17,8 +17,8 @@ def __init__(self):
         )
         self._episode_url = f"{self._episode_url.format(episode_url='/?mode=202&name=null&url={episode_id}&iconimage=null&description=null')}"
 
-    def _make_source(self, item, ids, simple_info, all_info, **kwargs):
-        source = self._make_source(item, ids, simple_info, all_info, **kwargs)
+    def _make_source(self, item, ids, simple_info, info, **kwargs):
+        source = self._make_source(item, ids, simple_info, info, **kwargs)
 
         base_url = kwargs["base_url"]
         source["url"] = base_url.format(**({k: quote_plus(v) for k, v in ids.items()}))

providers/a4kOfficial/en/adaptive/plex_composite.py

@@ -12,14 +12,14 @@ def __init__(self):
         self._movie_url = f"{self._base_url}" + "/?mode=5&url={base_url}{movie_id}"
         self._episode_url = f"{self._base_url}" + "/?mode=5&url={base_url}{episode_id}"
 
-    def episode(self, simple_info, all_info, **kwargs):
-        return super().episode(simple_info, all_info, single=False, **kwargs)
+    def episode(self, simple_info, info, **kwargs):
+        return super().episode(simple_info, info, single=False, **kwargs)
 
-    def movie(self, title, year, imdb, simple_info, all_info, **kwargs):
-        return super().movie(title, year, imdb, simple_info, all_info, single=False, **kwargs)
+    def movie(self, title, year, imdb, simple_info, info, **kwargs):
+        return super().movie(title, year, imdb, simple_info, info, single=False, **kwargs)
 
-    def _make_source(self, item, url, simple_info, all_info, **kwargs):
-        source = super()._make_source(item, url, simple_info, all_info, **kwargs)
+    def _make_source(self, item, url, simple_info, info, **kwargs):
+        source = super()._make_source(item, url, simple_info, info, **kwargs)
 
         source.update({"url": kwargs["base_url"].format(**{k: quote(v) for k, v in url.items()})})
 

providers/a4kOfficial/en/direct/plex_direct.py

@@ -21,8 +21,8 @@ def __init__(self):
         self._movie_url = "{base_url}{movie_id}" + f"&X-Plex-Token={self._token}"
         self._episode_url = "{base_url}{episode_id}" + f"&X-Plex-Token={self._token}"
 
-    def episode(self, simple_info, all_info, **kwargs):
-        return super().episode(simple_info, all_info, single=False, **kwargs)
+    def episode(self, simple_info, info, **kwargs):
+        return super().episode(simple_info, info, single=False, **kwargs)
 
-    def movie(self, title, year, imdb, simple_info, all_info, **kwargs):
-        return super().movie(title, year, imdb, simple_info, all_info, single=False, **kwargs)
+    def movie(self, title, year, imdb, simple_info, info, **kwargs):
+        return super().movie(title, year, imdb, simple_info, info, single=False, **kwargs)