linting

Author: goggle

lib/menus.py

@@ -45,7 +45,8 @@ def build_main_menu(self, identifiers=[]):
         self.srgssr.log('build_main_menu')
 
         def display_item(item):
-            return item in identifiers and self.srgssr.get_boolean_setting(item)
+            return item in identifiers and \
+                self.srgssr.get_boolean_setting(item)
 
         main_menu_list = [
             {
@@ -123,17 +124,13 @@ def display_item(item):
                 'identifier': f'{self.srgssr.bu.upper()}_YouTube',
                 'name': self.srgssr.plugin_language(30074),
                 'mode': 30,
-                'displayItem': display_item(f'{self.srgssr.bu.upper()}_YouTube'),
+                'displayItem': display_item(
+                    f'{self.srgssr.bu.upper()}_YouTube'),
                 'icon': self.srgssr.get_youtube_icon(),
             }
         ]
-        # folders = []
-        # for ide in identifiers:
-        #     item = next((e for e in main_menu_list if
-        #                  e['identifier'] == ide), None)
-        #     if item:
-        #         folders.append(item)
-        folders = [item for item in main_menu_list if item['identifier'] in identifiers]
+        folders = [item for item in main_menu_list
+                   if item['identifier'] in identifiers]
         self.build_folder_menu(folders)
 
     def build_folder_menu(self, folders):
@@ -177,7 +174,8 @@ def build_menu_apiv3(self, queries, mode=1000, page=1, page_hash=None,
             # Build a combined and sorted list for several queries
             items = []
             for query in queries:
-                data = json.loads(self.srgssr.open_url(self.srgssr.apiv3_url + query))
+                data = json.loads(
+                    self.srgssr.open_url(self.srgssr.apiv3_url + query))
                 if data:
                     data = utils.try_get(data, ['data', 'data'], list, []) or \
                         utils.try_get(data, ['data', 'medias'], list, []) or \
@@ -202,7 +200,8 @@ def build_menu_apiv3(self, queries, mode=1000, page=1, page_hash=None,
             url = f'{self.srgssr.apiv3_url}{queries}{symb}next={cursor}'
             data = json.loads(self.srgssr.open_url(url))
         else:
-            data = json.loads(self.srgssr.open_url(self.srgssr.apiv3_url + queries))
+            data = json.loads(
+                self.srgssr.open_url(self.srgssr.apiv3_url + queries))
         cursor = utils.try_get(data, 'next') or utils.try_get(
             data, ['data', 'next'])
 
@@ -263,7 +262,8 @@ def build_favourite_shows_menu(self):
         Builds a list of folders for the favourite shows.
         """
         self.srgssr.log('build_favourite_shows_menu')
-        self.build_all_shows_menu(favids=self.srgssr.storage_manager.read_favourite_show_ids())
+        self.build_all_shows_menu(
+            favids=self.srgssr.storage_manager.read_favourite_show_ids())
 
     def build_topics_menu(self):
         """
@@ -287,9 +287,7 @@ def build_newest_favourite_menu(self, page=1):
                 list (default: 1)
         """
         self.srgssr.log('build_newest_favourite_menu')
-    
         show_ids = self.srgssr.storage_manager.read_favourite_show_ids()
-
         queries = []
         for sid in show_ids:
             queries.append('videos-by-show-id?showId=' + sid)
@@ -326,7 +324,8 @@ def build_menu_from_page(self, url, path):
             return
         data = utils.try_get(js, path, list, [])
         if not data:
-            self.srgssr.log('build_menu_from_page: Could not find any data in json')
+            self.srgssr.log(
+                'build_menu_from_page: Could not find any data in json')
             return
         for elem in data:
             try:
@@ -375,19 +374,21 @@ def build_episode_menu(self, video_id_or_urn, include_segments=True,
         segment_option   -- Which segment option to use.
                             (default: False)
         """
-        self.srgssr.log(f'build_episode_menu, video_id_or_urn = {video_id_or_urn}')
+        self.srgssr.log(
+            f'build_episode_menu, video_id_or_urn = {video_id_or_urn}')
         if ':' in video_id_or_urn:
             json_url = 'https://il.srgssr.ch/integrationlayer/2.0/' \
                        f'mediaComposition/byUrn/{video_id_or_urn}.json'
             video_id = video_id_or_urn.split(':')[-1]
         else:
-            json_url = f'https://il.srgssr.ch/integrationlayer/2.0/{self.srgssr.bu}' \
-                       f'/mediaComposition/video/{video_id_or_urn}' \
-                        '.json'
+            json_url = f'https://il.srgssr.ch/integrationlayer/2.0/' \
+                       f'{self.srgssr.bu}/mediaComposition/video/' \
+                       f'{video_id_or_urn}.json'
             video_id = video_id_or_urn
         self.srgssr.log(f'build_episode_menu. Open URL {json_url}')
 
-        # TODO: we might not want to catch this error (error is better than empty menu)
+        # TODO: we might not want to catch this error
+        # (error is better than empty menu)
         try:
             json_response = json.loads(self.srgssr.open_url(json_url))
         except Exception:
@@ -551,8 +552,8 @@ def build_menu_by_urn(self, urn):
         elif 'topic' in urn:
             self.build_menu_from_page(
                 self.srgssr.playtv_url, ('state', 'loaderData', 'play-now',
-                                  'initialData', 'pacPageConfigs',
-                                  'topicPages', urn, 'sections'))
+                                         'initialData', 'pacPageConfigs',
+                                         'topicPages', urn, 'sections'))
 
     def build_entry(self, json_entry, is_folder=False,
                     fanart=None, urn=None, show_image_url=None,
@@ -690,15 +691,18 @@ def folder_name(dato):
         for i in range(number_of_days):
             dato = current_date + datetime.timedelta(-i)
             list_item = xbmcgui.ListItem(label=folder_name(dato))
-            list_item.setArt({'thumb': self.srgssr.icon, 'fanart': self.srgssr.fanart})
+            list_item.setArt(
+                {'thumb': self.srgssr.icon, 'fanart': self.srgssr.fanart})
             name = dato.strftime('%d-%m-%Y')
             purl = self.srgssr.build_url(mode=24, name=name)
             xbmcplugin.addDirectoryItem(
                 handle=self.handle, url=purl,
                 listitem=list_item, isFolder=True)
 
-        choose_item = xbmcgui.ListItem(label=self.srgssr.language(30071))  # Choose date
-        choose_item.setArt({'thumb': self.srgssr.icon, 'fanart': self.srgssr.fanart})
+        choose_item = xbmcgui.ListItem(
+            label=self.srgssr.language(30071))  # Choose date
+        choose_item.setArt(
+            {'thumb': self.srgssr.icon, 'fanart': self.srgssr.fanart})
         purl = self.srgssr.build_url(mode=25)
         xbmcplugin.addDirectoryItem(
             handle=self.handle, url=purl,
@@ -825,7 +829,8 @@ def build_search_menu(self):
                 continue
             list_item = xbmcgui.ListItem(label=item['name'])
             list_item.setProperty('IsPlayable', 'false')
-            list_item.setArt({'thumb': item['icon'], 'fanart': self.srgssr.fanart})
+            list_item.setArt(
+                {'thumb': item['icon'], 'fanart': self.srgssr.fanart})
             url = self.srgssr.build_url(item['mode'])
             xbmcplugin.addDirectoryItem(
                 handle=self.handle, url=url, listitem=list_item, isFolder=True)
@@ -834,7 +839,8 @@ def build_recent_search_menu(self):
         """
         Lists folders for the most recent searches.
         """
-        recent_searches = self.srgssr.storage_manager.read_searches(self.srgssr.fname_media_searches)
+        recent_searches = self.srgssr.storage_manager.read_searches(
+            self.srgssr.fname_media_searches)
         mode = 28
         for search in recent_searches:
             list_item = xbmcgui.ListItem(label=search)
@@ -857,8 +863,8 @@ def build_search_media_menu(self, mode=28, name='', page=1, page_hash=''):
         page_hash  -- the page hash when coming from a previous page
                       (default: '')
         """
-        self.srgssr.log(f'build_search_media_menu, mode = {mode}, name = {name}, \
-            page = {page}, page_hash = {page_hash}')
+        self.srgssr.log(f'build_search_media_menu, mode = {mode}, \
+            name = {name}, page = {page}, page_hash = {page_hash}')
         media_type = 'video'
         if name:
             # `name` is provided by `next_page` folder or
@@ -875,11 +881,12 @@ def build_search_media_menu(self, mode=28, name='', page=1, page_hash=''):
             if not query_string:
                 self.srgssr.log('build_search_media_menu: No input provided')
                 return
-            
-            self.srgssr.storage_manager.write_search(self.srgssr.fname_media_searches, query_string)
+
+            self.srgssr.storage_manager.write_search(
+                self.srgssr.fname_media_searches, query_string)
             query_string = quote_plus(query_string)
             query = f'search/media?searchTerm={query_string}'
 
         query = f'{query}&mediaType={media_type}&includeAggregations=false'
         cursor = page_hash if page_hash else ''
-        return self.build_menu_apiv3(query, page_hash=cursor)
+        return self.build_menu_apiv3(query, page_hash=cursor)

lib/play.py

@@ -28,6 +28,7 @@
 
 import utils
 
+
 class Player:
     """Handles playback logic for the SRGSSR plugin."""
     def __init__(self, srgssr_instance):
@@ -47,9 +48,10 @@ def play_video(self, media_id_or_urn):
         else:
             # TODO: Could fail for livestreams
             media_type = 'video'
-            urn = 'urn:' + self.srgssr.bu + ':' + media_type + ':' + media_id_or_urn
+            urn = f'urn:{self.srgssr.bu}:{media_type}:{media_id_or_urn}'
             media_id = media_id_or_urn
-        self.srgssr.log('play_video, urn = ' + urn + ', media_id = ' + media_id)
+        self.srgssr.log(
+            'play_video, urn = ' + urn + ', media_id = ' + media_id)
 
         detail_url = ('https://il.srgssr.ch/integrationlayer/2.0/'
                       'mediaComposition/byUrn/' + urn)
@@ -59,7 +61,8 @@ def play_video(self, media_id_or_urn):
         chapter_list = utils.try_get(
             json_response, 'chapterList', data_type=list, default=[])
         if not chapter_list:
-            self.srgssr.log('play_video: no stream URL found (chapterList empty).')
+            self.srgssr.log(
+                'play_video: no stream URL found (chapterList empty).')
             return
 
         first_chapter = utils.try_get(
@@ -70,7 +73,8 @@ def play_video(self, media_id_or_urn):
         resource_list = utils.try_get(
             chapter, 'resourceList', data_type=list, default=[])
         if not resource_list:
-            self.srgssr.log('play_video: no stream URL found. (resourceList empty)')
+            self.srgssr.log(
+                'play_video: no stream URL found. (resourceList empty)')
             return
 
         stream_urls = {
@@ -196,4 +200,4 @@ def play_drm(self, urn, title, resource_list):
         play_item.setProperty(f'{ia}.manifest_type', manifest_type)
         play_item.setProperty(f'{ia}.license_type', drm)
         play_item.setProperty(f'{ia}.license_key', lic_key)
-        xbmcplugin.setResolvedUrl(self.handle, True, play_item)
+        xbmcplugin.setResolvedUrl(self.handle, True, play_item)

lib/srgssr.py

@@ -177,7 +177,8 @@ def open_url(self, url, use_cache=True):
                      Kodi module SimpleCache should be used (default: True)
         """
         self.log('open_url, url = ' + str(url))
-        cache_response = self.cache.get(f'{ADDON_NAME}.open_url, url = {url}') if use_cache else None
+        cache_response = self.cache.get(
+            f'{ADDON_NAME}.open_url, url = {url}') if use_cache else None
         if not cache_response:
             headers = {
                 'User-Agent': ('Mozilla/5.0 (X11; Linux x86_64; rv:136.0) '
@@ -232,7 +233,7 @@ def get_auth_url(self, url, segment_data=None):
         if auth_params:
             url += ('?' if '?' not in url else '&') + auth_params
         return url
-    
+
     def get_subtitles(self, url, name):
         """
         Returns subtitles from an url

lib/storage.py

@@ -26,7 +26,8 @@ class StorageManager:
     """Manages file I/O operations for the SRGSSR plugin."""
     def __init__(self, srgssr_instance):
         self.srgssr = srgssr_instance
-        self.profile_path = xbmcvfs.translatePath(self.srgssr.real_settings.getAddonInfo('profile'))
+        self.profile_path = xbmcvfs.translatePath(
+            self.srgssr.real_settings.getAddonInfo('profile'))
 
     def read_favourite_show_ids(self):
         """
@@ -43,8 +44,9 @@ def read_favourite_show_ids(self):
                 try:
                     return [entry['id'] for entry in json_file]
                 except KeyError:
-                    self.srgssr.log('Unexpected file structure '
-                             f'for {self.srgssr.fname_favourite_shows}.')
+                    self.srgssr.log(
+                        'Unexpected file structure '
+                        f'for {self.srgssr.fname_favourite_shows}.')
                     return []
         except (IOError, TypeError):
             return []
@@ -58,7 +60,8 @@ def write_favourite_show_ids(self, show_ids):
         show_ids -- a list of show ids (as strings)
         """
         show_ids_dict_list = [{'id': show_id} for show_id in show_ids]
-        file_path = os.path.join(self.profile_path, self.srgssr.fname_favourite_shows)
+        file_path = os.path.join(
+            self.profile_path, self.srgssr.fname_favourite_shows)
         if not os.path.exists(self.profile_path):
             os.makedirs(self.profile_path)
         with open(file_path, 'w') as f:
@@ -91,4 +94,4 @@ def write_search(self, filename, name, max_entries=10):
         if not os.path.exists(self.profile_path):
             os.makedirs(self.profile_path)
         with open(file_path, 'w') as f:
-            json.dump(write_dict_list, f)
+            json.dump(write_dict_list, f)

lib/youtube.py

@@ -40,7 +40,8 @@ def _read_youtube_channels(self, fname):
         Keyword arguments:
         fname  -- the path to the file to be read
         """
-        data_file = os.path.join(xbmcvfs.translatePath(self.srgssr.data_uri), fname)
+        data_file = os.path.join(
+            xbmcvfs.translatePath(self.srgssr.data_uri), fname)
         with open(data_file, 'r', encoding='utf-8') as f:
             ch_content = json.load(f)
             cids = [elem['channel'] for elem in ch_content.get('channels', [])]
@@ -94,8 +95,9 @@ def build_youtube_channel_overview_menu(self, mode):
         """
         channel_ids = self.get_youtube_channel_ids()
         youtube_channels.YoutubeChannels(
-            self.handle, channel_ids,
-            self.srgssr.addon_id, self.srgssr.debug).build_channel_overview_menu()
+                self.handle, channel_ids,
+                self.srgssr.addon_id, self.srgssr.debug
+            ).build_channel_overview_menu()
 
     def build_youtube_channel_menu(self, cid, mode, page=1, page_token=''):
         """
@@ -124,7 +126,8 @@ def build_youtube_channel_menu(self, cid, mode, page=1, page_token=''):
             self.srgssr.addon_id, self.srgssr.debug).build_channel_menu(
                 cid, page_token=page_token)
         if next_page_token:
-            next_item = xbmcgui.ListItem(label='>> ' + self.srgssr.language(30073))
+            next_item = xbmcgui.ListItem(
+                label='>> ' + self.srgssr.language(30073))
             next_url = self.srgssr.build_url(
                 mode=mode, name=cid, page_hash=next_page_token)
             next_item.setProperty('IsPlayable', 'false')
@@ -148,12 +151,13 @@ def build_youtube_newest_videos_menu(self, mode, page=1):
 
         channel_ids = self.get_youtube_channel_ids()
         next_page = youtube_channels.YoutubeChannels(
-            self.handle, channel_ids,
-            self.srgssr.addon_id, self.srgssr.debug).build_newest_videos(page=page)
+                self.handle, channel_ids,
+                self.srgssr.addon_id, self.srgssr.debug
+            ).build_newest_videos(page=page)
         if next_page:
-            next_item = xbmcgui.ListItem(label='>> ' + self.srgssr.language(30073))
+            next_item = xbmcgui.ListItem(
+                label='>> ' + self.srgssr.language(30073))
             next_url = self.srgssr.build_url(mode=mode, page=next_page)
             next_item.setProperty('IsPlayable', 'false')
             xbmcplugin.addDirectoryItem(
                 self.handle, next_url, next_item, isFolder=True)
-