Merge branch '1886-cant-get-show-listing-on-tv4'

basrieter · basrieter · commit 4d3dcc0bfb2a · 2025-02-07T23:54:45.000+01:00
diff --git a/changelog.txt b/changelog.txt
@@ -11,3 +11,4 @@ _None_
 [B]Channel related[/B]
 * Fixed: NPO Luister radio stations.
 * Fixed: SRF Channel.
+* Fixed: TV4 Play Channel needs POSTs now (Fixes #1886).
diff --git a/channels/channel.se/tv4se/chn_tv4se.py b/channels/channel.se/tv4se/chn_tv4se.py
@@ -197,8 +197,7 @@ def __create_item(lang_id: int, url: str, json: Optional[dict] = None):
         tvshow_url, tvshow_data = self.__get_api_query(
             "MediaIndex",
             {"input": {"letterFilters": list("ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
-                       "limit": self.__max_page_size, "offset": 0}},
-            use_get=True)
+                       "limit": self.__max_page_size, "offset": 0}})
         items.append(__create_item(LanguageHelper.TvShows, tvshow_url, tvshow_data))
 
         recent_url, recent_data = self.__get_api_query("Panel", {"panelId": "2K0BCBpDDfhpW1NRLY0jET", "limit": self.__max_page_size, "offset": 0})
@@ -242,11 +241,11 @@ def fetch_mainlist_pages(self, data: str) -> Tuple[str, List[MediaItem]]:
 
                 tvshow_url, tvshow_data = self.__get_api_query(
                     "MediaIndex",
-                    {"input": {
-                        "letterFilters": list("ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
-                        "limit": self.__max_page_size, "offset": next_offset}
-                    },
-                    use_get=True
+                    {
+                        "input": {
+                            "letterFilters": list("ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+                            "limit": self.__max_page_size, "offset": next_offset}
+                    }
                 )
                 new_data = UriHandler.open(
                     tvshow_url, additional_headers=self.httpHeaders, json=tvshow_data,
@@ -400,7 +399,6 @@ def create_api_series(self, result_set: dict) -> Optional[MediaItem]:
         url, data = self.__get_api_query(
             operation="ContentDetailsPage",
             variables={"mediaId": series_id, "panelsInput": {"offset": 0, "limit": 20}},
-            use_get=True
         )
         title = result_set["title"]
         if not title:
@@ -432,7 +430,6 @@ def create_api_page(self, result_set: dict) -> Optional[MediaItem]:
         url, data = self.__get_api_query(
             operation="Page",
             variables={"pageId": page_id, "input": {"limit": self.__max_page_size, "offset": 0}},
-            use_get=False
         )
 
         item = FolderItem(title, url, content_type=contenttype.TVSHOWS, media_type=mediatype.FOLDER)
@@ -458,8 +455,7 @@ def create_api_live_panel(self, result_set: dict) -> Optional[MediaItem]:
         title = result_set["title"]
         url, data = self.__get_api_query(
             operation="LivePanel",
-            variables={"panelId": panel_id, "limit": self.__max_page_size, "offset": 0},
-            use_get=True
+            variables={"panelId": panel_id, "limit": self.__max_page_size, "offset": 0}
         )
 
         item = FolderItem(title, url, content_type=contenttype.VIDEOS)
@@ -928,7 +924,7 @@ def __get_api_query(self, operation: str, variables: dict, use_get: bool = False
             return base_url, data
 
         # For GETs (but the request URLs become to long!)
-        url =  f"{base_url}query={HtmlEntityHelper.url_encode(query)}&variables={HtmlEntityHelper.url_encode(json.dumps(variables))}"
+        url = f"{base_url}query={HtmlEntityHelper.url_encode(query)}&variables={HtmlEntityHelper.url_encode(json.dumps(variables))}"
         return url, None
 
     def __update_dash_video(self, item, stream_info):
diff --git a/tests/channel_tests/test_chn_tv4se.py b/tests/channel_tests/test_chn_tv4se.py
@@ -19,8 +19,9 @@ def test_main_list(self):
         self.assertGreaterEqual(len(items), 5, "Incorrect number of items in mainlist")
 
     def test_program_list(self):
-        url = "https://client-gateway.tv4.a2d.tv/graphql?operationName=MediaIndex&query=query%20MediaIndex%28%24input%3A%20MediaIndexListInput%21%2C%20%24genres%3A%20%5BString%21%5D%29%20%7B%20mediaIndex%28genres%3A%20%24genres%29%20%7B%20overview%20%7B%20letterIndex%20%7B%20letter%20totalCount%20%7D%20%7D%20contentList%28input%3A%20%24input%29%20%7B%20__typename%20items%20%7B%20...%20on%20MediaIndexSeriesItem%20%7B%20__typename%20letter%20series%20%7B%20...SeriesFieldsLight%20__typename%20%7D%20%7D%20...%20on%20MediaIndexMovieItem%20%7B%20__typename%20letter%20movie%20%7B%20...MovieFieldsLight%20__typename%20%7D%20%7D%20%7D%20pageInfo%20%7B%20hasMoreForLastLetter%20totalCount%20lastLetter%20nextPageOffset%20%7D%20%7D%20%7D%20%7D%20fragment%20SeriesFieldsLight%20on%20Series%20%7B%20id%20slug%20title%20genres%20mediaClassification%20numberOfAvailableSeasons%20label%20%7B%20...LabelFields%20%7D%20images%20%7B%20cover2x3%20%7B%20...ImageFieldsFull%20%7D%20main16x9Annotated%20%7B%20...ImageFieldsLight%20%7D%20%7D%20parentalRating%20%7B%20...ParentalRatingFields%20%7D%20trailers%20%7B%20mp4%20webm%20%7D%20upsell%20%7B%20tierId%20%7D%20%7D%20fragment%20MovieFieldsLight%20on%20Movie%20%7B%20id%20slug%20title%20genres%20productionYear%20isLiveContent%20productionCountries%20%7B%20name%20%7D%20parentalRating%20%7B%20...ParentalRatingFields%20%7D%20liveEventEnd%20%7B%20isoString%20%7D%20label%20%7B%20...LabelFields%20%7D%20images%20%7B%20cover2x3%20%7B%20...ImageFieldsFull%20%7D%20main16x9Annotated%20%7B%20...ImageFieldsLight%20%7D%20%7D%20playableUntil%20%7B%20readableDistance%28type%3A%20DAYS_LEFT%29%20%7D%20playableFrom%20%7B%20isoString%20humanDateTime%20readableDate%20%7D%20trailers%20%7B%20mp4%20webm%20%7D%20upsell%20%7B%20tierId%20%7D%20%7D%20fragment%20LabelFields%20on%20Label%20%7B%20id%20airtime%20announcement%20recurringBroadcast%20%7D%20fragment%20ImageFieldsFull%20on%20Image%20%7B%20sourceEncoded%20meta%20%7B%20muteBgColor%20%7B%20hex%20%7D%20%7D%20%7D%20fragment%20ImageFieldsLight%20on%20Image%20%7B%20sourceEncoded%20isFallback%20%7D%20fragment%20ParentalRatingFields%20on%20ParentalRating%20%7B%20finland%20%7B%20ageRestriction%20reason%20%7D%20sweden%20%7B%20ageRecommendation%20suitableForChildren%20%7D%20%7D&variables=%7B%22input%22%3A%20%7B%22letterFilters%22%3A%20%5B%22A%22%2C%20%22B%22%2C%20%22C%22%2C%20%22D%22%2C%20%22E%22%2C%20%22F%22%2C%20%22G%22%2C%20%22H%22%2C%20%22I%22%2C%20%22J%22%2C%20%22K%22%2C%20%22L%22%2C%20%22M%22%2C%20%22N%22%2C%20%22O%22%2C%20%22P%22%2C%20%22Q%22%2C%20%22R%22%2C%20%22S%22%2C%20%22T%22%2C%20%22U%22%2C%20%22V%22%2C%20%22W%22%2C%20%22X%22%2C%20%22Y%22%2C%20%22Z%22%5D%2C%20%22limit%22%3A%20100%2C%20%22offset%22%3A%200%7D%7D"
-        self._test_folder_url(url, expected_results=1000)
+        url = "https://client-gateway.tv4.a2d.tv/graphql?operationName=MediaIndex&"
+        data = {"operationName": "MediaIndex", "query": "query MediaIndex($input: MediaIndexListInput!, $genres: [String!]) { mediaIndex(genres: $genres) { overview { letterIndex { letter totalCount } } contentList(input: $input) { __typename items { ... on MediaIndexSeriesItem { __typename letter series { ...SeriesFieldsLight __typename } } ... on MediaIndexMovieItem { __typename letter movie { ...MovieFieldsLight __typename } } } pageInfo { hasMoreForLastLetter totalCount lastLetter nextPageOffset } } } } fragment SeriesFieldsLight on Series { id slug title genres mediaClassification numberOfAvailableSeasons label { ...LabelFields } images { cover2x3 { ...ImageFieldsFull } main16x9Annotated { ...ImageFieldsLight } } parentalRating { ...ParentalRatingFields } trailers { mp4 webm } upsell { tierId } } fragment MovieFieldsLight on Movie { id slug title genres productionYear isLiveContent productionCountries { name } parentalRating { ...ParentalRatingFields } liveEventEnd { isoString } label { ...LabelFields } images { cover2x3 { ...ImageFieldsFull } main16x9Annotated { ...ImageFieldsLight } } playableUntil { readableDistance(type: DAYS_LEFT) } playableFrom { isoString humanDateTime readableDate } trailers { mp4 webm } upsell { tierId } } fragment LabelFields on Label { id airtime announcement recurringBroadcast } fragment ImageFieldsFull on Image { sourceEncoded meta { muteBgColor { hex } } } fragment ImageFieldsLight on Image { sourceEncoded isFallback } fragment ParentalRatingFields on ParentalRating { finland { ageRestriction reason } sweden { ageRecommendation suitableForChildren } }", "variables": {"input": {"letterFilters": ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"], "limit": 100, "offset": 0}}}
+        self._test_folder_url(url, expected_results=1000, json=data)
 
     def test_lastest_news(self):
         url = "https://client-gateway.tv4.a2d.tv/graphql?operationName=Panel&"
