Naming clean-up and flathub build changes

louis77 · Jan 4, 2025 · 1bcadee · 1bcadee
1 parent 4c9fb42
commit 1bcadee
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ tuner.code-workspace
 labelexpand.ods
 tuner-starred.m3u8
 uncrustify.cfg
+repo/*
diff --git a/data/io.github.louis77.tuner.appdata.xml.in b/data/io.github.louis77.tuner.appdata.xml.in
@@ -7,14 +7,15 @@
   <project_license>GPL-3.0+</project_license>
   <name>Tuner</name>
   <developer_name>Louis Brauer</developer_name>
+  <developer_name>technosf</developer_name>
   <launchable type="desktop-id">io.github.louis77.tuner.desktop</launchable>
   <branding>
     <color type="primary" scheme_preference="light">#fafafa</color>
     <color type="primary" scheme_preference="dark">#abacae</color>
   </branding>
   <summary>Internet Radio</summary>
   <description>
-    <p><b>Make finding and listening to internet radio stations fun again!</b></p>
+    <p>Make finding and listening to internet radio stations fun again!</p>
     <p>Instead of showing all the stations you already know,
        Tuner presents you a new selection of stations from all over the world
        every time you hit the Shuffle button.</p>
@@ -61,7 +62,6 @@
     </screenshot>
   </screenshots>
 
-  <update_contact>louis_AT_brauer.family</update_contact>
   <update_contact>tuner.10.technomation_AT_xoxy.net</update_contact>
   <url type="homepage">https://github.com/louis77/tuner</url>
   <url type="bugtracker">http://github.com/louis77/tuner/issues</url>

diff --git a/docs/Tuner_2.0_context.png b/docs/Tuner_2.0_context.png
diff --git a/docs/Tuner_2.0_discover.png b/docs/Tuner_2.0_discover.png
diff --git a/docs/Tuner_2.0_jukebox.png b/docs/Tuner_2.0_jukebox.png
diff --git a/docs/Tuner_2.0_meta.png b/docs/Tuner_2.0_meta.png
diff --git a/docs/Tuner_2.0_pref.png b/docs/Tuner_2.0_pref.png
diff --git a/docs/Tuner_2.0_saved.png b/docs/Tuner_2.0_saved.png
diff --git a/docs/Tuner_2.0_search.png b/docs/Tuner_2.0_search.png
diff --git a/docs/Tuner_2.0_starred.png b/docs/Tuner_2.0_starred.png
diff --git a/io.github.louis77.tuner.yml b/io.github.louis77.tuner.yml
@@ -8,8 +8,8 @@ sdk: org.freedesktop.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.vala
 
-base: io.elementary.BaseApp
-base-version: 'circe-24.08'
+#base: io.elementary.BaseApp
+#base-version: 'circe-24.08'
 
 command: io.github.louis77.tuner
 
@@ -55,6 +55,7 @@ modules:
   buildsystem: simple
   build-commands:
     - install -d /app/vala
+
 - name: libsoup
   buildsystem: meson
   builddir: true

diff --git a/src/Application.vala b/src/Application.vala
@@ -291,15 +291,16 @@ namespace Tuner {
             var _favorites_file =  File.new_build_filename (data_dir, "favorites.json"); // v1 file
             var _starred_file =  File.new_build_filename (data_dir, Application.STARRED);   // v2 file
 
-            try {
-                _favorites_file.open_readwrite().close ();   // Try to open, if succeeds it exists, if not err - no migration
-                _starred_file.create(NONE); // Try to create, if fails starred already exists, if not ok to migrate
-                _favorites_file.copy (_starred_file, FileCopyFlags.NONE);  // Copy
-                warning(@"Migrated v1 Favorites to v2 Starred");
-            }     
-            catch (Error e) {
-                // Peconditions not met
-            }
+            /* Migration not possible with renamed app */
+            //  try {
+            //      _favorites_file.open_readwrite().close ();   // Try to open, if succeeds it exists, if not err - no migration
+            //      _starred_file.create(NONE); // Try to create, if fails starred already exists, if not ok to migrate
+            //      _favorites_file.copy (_starred_file, FileCopyFlags.NONE);  // Copy
+            //      warning(@"Migrated v1 Favorites to v2 Starred");
+            //  }     
+            //  catch (Error e) {
+            //      // Peconditions not met
+            //  }
 
             /* 
                 Create the cancellable.

diff --git a/src/Controllers/PlayerController.vala b/src/Controllers/PlayerController.vala
@@ -393,7 +393,10 @@ public class Tuner.PlayerController : GLib.Object
 							break;
 						case  GLib.Type.UINT:
 							list.get_uint(tag, out u);
-							_metadata_values.set ( tag,  @"$(u/1000)K");
+                            if ( u > 1000)
+                                _metadata_values.set ( tag,  @"$(u/1000)K");
+                            else
+                                _metadata_values.set ( tag,  u.to_string ());
 							break;
 						case  GLib.Type.BOOLEAN:
 							list.get_boolean (tag, out b);