From d01a6e38f70b29234311b384e4f6f162b05af287 Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Wed, 29 Jan 2025 17:03:58 +0100
Subject: [PATCH 01/12] Radio changes WIP

---
 src/tauon/t_modules/t_main.py | 189 +++++++++++++++++-----------------
 1 file changed, 93 insertions(+), 96 deletions(-)

diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index a4da674b0..dc41c77ec 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -1636,8 +1636,8 @@ def __init__(self):
 		self.regen_in_progress = False
 		self.notify_in_progress = False
 
-		self.radio_playlists = radio_playlists
-		self.radio_playlist_viewing = radio_playlist_viewing
+		self.radio_playlists: list[RadioPlaylist] = bag.radio_playlists
+		self.radio_playlist_viewing: int = bag.radio_playlist_viewing
 		self.tag_history = {}
 
 		self.commit: int | None = None
@@ -13553,7 +13553,7 @@ def render(self):
 
 		if gui.radio_view:
 			for item in pctl.radio_playlists:
-				le = ddt.get_text_w(item["name"], self.tab_text_font)
+				le = ddt.get_text_w(item.name, self.tab_text_font)
 				self.tab_text_spaces.append(le)
 		else:
 			for i, item in enumerate(pctl.multi_playlist):
@@ -13688,7 +13688,7 @@ def render(self):
 					for tab in reversed(left_overflow):
 						if gui.radio_view:
 							overflow_menu.add(
-								MenuItem(pctl.radio_playlists[tab]["name"], self.left_overflow_switch_playlist,
+								MenuItem(pctl.radio_playlists[tab].name, self.left_overflow_switch_playlist,
 								pass_ref=True, set_ref=tab))
 						else:
 							overflow_menu.add(
@@ -13712,7 +13712,7 @@ def render(self):
 						if gui.radio_view:
 							overflow_menu.add(
 								MenuItem(
-									pctl.radio_playlists[tab]["name"], self.left_overflow_switch_playlist, pass_ref=True, set_ref=tab))
+									pctl.radio_playlists[tab].name, self.left_overflow_switch_playlist, pass_ref=True, set_ref=tab))
 						else:
 							overflow_menu.add(
 								MenuItem(
@@ -13869,8 +13869,8 @@ def render(self):
 						tauon.thread_manager.ready("worker")
 
 				if mouse_up and radio_view.drag:
-					pctl.radio_playlists[i]["items"].append(radio_view.drag)
-					toast(_("Added station to: ") + pctl.radio_playlists[i]["name"])
+					pctl.radio_playlists[i].stations.append(radio_view.drag)
+					toast(_("Added station to: ") + pctl.radio_playlists[i].name)
 
 					radio_view.drag = None
 
@@ -13900,7 +13900,7 @@ def render(self):
 
 		if gui.radio_view:
 			for item in pctl.radio_playlists:
-				le = ddt.get_text_w(item["name"], self.tab_text_font)
+				le = ddt.get_text_w(item.name, self.tab_text_font)
 				self.tab_text_spaces.append(le)
 		else:
 			for i, item in enumerate(pctl.multi_playlist):
@@ -18260,13 +18260,13 @@ def saved(self):
 			elif "http://" in self.radio_field.text or "https://" in self.radio_field.text:
 				radio = self.station_editing
 				if self.add_mode:
-					radio: dict[str, int | str] = {}
-				radio["title"] = self.radio_field_title.text
-				radio["stream_url"] = self.radio_field.text
-				radio["website_url"] = ""
+					radio: RadioStation = RadioStation()
+				radio.title = self.radio_field_title.text
+				radio.stream_url = self.radio_field.text
+				radio.website_url = ""
 
 				if self.add_mode:
-					pctl.radio_playlists[pctl.radio_playlist_viewing]["items"].append(radio)
+					pctl.radio_playlists[pctl.radio_playlist_viewing].stations.append(radio)
 				self.active = False
 
 			else:
@@ -18732,7 +18732,7 @@ def render(self):
 				pass
 			elif len(rename_text_area.text) > 0:
 				if gui.radio_view:
-					pctl.radio_playlists[self.playlist_index]["name"] = rename_text_area.text
+					pctl.radio_playlists[self.playlist_index].name = rename_text_area.text
 				else:
 					pctl.multi_playlist[self.playlist_index].title = rename_text_area.text
 			inp.key_return_press = False
@@ -23223,6 +23223,22 @@ def bk_tracks(self, pl_index: int, indis) -> None:
 	def bk_playtime_transfer(self, fr, fr_s, fr_scr, so, to_s, to_scr) -> None:
 		self.e.append(("ptt", fr, fr_s, fr_scr, so, to_s, to_scr))
 
+@dataclass
+class RadioStation:
+	title: str
+	stream_url: str
+	stream_url_fallback: str
+	country: str
+	website_url: str
+	icon_url: str
+
+@dataclass
+class RadioPlaylist:
+	uid: int
+	name: str
+	scroll: int
+	stations: list[RadioStation]
+
 class GetSDLInput:
 
 	def __init__(self):
@@ -26145,29 +26161,19 @@ def prep_gal():
 			albums.append([index, 0])
 			folder = pctl.master_library[index].parent_folder_name
 
-def add_stations(stations: list[dict[str, int | str]], name: str):
+def add_stations(stations: list[RadioStation], name: str) -> None:
 	if len(stations) == 1:
 		for i, s in enumerate(pctl.radio_playlists):
-			if s["name"] == "Default":
-				s["items"].insert(0, stations[0])
-				s["scroll"] = 0
+			if s.name == "Default":
+				s.stations.insert(0, stations[0])
+				s.scroll = 0
 				pctl.radio_playlist_viewing = i
 				break
 		else:
-			r = {}
-			r["uid"] = uid_gen()
-			r["name"] = "Default"
-			r["items"] = stations
-			r["scroll"] = 0
-			pctl.radio_playlists.append(r)
+			pctl.radio_playlists.append(RadioPlaylist(uid=uid_gen(), name="Default", stations=stations, scroll=0))
 			pctl.radio_playlist_viewing = len(pctl.radio_playlists) - 1
 	else:
-		r = {}
-		r["uid"] = uid_gen()
-		r["name"] = name
-		r["items"] = stations
-		r["scroll"] = 0
-		pctl.radio_playlists.append(r)
+		pctl.radio_playlists.append(RadioPlaylist(uid=uid_gen(), name=name, stations=stations, scroll=0))
 		pctl.radio_playlist_viewing = len(pctl.radio_playlists) - 1
 	if not gui.radio_view:
 		enter_radio_view()
@@ -27952,7 +27958,7 @@ def rename_playlist(index, generator: bool = False) -> None:
 		rename_playlist_box.y = gui.panelY + 10 * gui.scale
 
 	if gui.radio_view:
-		rename_text_area.set_text(pctl.radio_playlists[index]["name"])
+		rename_text_area.set_text(pctl.radio_playlists[index].name)
 	else:
 		rename_text_area.set_text(pctl.multi_playlist[index].title)
 	rename_text_area.highlight_all()
@@ -28210,7 +28216,7 @@ def delete_playlist(index: int, force: bool = False, check_lock: bool = False) -
 	if gui.radio_view:
 		del pctl.radio_playlists[index]
 		if not pctl.radio_playlists:
-			pctl.radio_playlists = [{"uid": uid_gen(), "name": "Default", "items": []}]
+			pctl.radio_playlists = [RadioPlaylist(uid=uid_gen(),name ="Default", stations=[])]
 		return
 
 	global default_playlist
@@ -28829,12 +28835,7 @@ def gen_unique_pl_title(base: str, extra: str="", start: int = 1) -> str:
 
 def new_playlist(switch: bool = True) -> int | None:
 	if gui.radio_view:
-		r = {}
-		r["uid"] = uid_gen()
-		r["name"] = _("New Radio List")
-		r["items"] = []  # copy.copy(prefs.radio_urls)
-		r["scroll"] = 0
-		pctl.radio_playlists.append(r)
+		pctl.radio_playlists.append(RadioPlaylist(uid=uid_gen(), name=_("New Radio List"), stations=[], scroll=0))
 		return None
 
 	title = gen_unique_pl_title(_("New Playlist"))
@@ -37300,29 +37301,29 @@ def line_render(n_track: TrackClass, p_track: TrackClass, y, this_line_playing,
 		f_store.recall_all()
 
 # def visit_radio_site_show_test(p):
-# 	return "website_url" in prefs.radio_urls[p] and prefs.radio_urls[p]["website_url"]
+# 	return "website_url" in prefs.radio_urls[p] and prefs.radio_urls[p].["website_url"]
 
-def visit_radio_site_deco(item):
-	if "website_url" in item and item["website_url"]:
+def visit_radio_site_deco(station: RadioStation):
+	if station.website_url is not None:
 		return [colours.menu_text, colours.menu_background, None]
 	return [colours.menu_text_disabled, colours.menu_background, None]
 
-def visit_radio_station_site_deco(item):
-	return visit_radio_site_deco(item[1])
+def visit_radio_station_site_deco(station: RadioStation):
+	return visit_radio_site_deco(station.stream_url)
 
-def visit_radio_site(item):
-	if "website_url" in item and item["website_url"]:
-		webbrowser.open(item["website_url"], new=2, autoraise=True)
+def visit_radio_site(station: RadioStation):
+	if station.website_url is not None:
+		webbrowser.open(station.website_url, new=2, autoraise=True)
 
-def visit_radio_station(item):
-	visit_radio_site(item[1])
+def visit_radio_station(station: RadioStation):
+	visit_radio_site(station.stream_url)
 
 def radio_saved_panel_test(_):
 	return radiobox.tab == 0
 
-def save_to_radios(item):
-	pctl.radio_playlists[pctl.radio_playlist_viewing]["items"].append(item)
-	toast(_("Added station to: ") + pctl.radio_playlists[pctl.radio_playlist_viewing]["name"])
+def save_to_radios(station: RadioStation):
+	pctl.radio_playlists[pctl.radio_playlist_viewing].stations.append(station)
+	toast(_("Added station to: ") + pctl.radio_playlists[pctl.radio_playlist_viewing].name)
 
 def create_artist_pl(artist: str, replace: bool = False):
 	source_pl = pctl.active_playlist_viewing
@@ -37592,19 +37593,19 @@ def add_station():
 	radiobox.station_editing = None
 	radiobox.center = True
 
-def rename_station(item):
+def rename_station(station: list[RadioStation]):
 	station = item[1]
 	radiobox.active = True
 	radiobox.center = False
 	radiobox.edit_mode = True
 	radiobox.add_mode = False
-	radiobox.radio_field.text = station["stream_url"]
-	radiobox.radio_field_title.text = station.get("title", "")
+	radiobox.radio_field.text = station.stream_url
+	radiobox.radio_field_title.text = station.title if station.title is not None else ""
 	radiobox.station_editing = station
 
-def remove_station(item):
-	index = item[0]
-	del pctl.radio_playlists[pctl.radio_playlist_viewing]["items"][index]
+def remove_station(stations: list[RadioStation]):
+	index = station[0]
+	del pctl.radio_playlists[pctl.radio_playlist_viewing].stations[index]
 
 def dismiss_dl():
 	dl_mon.ready.clear()
@@ -39555,45 +39556,41 @@ def drop_file(target: str):
 
 perf_timer.set()
 
-radio_playlists = [{"uid": uid_gen(), "name": "Default", "items": []}]
-
-primary_stations: list[dict[str, str]] = []
-station = {
-	"title": "SomaFM Groove Salad",
-	"stream_url": "https://ice3.somafm.com/groovesalad-128-mp3",
-	"country": "USA",
-	"website_url": "https://somafm.com/groovesalad",
-	"icon": "https://somafm.com/logos/120/groovesalad120.png",
-}
-primary_stations.append(station)
-station = {
-	"title": "SomaFM PopTron",
-	"stream_url": "https://ice3.somafm.com/poptron-128-mp3",
-	"country": "USA",
-	"website_url": "https://somafm.com/poptron/",
-	"icon": "https://somafm.com/logos/120/poptron120.jpg",
-}
-primary_stations.append(station)
-station = {
-	"title": "SomaFM Vaporwaves",
-	"stream_url": "https://ice4.somafm.com/vaporwaves-128-mp3",
-	"country": "USA",
-	"website_url": "https://somafm.com/vaporwaves",
-	"icon": "https://somafm.com/img3/vaporwaves400.png",
-}
-primary_stations.append(station)
-
-station = {
-	"title": "DKFM Shoegaze Radio",
-	"stream_url": "https://kathy.torontocast.com:2005/stream",
-	"country": "Canada",
-	"website_url": "https://decayfm.com",
-	"icon": "https://cdn-profiles.tunein.com/s193842/images/logod.png",
-}
-primary_stations.append(station)
-
-for item in primary_stations:
-	radio_playlists[0]["items"].append(item)
+radio_playlists: list[RadioPlaylist] = [RadioPlayList(uid=uid_gen(), name="Default", stations=[])]
+# radio_playlists: list[dict[str, int | str | list[dict[str, str]]]]
+
+primary_stations: list[RadioStation] = []
+
+primary_stations.append(RadioStation(
+	title="SomaFM Groove Salad",
+	stream_url="https://ice3.somafm.com/groovesalad-128-mp3",
+	country="USA",
+	website_url="https://somafm.com/groovesalad",
+	icon="https://somafm.com/logos/120/groovesalad120.png"))
+
+primary_stations.append(RadioStation(
+	title="SomaFM PopTron",
+	stream_url="https://ice3.somafm.com/poptron-128-mp3",
+	country="USA",
+	website_url="https://somafm.com/poptron/",
+	icon="https://somafm.com/logos/120/poptron120.jpg"))
+
+primary_stations.append(RadioStation(
+	title="SomaFM Vaporwaves",
+	stream_url="https://ice4.somafm.com/vaporwaves-128-mp3",
+	country="USA",
+	website_url="https://somafm.com/vaporwaves",
+	icon="https://somafm.com/img3/vaporwaves400.png"))
+
+rimary_stations.append(RadioStation(
+title="DKFM Shoegaze Radio",
+stream_url="https://kathy.torontocast.com:2005/stream",
+country="Canada",
+website_url="https://decayfm.com",
+icon="https://cdn-profiles.tunein.com/s193842/images/logod.png"))
+
+for station in primary_stations:
+	radio_playlists[0].stations.append(station)
 
 radio_playlist_viewing = 0
 

From 67ce5dfaeaffca912c1f823abbe9d7b32605f3c1 Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Wed, 29 Jan 2025 17:22:55 +0100
Subject: [PATCH 02/12] Fix ups to get it running

---
 src/tauon/t_modules/t_main.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index dc41c77ec..60bdbe396 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -66,6 +66,7 @@
 import zipfile
 from collections import OrderedDict
 from ctypes import Structure, byref, c_char_p, c_double, c_int, c_uint32, c_void_p, pointer
+from dataclasses import dataclass, field
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -1636,8 +1637,8 @@ def __init__(self):
 		self.regen_in_progress = False
 		self.notify_in_progress = False
 
-		self.radio_playlists: list[RadioPlaylist] = bag.radio_playlists
-		self.radio_playlist_viewing: int = bag.radio_playlist_viewing
+		self.radio_playlists: list[RadioPlaylist] = radio_playlists
+		self.radio_playlist_viewing: int = radio_playlist_viewing
 		self.tag_history = {}
 
 		self.commit: int | None = None
@@ -23227,17 +23228,17 @@ def bk_playtime_transfer(self, fr, fr_s, fr_scr, so, to_s, to_scr) -> None:
 class RadioStation:
 	title: str
 	stream_url: str
-	stream_url_fallback: str
 	country: str
 	website_url: str
-	icon_url: str
+	icon: str
+	stream_url_fallback: str = ""
 
 @dataclass
 class RadioPlaylist:
 	uid: int
 	name: str
-	scroll: int
-	stations: list[RadioStation]
+	scroll: int = 0
+	stations: list[RadioStation] = field(default_factory=list)
 
 class GetSDLInput:
 
@@ -39556,7 +39557,7 @@ def drop_file(target: str):
 
 perf_timer.set()
 
-radio_playlists: list[RadioPlaylist] = [RadioPlayList(uid=uid_gen(), name="Default", stations=[])]
+radio_playlists: list[RadioPlaylist] = [RadioPlaylist(uid=uid_gen(), name="Default", stations=[])]
 # radio_playlists: list[dict[str, int | str | list[dict[str, str]]]]
 
 primary_stations: list[RadioStation] = []
@@ -39582,12 +39583,12 @@ def drop_file(target: str):
 	website_url="https://somafm.com/vaporwaves",
 	icon="https://somafm.com/img3/vaporwaves400.png"))
 
-rimary_stations.append(RadioStation(
-title="DKFM Shoegaze Radio",
-stream_url="https://kathy.torontocast.com:2005/stream",
-country="Canada",
-website_url="https://decayfm.com",
-icon="https://cdn-profiles.tunein.com/s193842/images/logod.png"))
+primary_stations.append(RadioStation(
+	title="DKFM Shoegaze Radio",
+	stream_url="https://kathy.torontocast.com:2005/stream",
+	country="Canada",
+	website_url="https://decayfm.com",
+	icon="https://cdn-profiles.tunein.com/s193842/images/logod.png"))
 
 for station in primary_stations:
 	radio_playlists[0].stations.append(station)

From cde7fc77891c45f308d0c8e60fc532abe019b85e Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Wed, 29 Jan 2025 18:02:09 +0100
Subject: [PATCH 03/12] Add migrations

---
 src/tauon/t_modules/t_db_migrate.py | 30 +++++++++++++++++--
 src/tauon/t_modules/t_extra.py      | 17 ++++++++++-
 src/tauon/t_modules/t_main.py       | 45 ++++++++++++-----------------
 3 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/src/tauon/t_modules/t_db_migrate.py b/src/tauon/t_modules/t_db_migrate.py
index 6945bef7b..93793a518 100644
--- a/src/tauon/t_modules/t_db_migrate.py
+++ b/src/tauon/t_modules/t_db_migrate.py
@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from tauon.t_modules.t_extra import TauonPlaylist, TauonQueueItem
+from tauon.t_modules.t_extra import RadioPlaylist, RadioStation, TauonPlaylist, TauonQueueItem
 
 if TYPE_CHECKING:
 	from tauon.t_modules.t_main import GuiVar, Prefs, StarStore, TrackClass
@@ -28,7 +28,7 @@ def database_migrate(
 	gui: GuiVar,
 	gen_codes: dict[int, str],
 	prefs: Prefs,
-	radio_playlists: list[TauonPlaylist],
+	radio_playlists: list[dict[str, int | str | list[dict[str, str]]]] | list[RadioPlaylist],
 	p_force_queue: list | list[TauonQueueItem],
 	theme: int,
 ) -> tuple[
@@ -40,7 +40,7 @@ def database_migrate(
 	Prefs,
 	GuiVar,
 	dict[int, str],
-	list[TauonPlaylist]]:
+	list[RadioPlaylist]]:
 	"""Migrate database to a newer version if we're behind
 
 	Returns all the objects that could've been possibly changed:
@@ -543,4 +543,28 @@ def database_migrate(
 		multi_playlist = new_multi_playlist
 		p_force_queue = new_queue
 
+	if db_version <= 69:
+		logging.info("Updating database to version 69")
+		new_radio_playlists: list[RadioPlaylist] = []
+		for playlist in radio_playlists:
+			stations: list[RadioStation] = []
+
+			for station in playlist["items"]:
+				stations.append(
+					RadioStation(
+						title=station["title"],
+						stream_url=station["stream_url"],
+						country=station["country"],
+						website_url=station["website_url"],
+						icon=station["icon"],
+						stream_url_fallback=station["stream_url_unresolved"] if "stream_url_unresolved" in station else ""))
+			new_radio_playlists.append(
+				RadioPlaylist(
+					uid=playlist["uid"],
+					name=playlist["name"],
+					scroll=playlist["scroll"] if "scroll" in playlist else 0,
+					stations=stations))
+		radio_playlists = new_radio_playlists
+
+
 	return master_library, multi_playlist, star_store, p_force_queue, theme, prefs, gui, gen_codes, radio_playlists
diff --git a/src/tauon/t_modules/t_extra.py b/src/tauon/t_modules/t_extra.py
index e184b44b0..d027383ca 100644
--- a/src/tauon/t_modules/t_extra.py
+++ b/src/tauon/t_modules/t_extra.py
@@ -35,7 +35,7 @@
 import time
 import urllib.parse
 import zipfile
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
 
 from gi.repository import GLib
@@ -45,6 +45,21 @@
 
 	from tauon.t_modules.t_main import TrackClass
 
+@dataclass
+class RadioStation:
+	title: str
+	stream_url: str
+	country: str
+	website_url: str
+	icon: str
+	stream_url_fallback: str = ""
+
+@dataclass
+class RadioPlaylist:
+	uid: int
+	name: str
+	scroll: int = 0
+	stations: list[RadioStation] = field(default_factory=list)
 
 @dataclass
 class TauonQueueItem:
diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index 60bdbe396..9dec1ed3f 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -274,6 +274,8 @@
 	TauonQueueItem,
 	TestTimer,
 	Timer,
+	RadioPlaylist,
+	RadioStation,
 	alpha_blend,
 	alpha_mod,
 	archive_file_scan,
@@ -23224,22 +23226,6 @@ def bk_tracks(self, pl_index: int, indis) -> None:
 	def bk_playtime_transfer(self, fr, fr_s, fr_scr, so, to_s, to_scr) -> None:
 		self.e.append(("ptt", fr, fr_s, fr_scr, so, to_s, to_scr))
 
-@dataclass
-class RadioStation:
-	title: str
-	stream_url: str
-	country: str
-	website_url: str
-	icon: str
-	stream_url_fallback: str = ""
-
-@dataclass
-class RadioPlaylist:
-	uid: int
-	name: str
-	scroll: int = 0
-	stations: list[RadioStation] = field(default_factory=list)
-
 class GetSDLInput:
 
 	def __init__(self):
@@ -38309,19 +38295,15 @@ def save_state() -> None:
 	view_prefs["append-date"] = prefs.append_date
 
 	tauonplaylist_jar = []
+	radioplaylist_jar = []
 	tauonqueueitem_jar = []
-	#if db_version > 68:
+	trackclass_jar = []
 	for v in pctl.multi_playlist:
-	#	logging.warning(f"Playlist: {v}")
 		tauonplaylist_jar.append(v.__dict__)
+	for v in pctl.radio_playlists:
+		radioplaylist_jar.append(v.__dict__)
 	for v in pctl.force_queue:
-	#	logging.warning(f"Queue: {v}")
 		tauonqueueitem_jar.append(v.__dict__)
-	#else:
-	#	tauonplaylist_jar = pctl.multi_playlist
-	#	tauonqueueitem_jar = pctl.track_queue
-
-	trackclass_jar = []
 	for v in pctl.master_library.values():
 		trackclass_jar.append(v.__dict__)
 
@@ -38491,7 +38473,7 @@ def save_state() -> None:
 		trackclass_jar,
 		prefs.premium,
 		gui.radio_view,
-		pctl.radio_playlists,
+		radioplaylist_jar, # pctl.radio_playlists,
 		pctl.radio_playlist_viewing,
 		prefs.radio_thumb_bans,
 		prefs.playlist_exports,
@@ -39458,7 +39440,7 @@ def drop_file(target: str):
 
 folder_image_offsets: dict[str, int] = {}
 db_version: float = 0.0
-latest_db_version: float = 69
+latest_db_version: float = 70
 
 albums = []
 album_position = 0
@@ -39961,7 +39943,14 @@ def drop_file(target: str):
 		if save[164] is not None:
 			gui.restore_radio_view = save[164]
 		if save[165] is not None:
-			radio_playlists = save[165]
+			if db_version > 69:
+				radio_playlists = []
+				radioplaylist_jar = save[165]
+				for d in radioplaylist_jar:
+					nt = RadioPlaylist(**d)
+					radio_playlists.append(nt)
+			else:
+				radio_playlists = save[165]
 		if save[166] is not None:
 			radio_playlist_viewing = save[166]
 		if save[167] is not None:
@@ -40052,8 +40041,10 @@ def drop_file(target: str):
 		)
 	except ValueError:
 		logging.exception("That should not happen")
+		sys.exit(42)
 	except Exception:
 		logging.exception("Unknown error running database migration!")
+		sys.exit(42)
 
 playing_in_queue = min(playing_in_queue, len(track_queue) - 1)
 

From 2d4cc53ed364e97e771f51637261a3781b76008a Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Wed, 29 Jan 2025 19:04:12 +0100
Subject: [PATCH 04/12] Convert more code

---
 src/tauon/t_modules/t_main.py | 289 ++++++++++++++++------------------
 1 file changed, 138 insertions(+), 151 deletions(-)

diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index 9dec1ed3f..4cd21badf 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -13978,7 +13978,7 @@ def render(self):
 
 			# Draw tab text
 			if gui.radio_view:
-				text = tab["name"]
+				text = tab.name
 			else:
 				text = tab.title
 			ddt.text((x + self.tab_text_start_space, y + self.tab_text_y_offset), text, fg, self.tab_text_font, bg=bg)
@@ -17734,8 +17734,8 @@ def extract_stream_m3u(self, url, recursion_limit=5):
 			logging.exception("Failed to extract M3U")
 			return None
 
-	def start(self, item):
-		url = item["stream_url"]
+	def start(self, station: RadioStation):
+		url = station.stream_url
 		logging.info("Start radio")
 		logging.info(url)
 		if self.is_m3u(url):
@@ -17751,14 +17751,12 @@ def start(self, item):
 		if tauon.spot_ctl.playing or tauon.spot_ctl.coasting:
 			tauon.spot_ctl.control("stop")
 
-		try:
+		if self.websocket:
 			self.websocket.close()
 			logging.info("Websocket closed")
-		except Exception:
-			logging.exception("No socket to close?")
 
 		self.playing_title = ""
-		self.playing_title = item["title"]
+		self.playing_title = station.title
 		self.dummy_track.art_url_key = ""
 		self.dummy_track.title = ""
 		self.dummy_track.artist = ""
@@ -17785,7 +17783,7 @@ def start(self, item):
 		# pctl.url = url
 		pctl.url = f"http://127.0.0.1:{7812}"
 		if not self.run_proxy:
-			pctl.url = item["stream_url"]
+			pctl.url = station.stream_url
 		self.loaded_url = None
 		pctl.tag_meta = ""
 		pctl.radio_meta_on = ""
@@ -17793,7 +17791,7 @@ def start(self, item):
 		self.song_key = ""
 		pctl.playing_time = 0
 		pctl.decode_time = 0
-		self.loaded_station = item
+		self.loaded_station = station
 
 		if tauon.stream_proxy.download_running:
 			tauon.stream_proxy.abort = True
@@ -17805,7 +17803,7 @@ def start(self, item):
 		shoot.daemon = True
 		shoot.start()
 
-	def start2(self, url):
+	def start2(self, url: str):
 
 		if self.run_proxy and not tauon.stream_proxy.start_download(url):
 			self.load_failed_timer.set()
@@ -17925,28 +17923,25 @@ def run(*args):
 
 			# websocket.enableTrace(True)
 			#logging.info(wss)
-			ws = websocket.WebSocketApp(wss,
-										on_message=on_message,
-										on_error=on_error)
+			ws = websocket.WebSocketApp(wss, on_message=on_message, on_error=on_error)
 			ws.on_open = on_open
 			self.websocket = ws
 			shoot = threading.Thread(target=ws.run_forever)
 			shoot.daemon = True
 			shoot.start()
 
-	def delete_radio_entry(self, item):
+	def delete_radio_entry(self, station: RadioStation) -> None:
 		for i, saved in enumerate(prefs.radio_urls):
-			if saved["stream_url"] == item["stream_url"] and saved["title"] == item["title"]:
+			if saved.stream_url == station.stream_url and saved.title == station.title:
 				del prefs.radio_urls[i]
 
-	def delete_radio_entry_after(self, item):
+	def delete_radio_entry_after(self, station) -> None:
 		p = radiobox.right_clicked_station_p
 		del prefs.radio_urls[p + 1:]
 
-	def edit_entry(self, item):
-		radio = item
-		self.radio_field_title.text = radio["title"]
-		self.radio_field.text = radio["stream_url"]
+	def edit_entry(self, station: RadioStation) -> None:
+		self.radio_field_title.text = station.title
+		self.radio_field.text = station.stream_url
 
 	def browser_get_hosts(self):
 
@@ -18020,56 +18015,55 @@ def search_page(self):
 			if draw.button(_("Developer Picks"), x + ww + round(35 * gui.scale), yy + round(30 * gui.scale), press=gui.level_2_click):
 				self.temp_list.clear()
 
-				radio = {}
-				radio["title"] = "Nightwave Plaza"
-				radio["stream_url_unresolved"] = "https://radio.plaza.one/ogg"
-				radio["stream_url"] = "https://radio.plaza.one/ogg"
-				radio["website_url"] = "https://plaza.one/"
-				radio["icon"] = "https://plaza.one/icons/apple-touch-icon.png"
-				radio["country"] = "Japan"
-				self.temp_list.append(radio)
-
-				radio = {}
-				radio["title"] = "Gensokyo Radio"
-				radio["stream_url_unresolved"] = " https://stream.gensokyoradio.net/GensokyoRadio-enhanced.m3u"
-				radio["stream_url"] = "https://stream.gensokyoradio.net/1"
-				radio["website_url"] = "https://gensokyoradio.net/"
-				radio["icon"] = "https://gensokyoradio.net/favicon.ico"
-				radio["country"] = "Japan"
-				self.temp_list.append(radio)
-
-				radio = {}
-				radio["title"] = "Listen.moe | Jpop"
-				radio["stream_url_unresolved"] = "https://listen.moe/stream"
-				radio["stream_url"] = "https://listen.moe/stream"
-				radio["website_url"] = "https://listen.moe/"
-				radio["icon"] = "https://avatars.githubusercontent.com/u/26034028?s=200&v=4"
-				radio["country"] = "Japan"
-				self.temp_list.append(radio)
-
-				radio = {}
-				radio["title"] = "Listen.moe | Kpop"
-				radio["stream_url_unresolved"] = "https://listen.moe/kpop/stream"
-				radio["stream_url"] = "https://listen.moe/kpop/stream"
-				radio["website_url"] = "https://listen.moe/"
-				radio["icon"] = "https://avatars.githubusercontent.com/u/26034028?s=200&v=4"
-				radio["country"] = "Korea"
-
-				self.temp_list.append(radio)
-
-				radio = {}
-				radio["title"] = "HBR1 Dream Factory | Ambient"
-				radio["stream_url_unresolved"] = "http://radio.hbr1.com:19800/ambient.ogg"
-				radio["stream_url"] = "http://radio.hbr1.com:19800/ambient.ogg"
-				radio["website_url"] = "http://www.hbr1.com/"
-				self.temp_list.append(radio)
-
-				radio = {}
-				radio["title"] = "Yggdrasil Radio | Anime & Jpop"
-				radio["stream_url_unresolved"] = "http://shirayuki.org:9200/"
-				radio["stream_url"] = "http://shirayuki.org:9200/"
-				radio["website_url"] = "https://yggdrasilradio.net/"
-				self.temp_list.append(radio)
+				self.temp_list.append(
+					RadioStation(
+						title="Nightwave Plaza",
+						stream_url_fallback="https://radio.plaza.one/ogg",
+						stream_url="https://radio.plaza.one/ogg",
+						website_url="https://plaza.one/",
+						icon="https://plaza.one/icons/apple-touch-icon.png",
+						country="Japan"))
+
+				self.temp_list.append(
+					RadioStation(
+						title="Gensokyo Radio",
+						stream_url_fallback="https://stream.gensokyoradio.net/GensokyoRadio-enhanced.m3u",
+						stream_url="https://stream.gensokyoradio.net/1",
+						website_url="https://gensokyoradio.net/",
+						icon="https://gensokyoradio.net/favicon.ico",
+						country="Japan"))
+
+				self.temp_list.append(
+					RadioStation(
+						title="Listen.moe | Jpop",
+						stream_url_fallback="https://listen.moe/stream",
+						stream_url="https://listen.moe/stream",
+						website_url="https://listen.moe/",
+						icon="https://avatars.githubusercontent.com/u/26034028?s=200&v=4",
+						country="Japan"))
+
+				self.temp_list.append(
+					RadioStation(
+						title="Listen.moe | Kpop",
+						stream_url_fallback="https://listen.moe/kpop/stream",
+						stream_url="https://listen.moe/kpop/stream",
+						website_url="https://listen.moe/",
+						icon="https://avatars.githubusercontent.com/u/26034028?s=200&v=4",
+						country="Korea"))
+
+				self.temp_list.append(
+					RadioStation(
+						title="HBR1 Dream Factory | Ambient",
+						stream_url_fallback="http://radio.hbr1.com:19800/ambient.ogg",
+						stream_url="http://radio.hbr1.com:19800/ambient.ogg",
+						website_url="http://www.hbr1.com/"))
+
+				self.temp_list.append(
+					RadioStation(
+						title="Yggdrasil Radio | Anime & Jpop",
+						stream_url_fallback="http://shirayuki.org:9200/",
+						stream_url="http://shirayuki.org:9200/",
+						website_url="https://yggdrasilradio.net/"))
 
 				for station in primary_stations:
 					self.temp_list.append(station)
@@ -18099,36 +18093,31 @@ def search_radio_browser2(self, param):
 		self.parse_data(data)
 		self.searching = False
 
-	def parse_data(self, data):
-
+	def parse_data(self, data: list[RadioStation]):
 		self.temp_list.clear()
-
 		for station in data:
-			radio: dict[str, int | str] = {}
 			#logging.info(station)
-			radio["title"] = station["name"]
-			radio["stream_url_unresolved"] = station["url"]
-			radio["stream_url"] = station["url_resolved"]
-			radio["icon"] = station["favicon"]
-			radio["country"] = station["country"]
-			if radio["country"] == "The Russian Federation":
-				radio["country"] = "Russia"
-			elif radio["country"] == "The United States Of America":
-				radio["country"] = "USA"
-			elif radio["country"] == "The United Kingdom Of Great Britain And Northern Ireland":
-				radio["country"] = "United Kingdom"
-			elif radio["country"] == "Islamic Republic Of Iran":
-				radio["country"] = "Iran"
+			radio: RadioStation = RadioStation(
+				title=station["name"],
+				stream_url_fallback=station["url"],
+				stream_url=station["url_resolved"],
+				icon=station["favicon"],
+				country=station["country"])
+			if radio.country == "The Russian Federation":
+				radio.country = "Russia"
+			elif radio.country == "The United States Of America":
+				radio.country = "USA"
+			elif radio.country == "The United Kingdom Of Great Britain And Northern Ireland":
+				radio.country = "United Kingdom"
+			elif radio.country == "Islamic Republic Of Iran":
+				radio.country = "Iran"
 			elif len(station["country"]) > 20:
-				radio["country"] = station["countrycode"]
-			radio["website_url"] = station["homepage"]
-			if "homepage" in station:
-				radio["website_url"] = station["homepage"]
+				radio.country = station["countrycode"]
+			radio.website_url = station["homepage"]
 			self.temp_list.append(radio)
 		gui.update += 1
 
 	def render(self) -> None:
-
 		if self.edit_mode:
 			w = round(510 * gui.scale)
 			h = round(120 * gui.scale)  # + sh
@@ -18325,7 +18314,7 @@ def draw_list(self):
 			bg = colours.box_background
 			text_colour = colours.box_input_text
 
-			playing = pctl.playing_state == 3 and self.loaded_url == item["stream_url"]
+			playing = pctl.playing_state == 3 and self.loaded_url == item.stream_url
 
 			if playing:
 				# bg = colours.box_sub_highlight
@@ -18336,7 +18325,7 @@ def draw_list(self):
 				ddt.rect(rect, bg)
 
 			if radio_view.drag:
-				if item == radio_view.drag:
+				if station == radio_view.drag:
 					text_colour = colours.box_sub_text
 					bg = [255, 255, 255, 10]
 					ddt.rect(rect, bg)
@@ -18351,35 +18340,35 @@ def draw_list(self):
 				if gui.level_2_click:
 					# self.drag = p
 					# self.click_point = copy.copy(mouse_position)
-					radio_view.drag = item
+					radio_view.drag = station
 					radio_view.click_point = copy.copy(mouse_position)
 				if mouse_up:  # gui.level_2_click:
 					gui.update += 1
 					# if self.drag is not None and p != self.drag:
 					#     swap = p
 					if point_proximity_test(radio_view.click_point, mouse_position, round(4 * gui.scale)):
-						self.start(item)
+						self.start(station)
 				if middle_click:
 					to_delete = p
 				if level_2_right_click:
-					self.right_clicked_station = item
+					self.right_clicked_station = station
 					self.right_clicked_station_p = p
-					radio_entry_menu.activate(item)
+					radio_entry_menu.activate(station)
 
 			bg = alpha_blend(bg, colours.box_background)
 
 			boxx = round(32 * gui.scale)
 			toff = boxx + round(10 * gui.scale)
-			if item["title"]:
+			if station.title:
 				ddt.text(
-					(xx + toff, yy + round(3 * gui.scale)), item["title"], text_colour, 212, bg=bg,
+					(xx + toff, yy + round(3 * gui.scale)), station.title, text_colour, 212, bg=bg,
 					max_w=rect[2] - (15 * gui.scale + toff))
 			else:
 				ddt.text(
-					(xx + toff, yy + round(3 * gui.scale)), item["stream_url"], text_colour, 212, bg=bg,
+					(xx + toff, yy + round(3 * gui.scale)), station.stream_url, text_colour, 212, bg=bg,
 					max_w=rect[2] - (15 * gui.scale + toff))
 
-			country = item.get("country")
+			country = station.country
 			if country:
 				ddt.text(
 					(xx + toff, yy + round(18 * gui.scale)), country, text_colour, 11, bg=bg,
@@ -18387,7 +18376,7 @@ def draw_list(self):
 
 			b_rect = (xx + round(4 * gui.scale), yy + round(4 * gui.scale), boxx, boxx)
 			ddt.rect(b_rect, colours.box_thumb_background)
-			radio_thumb_gen.draw(item, b_rect[0], b_rect[1], b_rect[2])
+			radio_thumb_gen.draw(station, b_rect[0], b_rect[1], b_rect[2])
 
 			if offset == 0:
 				offset = rect[2] + round(4 * gui.scale)
@@ -21830,9 +21819,9 @@ def loader(self):
 			del self.requests[0]
 			station = item[0]
 			size = item[1]
-			key = (station["title"], size)
+			key = (station.title, size)
 			src = None
-			filename = filename_safe(station["title"])
+			filename = filename_safe(station.title)
 
 			cache_path = os.path.join(r_cache_dir, filename + ".jpg")
 			if os.path.isfile(cache_path):
@@ -21849,16 +21838,16 @@ def loader(self):
 			if src:
 				pass
 				#logging.info("found cached")
-			elif station.get("icon") and station["icon"] not in prefs.radio_thumb_bans:
+			elif station.icon and station.icon not in prefs.radio_thumb_bans:
 				try:
-					r = requests.get(station.get("icon"), headers={"User-Agent": t_agent}, timeout=5, stream=True)
+					r = requests.get(station.icon, headers={"User-Agent": t_agent}, timeout=5, stream=True)
 					if r.status_code != 200 or int(r.headers.get("Content-Length", 0)) > 2000000:
 						raise Exception("Error get radio thumb")
 				except Exception:
 					logging.exception("error get radio thumb")
 					self.cache[key] = [0]
-					if station.get("icon") and station.get("icon") not in prefs.radio_thumb_bans:
-						prefs.radio_thumb_bans.append(station.get("icon"))
+					if station.icon and station.icon not in prefs.radio_thumb_bans:
+						prefs.radio_thumb_bans.append(station.icon)
 					continue
 				src = io.BytesIO()
 				length = 0
@@ -21869,8 +21858,8 @@ def loader(self):
 						scr = None
 				if src is None:
 					self.cache[key] = [0]
-					if station.get("icon") and station.get("icon") not in prefs.radio_thumb_bans:
-						prefs.radio_thumb_bans.append(station.get("icon"))
+					if station.icon and station.icon not in prefs.radio_thumb_bans:
+						prefs.radio_thumb_bans.append(station.icon)
 					continue
 				src.seek(0)
 				with open(cache_path, "wb") as f:
@@ -21888,8 +21877,8 @@ def loader(self):
 			except Exception:
 				logging.exception("malform get radio thumb")
 				self.cache[key] = [0]
-				if station.get("icon") and station.get("icon") not in prefs.radio_thumb_bans:
-					prefs.radio_thumb_bans.append(station.get("icon"))
+				if station.icon and station.icon not in prefs.radio_thumb_bans:
+					prefs.radio_thumb_bans.append(station.icon)
 				continue
 			if src is not None:
 				src.close()
@@ -21904,10 +21893,10 @@ def loader(self):
 			self.cache[key] = [2, None, None, s_image]
 			gui.update += 1
 
-	def draw(self, station, x, y, w):
-		if not station.get("title"):
+	def draw(self, station: RadioStation, x, y, w):
+		if not station.title:
 			return 0
-		key = (station["title"], w)
+		key = (station.title, w)
 
 		r = self.cache.get(key)
 		if r is None:
@@ -21988,7 +21977,7 @@ def render(self):
 			pctl.radio_playlist_viewing = 0
 		if not pctl.radio_playlists:
 			return
-		radios = pctl.radio_playlists[pctl.radio_playlist_viewing]["items"]
+		radios = pctl.radio_playlists[pctl.radio_playlist_viewing].stations
 
 		y += round(32 * gui.scale)
 		if pctl.playing_state == 3 and radiobox.loaded_station not in radios:
@@ -22001,7 +21990,7 @@ def render(self):
 				colour = b_colour
 				if inp.mouse_click:
 					radios.append(radiobox.loaded_station)
-					toast(_("Added station to: ") + pctl.radio_playlists[pctl.radio_playlist_viewing]["name"])
+					toast(_("Added station to: ") + pctl.radio_playlists[pctl.radio_playlist_viewing].name)
 
 			self.save_icon.render(rect[0] + round(3 * gui.scale), rect[1] + round(4 * gui.scale), colour)
 
@@ -22022,20 +22011,20 @@ def render(self):
 		mm = (window_size[1] - (gui.panelBY + yy + h + round(15 * gui.scale))) // (h + gap) + 1
 
 		count = 0
-		scroll = pctl.radio_playlists[pctl.radio_playlist_viewing].get("scroll", 0)
+		scroll = pctl.radio_playlists[pctl.radio_playlist_viewing].scroll
 		if not radiobox.active or (radiobox.active and not coll((radiobox.x, radiobox.y, radiobox.w, radiobox.h))):
-			if gui.panelY < mouse_position[1] < window_size[1] - gui.panelBY and mouse_position[0] < w + round(
-					70 * gui.scale):
+			if gui.panelY < mouse_position[1] < window_size[1] - gui.panelBY \
+			and mouse_position[0] < w + round(70 * gui.scale):
 				scroll += mouse_wheel * -1
 		scroll = min(scroll, len(radios) - mm + 1)
 		scroll = max(scroll, 0)
 		if len(radios) > mm:
-			scroll = radio_view_scroll.draw(round(7 * gui.scale), yy, round(15 * gui.scale), (mm * (h + gap)) - gap,
-											scroll, len(radios) - mm + 1)
+			scroll = radio_view_scroll.draw(
+				round(7 * gui.scale), yy, round(15 * gui.scale), (mm * (h + gap)) - gap, scroll, len(radios) - mm + 1)
 		else:
 			scroll = 0
 
-		pctl.radio_playlists[pctl.radio_playlist_viewing]["scroll"] = scroll
+		pctl.radio_playlists[pctl.radio_playlist_viewing].scroll = scroll
 		insert = None
 
 		for i, radio in enumerate(radios):
@@ -22062,11 +22051,11 @@ def render(self):
 			toff = h + round(2 * gui.scale)
 			yyy += round(9 * gui.scale)
 			ddt.text(
-				(x + toff, yyy), radio["title"], l1_colour, 212,
+				(x + toff, yyy), radio.title, l1_colour, 212,
 				max_w=w - (toff + round(90 * gui.scale)), bg=rbg)
 			yyy += round(19 * gui.scale)
 			ddt.text(
-				(x + toff, yyy), radio.get("country", ""), l2_colour, 312,
+				(x + toff, yyy), radio.country, l2_colour, 312,
 				max_w=w - (toff + round(90 * gui.scale)), bg=rbg)
 
 			hit = False
@@ -22139,7 +22128,7 @@ def render(self):
 			if radiobox.loaded_station and pctl.playing_state == 3:
 				space = window_size[0] - round(500 * gui.scale)
 				ddt.text(
-					(count, yy, 2), radiobox.loaded_station.get("title", ""), [230, 230, 230, 255], 213, max_w=space)
+					(count, yy, 2), radiobox.loaded_station.title, [230, 230, 230, 255], 213, max_w=space)
 				yy += round(25 * gui.scale)
 				ddt.text((count, yy, 2), radiobox.song_key, [230, 230, 230, 255], 313, max_w=space)
 				if radiobox.dummy_track.album:
@@ -26150,10 +26139,10 @@ def prep_gal():
 
 def add_stations(stations: list[RadioStation], name: str) -> None:
 	if len(stations) == 1:
-		for i, s in enumerate(pctl.radio_playlists):
-			if s.name == "Default":
-				s.stations.insert(0, stations[0])
-				s.scroll = 0
+		for i, playlist in enumerate(pctl.radio_playlists):
+			if playlist.name == "Default":
+				playlist.stations.insert(0, stations[0])
+				playlist.scroll = 0
 				pctl.radio_playlist_viewing = i
 				break
 		else:
@@ -26191,13 +26180,13 @@ def load_m3u(path: str) -> None:
 					line_title = bline.split(",", 1)[1].strip("\r\n").strip()
 
 			if line.startswith("http"):
-				radio: dict[str, int | str] = {}
-				radio["stream_url"] = line
+				radio: RadioStation = RadioStation()
+				radio.stream_url = line
 
 				if line_title:
-					radio["title"] = line_title
+					radio.title = line_title
 				else:
-					radio["title"] = os.path.splitext(os.path.basename(path))[0].strip()
+					radio.title = os.path.splitext(os.path.basename(path))[0].strip()
 
 				stations.append(radio)
 
@@ -26271,21 +26260,19 @@ def read_pls(lines: list[str], path: str, followed: bool = False) -> None:
 					ids.append(n)
 				titles[n] = line.split("=", 1)[1].strip()
 
-	stations: list[dict[str, int | str]] = []
+	stations: list[RadioStation] = []
 	for id in ids:
 		if id in urls:
-			radio: dict[str, int | str] = {}
-			radio["stream_url"] = urls[id]
-			radio["title"] = os.path.splitext(os.path.basename(path))[0]
-			radio["scroll"] = 0
-			if id in titles:
-				radio["title"] = titles[id]
-
-			if ".pls" in radio["stream_url"]:
+			radio = RadioPlaylist(
+				stream_url=titles[id] if id in titles else urls[id],
+				title=os.path.splitext(os.path.basename(path))[0],
+				scroll=0)
+
+			if ".pls" in radio.stream_url:
 				if not followed:
 					try:
 						logging.info("Download .pls")
-						response = requests.get(radio["stream_url"], stream=True, timeout=15)
+						response = requests.get(radio.stream_url, stream=True, timeout=15)
 						if int(response.headers["Content-Length"]) < 2000:
 							read_pls(response.content.decode().splitlines(), path, followed=True)
 					except Exception:
@@ -26361,16 +26348,16 @@ def load_xspf(path: str) -> None:
 		return
 
 	# Extract internet streams first
-	stations: list[dict[str, int | str]] = []
+	stations: list[RadioStation] = []
 	for i in reversed(range(len(a))):
 		item = a[i]
 		if item["location"].startswith("http"):
-			radio: dict[str, int | str] = {}
-			radio["stream_url"] = item["location"]
-			radio["title"] = item["name"]
-			radio["scroll"] = 0
+			radio = RadioStation(
+			stream_url=item["location"],
+			title=item["name"])
+#			radio.scroll = 0 # TODO(Martin): This was here wrong as scrolling is meant to be for RadioPlaylist?
 			if item["info"].startswith("http"):
-				radio["website_url"] = item["info"]
+				radio.website_url = item["info"]
 
 			stations.append(radio)
 

From 5c5003e551d0ab6c29db53e292ef1d947e30d815 Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Wed, 29 Jan 2025 19:22:43 +0100
Subject: [PATCH 05/12] Fix broken buttons

---
 src/tauon/t_modules/t_main.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index 4cd21badf..8c4640537 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -37278,19 +37278,19 @@ def line_render(n_track: TrackClass, p_track: TrackClass, y, this_line_playing,
 # 	return "website_url" in prefs.radio_urls[p] and prefs.radio_urls[p].["website_url"]
 
 def visit_radio_site_deco(station: RadioStation):
-	if station.website_url is not None:
+	if station.website_url:
 		return [colours.menu_text, colours.menu_background, None]
 	return [colours.menu_text_disabled, colours.menu_background, None]
 
-def visit_radio_station_site_deco(station: RadioStation):
-	return visit_radio_site_deco(station.stream_url)
+def visit_radio_station_site_deco(item: tuple[int, RadioStation]):
+	return visit_radio_site_deco(item[1])
 
 def visit_radio_site(station: RadioStation):
-	if station.website_url is not None:
+	if station.website_url:
 		webbrowser.open(station.website_url, new=2, autoraise=True)
 
-def visit_radio_station(station: RadioStation):
-	visit_radio_site(station.stream_url)
+def visit_radio_station(item: tuple[int, RadioStation]):
+	visit_radio_site(item[1])
 
 def radio_saved_panel_test(_):
 	return radiobox.tab == 0
@@ -37567,7 +37567,7 @@ def add_station():
 	radiobox.station_editing = None
 	radiobox.center = True
 
-def rename_station(station: list[RadioStation]):
+def rename_station(item: tuple[int, RadioStation]):
 	station = item[1]
 	radiobox.active = True
 	radiobox.center = False
@@ -37577,8 +37577,8 @@ def rename_station(station: list[RadioStation]):
 	radiobox.radio_field_title.text = station.title if station.title is not None else ""
 	radiobox.station_editing = station
 
-def remove_station(stations: list[RadioStation]):
-	index = station[0]
+def remove_station(item: tuple[int, RadioStation]):
+	index = item[0]
 	del pctl.radio_playlists[pctl.radio_playlist_viewing].stations[index]
 
 def dismiss_dl():

From 868fbc0c1a1f4df7f41601368d18355a888f34ff Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Wed, 29 Jan 2025 19:43:40 +0100
Subject: [PATCH 06/12] Do not wipe website URL if stream URL hasn't changed

---
 src/tauon/t_modules/t_main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index 8c4640537..6490e95e2 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -18254,8 +18254,9 @@ def saved(self):
 				if self.add_mode:
 					radio: RadioStation = RadioStation()
 				radio.title = self.radio_field_title.text
-				radio.stream_url = self.radio_field.text
-				radio.website_url = ""
+				if radio.stream_url != self.radio_field.text:
+					radio.stream_url = self.radio_field.text
+					radio.website_url = "" # Different URL, null the website # TODO(Martin): no way to edit for now
 
 				if self.add_mode:
 					pctl.radio_playlists[pctl.radio_playlist_viewing].stations.append(radio)

From aeab8dc30fd064c6f1f527a044c669671a2b88ee Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Mon, 3 Feb 2025 14:07:39 +0100
Subject: [PATCH 07/12] Handle radio websocket better

---
 src/tauon/t_modules/t_extra.py  | 2 +-
 src/tauon/t_modules/t_main.py   | 4 ++--
 src/tauon/t_modules/t_stream.py | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/tauon/t_modules/t_extra.py b/src/tauon/t_modules/t_extra.py
index d027383ca..78d3cead5 100644
--- a/src/tauon/t_modules/t_extra.py
+++ b/src/tauon/t_modules/t_extra.py
@@ -52,7 +52,7 @@ class RadioStation:
 	country: str
 	website_url: str
 	icon: str
-	stream_url_fallback: str = ""
+	stream_url_fallback: str
 
 @dataclass
 class RadioPlaylist:
diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index 6490e95e2..d5d1b27f9 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -28191,7 +28191,7 @@ def delete_playlist(index: int, force: bool = False, check_lock: bool = False) -
 	if gui.radio_view:
 		del pctl.radio_playlists[index]
 		if not pctl.radio_playlists:
-			pctl.radio_playlists = [RadioPlaylist(uid=uid_gen(),name ="Default", stations=[])]
+			pctl.radio_playlists = [RadioPlaylist(uid=uid_gen(),name="Default", stations=[])]
 		return
 
 	global default_playlist
@@ -38540,7 +38540,7 @@ def test_show_add_home_music() -> None:
 			gui.add_music_folder_ready = False
 			break
 
-def menu_is_open():
+def menu_is_open() -> bool:
 	for menu in Menu.instances:
 		if menu.active:
 			return True
diff --git a/src/tauon/t_modules/t_stream.py b/src/tauon/t_modules/t_stream.py
index 38efca993..b9493e536 100644
--- a/src/tauon/t_modules/t_stream.py
+++ b/src/tauon/t_modules/t_stream.py
@@ -69,18 +69,14 @@ def __init__(self, tauon: Tauon) -> None:
 		self.url = None
 
 	def stop(self) -> None:
-
-		try:
+		if self.tauon.radiobox.websocket:
 			self.tauon.radiobox.websocket.close()
 			logging.info("Websocket closed")
-		except Exception:
-			logging.exception("No socket to close?")
 
 		self.abort = True
 		self.tauon.radiobox.loaded_url = None
 
 	def start_download(self, url: str) -> bool:
-
 		self.abort = True
 		while self.download_running:
 			time.sleep(0.01)

From bd39fa86e180ab08c5ec17713aac9b2f10f99695 Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Mon, 3 Feb 2025 14:09:09 +0100
Subject: [PATCH 08/12] Fix indent

---
 src/tauon/t_modules/t_main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index d5d1b27f9..03f583ee1 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -26354,8 +26354,8 @@ def load_xspf(path: str) -> None:
 		item = a[i]
 		if item["location"].startswith("http"):
 			radio = RadioStation(
-			stream_url=item["location"],
-			title=item["name"])
+				stream_url=item["location"],
+				title=item["name"])
 #			radio.scroll = 0 # TODO(Martin): This was here wrong as scrolling is meant to be for RadioPlaylist?
 			if item["info"].startswith("http"):
 				radio.website_url = item["info"]

From e8ce57d9a28963dc4f98b1d07094f5021b8320a4 Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Mon, 3 Feb 2025 14:10:32 +0100
Subject: [PATCH 09/12] Add the default station fallback URL back

---
 src/tauon/t_modules/t_extra.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tauon/t_modules/t_extra.py b/src/tauon/t_modules/t_extra.py
index 78d3cead5..d027383ca 100644
--- a/src/tauon/t_modules/t_extra.py
+++ b/src/tauon/t_modules/t_extra.py
@@ -52,7 +52,7 @@ class RadioStation:
 	country: str
 	website_url: str
 	icon: str
-	stream_url_fallback: str
+	stream_url_fallback: str = ""
 
 @dataclass
 class RadioPlaylist:

From 6170abc01d87035dd6a7eb161c131445eb894c84 Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Mon, 3 Feb 2025 14:23:59 +0100
Subject: [PATCH 10/12] Fix up adding radio and m3u radio

---
 src/tauon/t_modules/t_extra.py | 14 +++++++-------
 src/tauon/t_modules/t_main.py  | 16 +++++++---------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/tauon/t_modules/t_extra.py b/src/tauon/t_modules/t_extra.py
index d027383ca..3b4037cf5 100644
--- a/src/tauon/t_modules/t_extra.py
+++ b/src/tauon/t_modules/t_extra.py
@@ -47,17 +47,17 @@
 
 @dataclass
 class RadioStation:
-	title: str
-	stream_url: str
-	country: str
-	website_url: str
-	icon: str
+	title:               str
+	stream_url:          str
+	country:             str = ""
+	website_url:         str = ""
+	icon:                str = ""
 	stream_url_fallback: str = ""
 
 @dataclass
 class RadioPlaylist:
-	uid: int
-	name: str
+	name:   str
+	uid:    int
 	scroll: int = 0
 	stations: list[RadioStation] = field(default_factory=list)
 
diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index 03f583ee1..6fb1bef8c 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -18252,7 +18252,9 @@ def saved(self):
 			elif "http://" in self.radio_field.text or "https://" in self.radio_field.text:
 				radio = self.station_editing
 				if self.add_mode:
-					radio: RadioStation = RadioStation()
+					radio: RadioStation = RadioStation(
+						title=self.radio_field_title.text,
+						stream_url=self.radio_field.text)
 				radio.title = self.radio_field_title.text
 				if radio.stream_url != self.radio_field.text:
 					radio.stream_url = self.radio_field.text
@@ -26181,14 +26183,10 @@ def load_m3u(path: str) -> None:
 					line_title = bline.split(",", 1)[1].strip("\r\n").strip()
 
 			if line.startswith("http"):
-				radio: RadioStation = RadioStation()
-				radio.stream_url = line
-
-				if line_title:
-					radio.title = line_title
-				else:
-					radio.title = os.path.splitext(os.path.basename(path))[0].strip()
-
+				radio: RadioStation = RadioStation(
+					stream_url=line
+					title=line_title if line_title or os.path.splitext(os.path.basename(path))[0].strip()
+				)
 				stations.append(radio)
 
 				if gui.auto_play_import:

From e22c58c3690d9afc76c9deb0e71a1a86496c826d Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Mon, 3 Feb 2025 14:25:00 +0100
Subject: [PATCH 11/12] Fix if

---
 src/tauon/t_modules/t_main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index 6fb1bef8c..e78106d0f 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -26185,7 +26185,7 @@ def load_m3u(path: str) -> None:
 			if line.startswith("http"):
 				radio: RadioStation = RadioStation(
 					stream_url=line
-					title=line_title if line_title or os.path.splitext(os.path.basename(path))[0].strip()
+					title=line_title if line_title else os.path.splitext(os.path.basename(path))[0].strip()
 				)
 				stations.append(radio)
 

From 787dfcaa6058ad16efb70f97567af6472fad9e0b Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.rs>
Date: Mon, 3 Feb 2025 14:25:33 +0100
Subject: [PATCH 12/12] Fix comma

---
 src/tauon/t_modules/t_main.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
index e78106d0f..dea4cb39e 100644
--- a/src/tauon/t_modules/t_main.py
+++ b/src/tauon/t_modules/t_main.py
@@ -26184,9 +26184,8 @@ def load_m3u(path: str) -> None:
 
 			if line.startswith("http"):
 				radio: RadioStation = RadioStation(
-					stream_url=line
-					title=line_title if line_title else os.path.splitext(os.path.basename(path))[0].strip()
-				)
+					stream_url=line,
+					title=line_title if line_title else os.path.splitext(os.path.basename(path))[0].strip())
 				stations.append(radio)
 
 				if gui.auto_play_import: