Working categories. still not really usable

scripts/cast

@@ -12,7 +12,8 @@ from vlc import Instance
 
 from Channel import SVT
 from ChannelProvider import ChannelProvider
-from Utils import make_bitmap_from_file, make_sized_button
+from Utils import (get_all_svt_categories, make_bitmap_from_file,
+                   make_sized_button)
 
 WIDTH = int(720 / 2)
 HEIGHT = int(1440 / 2)
@@ -28,6 +29,7 @@ FLAGS.Center()
 
 
 class Cast(wx.Frame):
+
     def __init__(self, *args, **kw):
         """__init__.
         :param args:
@@ -35,7 +37,7 @@ class Cast(wx.Frame):
         """
         self.m_mode = 'normal'
         self.asset_path: str = '/usr/share/cast'
-        url = None 
+        url = None
         if "url" in kw:
             self.m_mode = 'single'
             url = kw['url']
@@ -91,9 +93,9 @@ class Cast(wx.Frame):
                                  size=(WIDTH / 4, BTN_HEIGHT))
 
         stop_button = wx.Button(self.m_panel,
-                                      -1,
-                                      "Stop",
-                                      size=(WIDTH / 4, BTN_HEIGHT))
+                                -1,
+                                "Stop",
+                                size=(WIDTH / 4, BTN_HEIGHT))
         if self.m_mode == 'normal':
             back_button = wx.Button(self.m_panel,
                                     -1,
@@ -106,9 +108,9 @@ class Cast(wx.Frame):
             )
         else:
             back_button = wx.Button(self.m_panel,
-                         -1,
-                         label="Close",
-                         size=(WIDTH / 4, BTN_HEIGHT))
+                                    -1,
+                                    label="Close",
+                                    size=(WIDTH / 4, BTN_HEIGHT))
             back_button.Bind(wx.EVT_BUTTON, lambda event: self.Destroy())
         inner_sizer.Add(play_button, FLAGS)
         inner_sizer.Add(pause_button, FLAGS)
@@ -117,7 +119,8 @@ class Cast(wx.Frame):
 
         if not self.m_chromecast_thr.is_alive(
         ) and not self.m_selected_chromecast:
-            btm = make_bitmap_from_file('{}/assets/Cast.png'.format(self.asset_path), wx.Size(24,24))
+            btm = make_bitmap_from_file(
+                '{}/assets/Cast.png'.format(self.asset_path), wx.Size(24, 24))
             cast_button = wx.BitmapButton(self.m_panel,
                                           -1,
                                           bitmap=btm,
@@ -129,7 +132,6 @@ class Cast(wx.Frame):
             )
             inner_sizer.Add(cast_button, FLAGS)
 
-
         if self.m_selected_chromecast:
             self.cast(wx.media.EVT_MEDIA_LOADED, uri),
             play_button.Bind(wx.EVT_BUTTON, self.play_cast)
@@ -153,33 +155,31 @@ class Cast(wx.Frame):
     def get_providers(self) -> list[ChannelProvider]:
 
         providers = list()
-        svt = ChannelProvider(
-            "SVT",
-            channels=[
-                SVT.SVT("feed"),
-                SVT.SVT("ch-svt1"),
-                SVT.SVT("ch-svt2"),
-                SVT.SVT("ch-svt24"),
-                SVT.SVT("ch-barnkanalen"),
-                SVT.SVT("ch-kunskapskanalen"),
-                SVT.SVT("allprograms"),
-            ],
-        )
+        channels: list = list()
+        ids = [
+            "feed", "ch-svt1", "ch-svt2", "ch-svt24", "ch-barnkanalen",
+            "ch-kunskapskanalen", "allprograms"
+        ]
+
+        for category in get_all_svt_categories():
+            ids.append(category['id'])
+        for id in ids:
+            channels.append(SVT.SVT(id))
+        svt = ChannelProvider("SVT", channels=channels)
 
         providers.append(svt)
 
         return providers
 
-
     def show_channel_list(self, _, provider_index) -> None:
         self.m_selected_provider_index = provider_index
         self.m_selected_provider = self.m_providers[provider_index]
         self.m_sizer.Clear(delete_windows=True)
         self.m_sizer = wx.BoxSizer(wx.VERTICAL)
         closebtn = wx.Button(self.m_panel,
-                     -1,
-                     label="Close",
-                     size=(WIDTH, BTN_HEIGHT))
+                             -1,
+                             label="Close",
+                             size=(WIDTH, BTN_HEIGHT))
         closebtn.Bind(wx.EVT_BUTTON, lambda event: self.Destroy())
         self.m_sizer.Add(closebtn, 0, wx.ALL, 1)
 
@@ -209,7 +209,11 @@ class Cast(wx.Frame):
         back_callback = lambda event: self.show_channel_list(
             event, self.m_selected_provider_index)
         self.add_back_button(back_callback)
-        if self.m_selected_provider.get_name() == 'SVT' and self.m_selected_channel.get_id() == 'feed':
+        if self.m_selected_provider.get_name(
+        ) == 'SVT' and self.m_selected_channel.get_id() not in [
+                "ch-svt1", "ch-svt2", "ch-svt24", "ch-barnkanalen",
+                "ch-kunskapskanalen"
+        ]:
 
             def refresh_callback(event):
                 self.m_selected_channel.refresh()
@@ -224,9 +228,13 @@ class Cast(wx.Frame):
 
         if self.m_selected_channel.wait():
             with wx.BusyInfo("Please wait, working..."):
+                number_of_waits = 0
                 while self.m_selected_channel.wait():
+                    number_of_waits += 1
                     time.sleep(1)
                     wx.GetApp().Yield()
+                    if number_of_waits > 10:
+                        break
 
         btnindex = 0
         for item in self.m_selected_channel.get_items():  # type: ignore

src/Channel/SVT/__init__.py

@@ -9,7 +9,9 @@ import wx
 
 from Channel import Channel
 from Items import Item
-from Utils import (add_video, get_all_svt_programs, get_svt_id, get_svt_thumbnail, hash_string, make_bitmap_from_url,
+from Utils import (add_video, get_all_svt_categories, get_all_svt_programs,
+                   get_svt_category, get_svt_id, get_svt_thumb_from_id_changed,
+                   get_svt_thumbnail, hash_string, make_bitmap_from_url,
                    resolve_svt_channel, video_exists)
 
 default_rss_url = 'http://www.svtplay.se/rss.xml'
@@ -31,6 +33,9 @@ class SVT(Channel):
         thumbnail: wx.Bitmap = wx.Bitmap()
         published_parsed: datetime = datetime.now()
         video_id = str()
+        categories: dict = dict()
+        for category in get_all_svt_categories():
+            categories[category['id']] = category
 
         if self.m_id == 'feed':
             feed = feedparser.parse(self.get_feed())
@@ -80,17 +85,47 @@ class SVT(Channel):
                 swe_only = "no"
                 if entry['item']['restrictions']['onlyAvailableInSweden']:
                     swe_only = 'yes'
-                description = "{}\nOnly available in Sweden:{}\nType of program:{}".format(title, swe_only, type)
+                description = "{}\nOnly available in Sweden:{}\nType of program:{}".format(
+                    title, swe_only, type)
                 if not resolved_link:
                     continue
                 thumbnail = make_bitmap_from_url(
                     thumbnail_link, wx.Size(int(self.m_screen_width), 150))
+                item = Item(description,
+                            resolved_link,
+                            self.m_provider_name,
+                            published_parsed,
+                            thumbnail,
+                            title,
+                            sort_key=entry['selection_name'])
+                self.m_items.append(item)
+                add_video(video_id, self.m_id, self.m_provider_name,
+                          description, resolved_link, published_parsed,
+                          thumbnail, title, 0)
+        elif self.m_id in categories.keys():
+            entries = get_svt_category(self.m_id)
+            for entry in entries:
+                elem = entry["item"]
+                svt_id = elem["videoSvtId"]
+                resolved_link = self.resolve_link(svt_id)
+                if not resolved_link:
+                    continue
+                title = str(entry['heading'])
+                description = str(entry["description"])
+                published_parsed = datetime.now()
+                thumbnail_link = get_svt_thumb_from_id_changed(
+                    elem['images']["wide"]["id"],
+                    elem['images']["wide"]["changed"],
+                    size=self.m_screen_width)
+                thumbnail = make_bitmap_from_url(
+                    thumbnail_link, wx.Size(int(self.m_screen_width), 150))
                 item = Item(description, resolved_link, self.m_provider_name,
-                            published_parsed, thumbnail, title, sort_key = entry['selection_name'])
+                            published_parsed, thumbnail, title)
                 self.m_items.append(item)
                 add_video(video_id, self.m_id, self.m_provider_name,
                           description, resolved_link, published_parsed,
                           thumbnail, title, 0)
+
         else:
             chan_dict = resolve_svt_channel(self.m_id)
             resolved_link = self.resolve_link(self.m_id)

src/Utils/__init__.py

@@ -68,22 +68,52 @@ def add_video(video_id: str,
 
     con.commit()
 
+def get_svt_thumb_from_id_changed(id: str, changed: str, size: str = "480") -> str:
+    return "https://www.svtstatic.se/image/custom/{}/{}/{}".format(size, id, changed)
+
+def get_all_svt_categories() -> list:
+    categories: list = list()
+    url = "https://www.svtplay.se/kategori"
+    data = get_svt_data(url) 
+    for entry in data:
+        if 'genres' in entry.keys():
+            categories = entry['genres']
+            break
+    return categories
+
+def get_svt_category(category: str) -> list:
+    url = 'https://www.svtplay.se/kategori/{}?tab=all'.format(category)
+    data = get_svt_data(url) 
+    programs = list()    
+    for entry in data:
+      if "categoryPage" in entry.keys():
+          for tab in entry["categoryPage"]["lazyLoadedTabs"]:
+              if "selections" in tab.keys():
+                  for selection in tab["selections"]:
+                      programs += selection['items']
+          break
+    return programs
+
+def get_svt_data(url: str) -> list:
+    result:list = list()
+    res = requests.get(url)
+    soup = BeautifulSoup(res.text, features="lxml") 
+    data = json.loads(soup.find(id="__NEXT_DATA__").string)["props"]["urqlState"]
+    for key in data.keys():
+      result.append(json.loads(data[key]["data"]))
+    return result
 
 def get_all_svt_programs() -> list:
     url = 'https://www.svtplay.se/program'
-
-    res = requests.get(url)
-    soup = BeautifulSoup(res.text, features="lxml")
-    data = json.loads(
-        soup.find(id="__NEXT_DATA__").string)["props"]["urqlState"]
+    data = get_svt_data(url) 
     programs = list()
-    for key in data.keys():
-        temp = json.loads(data[key]["data"])
-        if "programAtillO" in temp.keys():
-            for selection in temp["programAtillO"]["selections"]:
+    for entry in data:
+        if "programAtillO" in entry.keys():
+            for selection in entry["programAtillO"]["selections"]:
                 for item in selection["items"]:
                     item['selection_name'] = selection['name']
                     programs.append(item)
+            break
 
     return programs
 
@@ -321,6 +351,9 @@ def resolve_svt_channel(svt_id: str, path: str = '/usr/share/cast') -> dict:
         },
     }
 
+    for category in get_all_svt_categories():
+        channels[category['id']] = {"name": category["name"], "thumbnail": make_bitmap_from_url(get_svt_thumb_from_id_changed(category['image']['id'], category['image']['changed']))}
+
     return channels[svt_id]