Updated runtime, variuous fix and memery usage improvements

Nokse22 · Sep 26, 2024 · 49d1931 · 49d1931
1 parent 8b0378e
commit 49d1931
Show file tree

Hide file tree

Showing 25 changed files with 170 additions and 154 deletions.
diff --git a/data/ui/pages_ui/page_template.ui b/data/ui/pages_ui/page_template.ui
@@ -15,8 +15,7 @@
         <child>
           <object class="GtkStackPage">
             <property name="child">
-              <object class="GtkSpinner" id="_spinner">
-                <property name="spinning">true</property>
+              <object class="AdwSpinner" id="_spinner">
                 <property name="hexpand">true</property>
                 <property name="vexpand">true</property>
                 <property name="halign">center</property>

diff --git a/data/ui/widgets/card_widget.ui b/data/ui/widgets/card_widget.ui
@@ -3,7 +3,7 @@
 <interface>
   <!-- interface-name card_template.ui -->
   <requires lib="gtk" version="4.6"/>
-  <template class="CardWidget" parent="AdwBreakpointBin">
+  <template class="HTCardWidget" parent="AdwBreakpointBin">
     <property name="css-classes">card-bg</property>
     <property name="hexpand">true</property>
     <property name="halign">center</property>
@@ -71,7 +71,7 @@
               </object>
             </child>
             <child>
-             <object class="LinkLabelWidget" id="track_artist_label">
+             <object class="HTLinkLabelWidget" id="track_artist_label">
                <property name="ellipsize">end</property>
                <property name="max-width-chars">17</property>
                <property name="xalign">0</property>

diff --git a/data/ui/widgets/carousel_widget.ui b/data/ui/widgets/carousel_widget.ui
@@ -4,7 +4,7 @@
   <!-- interface-name carousel.ui -->
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.0"/>
-  <template class="CarouselWidget" parent="GtkBox">
+  <template class="HTCarouselWidget" parent="GtkBox">
     <property name="margin-bottom">12</property>
     <property name="margin-end">12</property>
     <property name="margin-start">12</property>

diff --git a/data/ui/widgets/generic_track_widget.ui b/data/ui/widgets/generic_track_widget.ui
@@ -3,7 +3,7 @@
 <interface>
   <!-- interface-name detailed_track_listing.ui -->
   <requires lib="gtk" version="4.10"/>
-  <template class="GenericTrackWidget" parent="GtkListBoxRow">
+  <template class="HTGenericTrackWidget" parent="GtkListBoxRow">
   <property name="selectable">False</property>
     <child>
   <object class="AdwBreakpointBin">
@@ -40,7 +40,7 @@
           <property name="hexpand">true</property>
 
           <child>
-             <object class="LinkLabelWidget" id="track_album_label">
+             <object class="HTLinkLabelWidget" id="track_album_label">
               <property name="xalign">0</property>
               <property name="ellipsize">3</property>
                <layout>
@@ -80,7 +80,7 @@
           </child>
 
           <child>
-            <object class="LinkLabelWidget" id="artist_label">
+            <object class="HTLinkLabelWidget" id="artist_label">
               <property name="xalign">0</property>
               <property name="ellipsize">3</property>
               <layout>
@@ -122,7 +122,7 @@
           </child>
 
           <child>
-            <object class="LinkLabelWidget" id="artist_label_2">
+            <object class="HTLinkLabelWidget" id="artist_label_2">
               <property name="xalign">0</property>
               <property name="use-markup">true</property>
               <property name="ellipsize">3</property>

diff --git a/data/ui/widgets/queue_widget.ui b/data/ui/widgets/queue_widget.ui
@@ -4,7 +4,7 @@
   <!-- interface-name queue.ui -->
   <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.4"/>
-  <template class="QueueWidget" parent="GtkBox">
+  <template class="HTQueueWidget" parent="GtkBox">
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>

diff --git a/data/ui/widgets/top_hit_widget.ui b/data/ui/widgets/top_hit_widget.ui
@@ -4,7 +4,7 @@
   <!-- interface-name top hits.ui -->
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.0"/>
-  <template class="TopHitWidget" parent="GtkBox">
+  <template class="HTTopHitWidget" parent="GtkBox">
     <property name="margin-bottom">12</property>
     <property name="margin-end">12</property>
     <property name="margin-start">12</property>

diff --git a/data/ui/widgets/tracks_list_widget.ui b/data/ui/widgets/tracks_list_widget.ui
@@ -4,7 +4,7 @@
   <!-- interface-name carousel.ui -->
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.0"/>
-  <template class="TracksListWidget" parent="GtkBox">
+  <template class="HTTracksListWidget" parent="GtkBox">
     <property name="margin-bottom">12</property>
     <property name="margin-end">12</property>
     <property name="margin-start">12</property>

diff --git a/data/ui/window.ui b/data/ui/window.ui
@@ -267,7 +267,6 @@
                                           <property name="hexpand">true</property>
                                           <property name="valign">center</property>
                                           <property name="margin-end">12</property>
-                                          <property name="visible">false</property>
                                           <signal name="clicked" handler="on_new_playlist_button_clicked"/>
                                         </object>
                                       </child>
@@ -403,7 +402,7 @@
                                 </object>
                               </child>
                               <child>
-                                <object class="LinkLabelWidget" id="artist_label">
+                                <object class="HTLinkLabelWidget" id="artist_label">
                                   <property name="xalign">0</property>
                                   <property name="ellipsize">end</property>
                                 </object>
@@ -858,7 +857,7 @@ circular</property>
                     <child>
                       <object class="AdwViewStackPage">
                         <property name="child">
-                          <object class="QueueWidget" id="queue_widget">
+                          <object class="HTQueueWidget" id="queue_widget">
                           </object>
                         </property>
                         <property name="icon-name">view-list-ordered-symbolic</property>

diff --git a/io.github.nokse22.HighTide.json b/io.github.nokse22.HighTide.json
@@ -1,7 +1,7 @@
 {
     "app-id": "io.github.nokse22.HighTide",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "46",
+    "runtime-version": "47",
     "sdk": "org.gnome.Sdk",
     "command": "HighTide",
     "finish-args": [

diff --git a/src/mpris.py b/src/mpris.py
@@ -267,6 +267,9 @@ def _get_status(self):
             return "Paused"
 
     def _on_preset_changed(self, *args):
+        if self.player.playing_track is None:
+            return
+
         self.__metadata["xesam:title"] = GLib.Variant("s", self.player.playing_track.name)
         self.__metadata["xesam:album"] = GLib.Variant("s", self.player.playing_track.album.name)
         self.__metadata["xesam:artist"] = GLib.Variant("as", [self.player.playing_track.artist.name])

diff --git a/src/pages/artist_page.py b/src/pages/artist_page.py
@@ -32,8 +32,8 @@
 from tidalapi.playlist import Playlist
 
 from ..lib import utils
-from ..widgets import CarouselWidget
-from ..widgets import TracksListWidget
+from ..widgets import HTCarouselWidget
+from ..widgets import HTTracksListWidget
 
 import threading
 import requests
@@ -97,11 +97,11 @@ def _th_load_page(self):
 
         builder.get_object("_first_subtitle_label").set_label("Artist")
 
-        tracks_list_widget = TracksListWidget("Top Tracks")
+        tracks_list_widget = HTTracksListWidget("Top Tracks")
         tracks_list_widget.set_function(self.artist.get_top_tracks)
         content_box.append(tracks_list_widget)
 
-        carousel = CarouselWidget("Albums")
+        carousel = HTCarouselWidget("Albums")
         try:
             albums = self.artist.get_albums(limit=10)
             carousel.set_more_function("album", self.artist.get_albums)
@@ -112,7 +112,7 @@ def _th_load_page(self):
                 content_box.append(carousel)
                 carousel.set_items(albums, "album")
 
-        carousel = CarouselWidget("EP & Singles")
+        carousel = HTCarouselWidget("EP & Singles")
         try:
             albums = self.artist.get_albums_ep_singles(limit=10)
             carousel.set_more_function("album", self.artist.get_albums_ep_singles)
@@ -123,7 +123,7 @@ def _th_load_page(self):
                 content_box.append(carousel)
                 carousel.set_items(albums, "album")
 
-        carousel = CarouselWidget("Appears On")
+        carousel = HTCarouselWidget("Appears On")
         try:
             albums = self.artist.get_albums_other(limit=10)
             carousel.set_more_function("album", self.artist.get_albums_other)
@@ -134,7 +134,7 @@ def _th_load_page(self):
                 content_box.append(carousel)
                 carousel.set_items(albums, "album")
 
-        carousel = CarouselWidget("Similar Artists")
+        carousel = HTCarouselWidget("Similar Artists")
         try:
             artists = self.artist.get_similar()
         except Exception as e:

diff --git a/src/pages/from_function_page.py b/src/pages/from_function_page.py
@@ -39,7 +39,7 @@
 import random
 
 from .page import Page
-from ..widgets import CardWidget
+from ..widgets import HTCardWidget
 
 from ..lib import variables
 
@@ -125,7 +125,7 @@ def add_cards(self, new_items):
             self.page_content.append(self.parent)
 
         for index, item in enumerate(new_items):
-            card = CardWidget(item)
+            card = HTCardWidget(item)
             GLib.idle_add(self.parent.append, card)
 
     def on_tracks_row_selected(self, list_box, row):

diff --git a/src/pages/generic_page.py b/src/pages/generic_page.py
@@ -38,8 +38,8 @@
 import random
 
 from .page import Page
-from ..widgets import CarouselWidget
-from ..widgets import TracksListWidget
+from ..widgets import HTCarouselWidget
+from ..widgets import HTTracksListWidget
 
 from ..lib import variables
 
@@ -56,14 +56,14 @@ def _th_load_page(self):
                 continue
             items = []
 
-            carousel = CarouselWidget(category.title)
+            carousel = HTCarouselWidget(category.title)
 
             if isinstance(category.items[0], Track):
-                tracks_list_widget = TracksListWidget(category.title)
+                tracks_list_widget = HTTracksListWidget(category.title)
                 tracks_list_widget.set_tracks_list(category.items)
                 self.page_content.append(tracks_list_widget)
             else:
-                carousel = CarouselWidget(category.title)
+                carousel = HTCarouselWidget(category.title)
                 self.page_content.append(carousel)
 
                 for item in category.items:

diff --git a/src/pages/home_page.py b/src/pages/home_page.py
@@ -39,8 +39,8 @@
 import random
 
 from .page import Page
-from ..widgets import CarouselWidget
-from ..widgets import TracksListWidget
+from ..widgets import HTCarouselWidget
+from ..widgets import HTTracksListWidget
 
 from ..lib import variables
 
@@ -60,11 +60,11 @@ def _th_load_page(self):
                 continue
 
             if isinstance(category.items[0], Track):
-                tracks_list_widget = TracksListWidget(category.title)
+                tracks_list_widget = HTTracksListWidget(category.title)
                 tracks_list_widget.set_tracks_list(category.items)
                 self.page_content.append(tracks_list_widget)
             else:
-                carousel = CarouselWidget(category.title)
+                carousel = HTCarouselWidget(category.title)
                 self.page_content.append(carousel)
 
                 if isinstance(category.items[0], Mix):

diff --git a/src/pages/page.py b/src/pages/page.py
@@ -39,8 +39,8 @@
 import random
 import os
 
-from ..widgets import GenericTrackWidget
-from ..widgets import CardWidget
+from ..widgets import HTGenericTrackWidget
+from ..widgets import HTCardWidget
 
 from ..lib import variables
 
@@ -95,23 +95,23 @@ def _add_content_to_page():
         GLib.idle_add(_add_content_to_page)
 
     def get_album_card(self, item):
-        card = CardWidget(item)
+        card = HTCardWidget(item)
         return card
 
     def get_track_listing(self, track):
-        track_listing = GenericTrackWidget(track, False)
+        track_listing = HTGenericTrackWidget(track, False)
         return track_listing
 
     def get_mix_card(self, item):
-        card = CardWidget(item)
+        card = HTCardWidget(item)
         return card
 
     def get_album_track_listing(self, track):
-        track_listing = GenericTrackWidget(track, True)
+        track_listing = HTGenericTrackWidget(track, True)
         return track_listing
 
     def get_playlist_card(self, playlist):
-        card = CardWidget(playlist)
+        card = HTCardWidget(playlist)
         return card
 
     def on_mix_button_clicked(self, btn, mix):
@@ -219,11 +219,11 @@ def get_artist_page(self, artist):
         variables.navigation_view.push(page)
 
     def get_artist_card(self, item):
-        card = CardWidget(item)
+        card = HTCardWidget(item)
         return card
 
     def get_page_item_card(self, page_item):
-        card = CardWidget(page_item)
+        card = HTCardWidget(page_item)
         return card
 
     def get_page_link_card(self, page_link):

diff --git a/src/pages/search_page.py b/src/pages/search_page.py
@@ -32,8 +32,8 @@
 from tidalapi.playlist import Playlist
 
 from ..lib import utils
-from ..widgets.carousel_widget import CarouselWidget
-from ..widgets.top_hit_widget import TopHitWidget
+from ..widgets.carousel_widget import HTCarouselWidget
+from ..widgets.top_hit_widget import HTTopHitWidget
 
 import threading
 import requests
@@ -63,32 +63,32 @@ def _th_load_page(self):
         # print(query, results)
 
         top_hit = results["top_hit"]
-        top_hit_widget = TopHitWidget(top_hit)
+        top_hit_widget = HTTopHitWidget(top_hit)
         self.page_content.append(top_hit_widget)
         # self.page_content.append(Gtk.Label(label=top_hit.name))
         print(top_hit)
 
         # Adds a carousel with artists, albums and playlists if in the search results
 
-        carousel = CarouselWidget("Artists")
+        carousel = HTCarouselWidget("Artists")
         artists = results["artists"]
         if len(artists) > 0:
             self.page_content.append(carousel)
             carousel.set_items(artists, "artist")
 
-        carousel = CarouselWidget("Albums")
+        carousel = HTCarouselWidget("Albums")
         albums = results["albums"]
         if len(albums) > 0:
             self.page_content.append(carousel)
             carousel.set_items(albums, "album")
 
-        carousel = CarouselWidget("Playlists")
+        carousel = HTCarouselWidget("Playlists")
         playlists = results["playlists"]
         if len(playlists) > 0:
             self.page_content.append(carousel)
             carousel.set_items(playlists, "playlist")
 
-        carousel = CarouselWidget("Tracks")
+        carousel = HTCarouselWidget("Tracks")
         tracks = results["tracks"]
         if len(tracks) > 0:
             self.page_content.append(carousel)

diff --git a/src/widgets/__init__.py b/src/widgets/__init__.py
@@ -1,7 +1,7 @@
-from .card_widget import CardWidget
-from .carousel_widget import CarouselWidget
-from .generic_track_widget import GenericTrackWidget
-from .top_hit_widget import TopHitWidget
-from .tracks_list_widget import TracksListWidget
-from .link_label_widget import LinkLabelWidget
-from .queue_widget import QueueWidget
+from .card_widget import HTCardWidget
+from .carousel_widget import HTCarouselWidget
+from .generic_track_widget import HTGenericTrackWidget
+from .top_hit_widget import HTTopHitWidget
+from .tracks_list_widget import HTTracksListWidget
+from .link_label_widget import HTLinkLabelWidget
+from .queue_widget import HTQueueWidget