[gnome-games/wip/exalm/uid: 10/16] uid: Rename get_uid() to to_string()

[Alexander Mikhaylenko <alexm src gnome org>]

commit 6cdb52deee82fec65ea3b56eafddbf35bf45d36d
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Mar 5 22:46:52 2020 +0500

    uid: Rename get_uid() to to_string()
    
    This allows to use uids in string interpolation directly.

 src/core/cover-loader.vala    | 2 +-
 src/core/game-collection.vala | 8 ++++----
 src/core/game-model.vala      | 4 ++--
 src/core/game.vala            | 6 +++---
 src/core/savestate.vala       | 3 +--
 src/core/uid.vala             | 2 +-
 src/database/database.vala    | 6 +++---
 src/grilo/grilo-cover.vala    | 1 -
 src/retro/retro-runner.vala   | 4 ++--
 9 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/src/core/cover-loader.vala b/src/core/cover-loader.vala
index 11c17d78..d0c69bae 100644
--- a/src/core/cover-loader.vala
+++ b/src/core/cover-loader.vala
@@ -115,7 +115,7 @@ public class Games.CoverLoader : Object {
        private string get_cache_path (Game game, int size, string dir_name) {
                var dir = Application.get_image_cache_dir (dir_name, size);
 
-               var uid = game.uid.get_uid ();
+               var uid = game.uid;
 
                return @"$dir/$uid.png";
        }
diff --git a/src/core/game-collection.vala b/src/core/game-collection.vala
index bcefd7aa..75a32d2c 100644
--- a/src/core/game-collection.vala
+++ b/src/core/game-collection.vala
@@ -103,7 +103,7 @@ private class Games.GameCollection : Object {
                                        database.list_cached_games ((game) => {
                                                cached_games[game.uri.to_string ()] = game;
 
-                                               var uid = game.uid.get_uid ();
+                                               var uid = game.uid.to_string ();
 
                                                if (games.contains (uid))
                                                        return;
@@ -146,7 +146,7 @@ private class Games.GameCollection : Object {
                                        warning ("Couldn't remove game: %s", e.message);
                                }
 
-                               var uid = game.uid.get_uid ();
+                               var uid = game.uid.to_string ();
 
                                games.remove (uid);
                                if (removed)
@@ -267,7 +267,7 @@ private class Games.GameCollection : Object {
                        warning ("Couldn't cache game: %s", e.message);
                }
 
-               var uid = game.uid.get_uid ();
+               var uid = game.uid.to_string ();
 
                if (games.contains (uid) && prev_game == null)
                        return;
@@ -295,7 +295,7 @@ private class Games.GameCollection : Object {
                ulong loading_done_id = 0;
 
                game_added_id = game_added.connect ((game) => {
-                       var game_uid = game.uid.get_uid ();
+                       var game_uid = game.uid.to_string ();
 
                        if (game_uid != uid)
                                return;
diff --git a/src/core/game-model.vala b/src/core/game-model.vala
index 1d0c8997..520d676d 100644
--- a/src/core/game-model.vala
+++ b/src/core/game-model.vala
@@ -67,8 +67,8 @@ private class Games.GameModel : Object, ListModel {
                if (ret != 0)
                        return ret;
 
-               var uid1 = a.uid.get_uid ();
-               var uid2 = b.uid.get_uid ();
+               var uid1 = a.uid.to_string ();
+               var uid2 = b.uid.to_string ();
 
                return uid1.collate (uid2);
        }
diff --git a/src/core/game.vala b/src/core/game.vala
index 0c824d55..7a4c6b6a 100644
--- a/src/core/game.vala
+++ b/src/core/game.vala
@@ -68,7 +68,7 @@ public class Games.Game : Object {
        }
 
        public static uint hash (Game key) {
-               var uid = key.uid.get_uid ();
+               var uid = key.uid.to_string ();
 
                return str_hash (uid);
        }
@@ -77,8 +77,8 @@ public class Games.Game : Object {
                if (direct_equal (a, b))
                        return true;
 
-               var a_uid = a.uid.get_uid ();
-               var b_uid = b.uid.get_uid ();
+               var a_uid = a.uid.to_string ();
+               var b_uid = b.uid.to_string ();
 
                return str_equal (a_uid, b_uid);
        }
diff --git a/src/core/savestate.vala b/src/core/savestate.vala
index 0148977d..c67d8a1f 100644
--- a/src/core/savestate.vala
+++ b/src/core/savestate.vala
@@ -177,9 +177,8 @@ public class Games.Savestate : Object {
        public static Savestate[] get_game_savestates (Uid game_uid, Platform platform, string core_id) 
throws Error {
                var data_dir_path = Application.get_data_dir ();
                var savestates_dir_path = Path.build_filename (data_dir_path, "savestates");
-               var uid_str = game_uid.get_uid ();
                var core_id_prefix = core_id.replace (".libretro", "");
-               var game_savestates_dir_path = Path.build_filename (savestates_dir_path, uid_str + "-" + 
core_id_prefix);
+               var game_savestates_dir_path = Path.build_filename (savestates_dir_path, 
@"$game_uid-$core_id_prefix");
                var game_savestates_dir_file = File.new_for_path (game_savestates_dir_path);
 
                if (!game_savestates_dir_file.query_exists ()) {
diff --git a/src/core/uid.vala b/src/core/uid.vala
index 4e9250d7..7bde6bf5 100644
--- a/src/core/uid.vala
+++ b/src/core/uid.vala
@@ -7,7 +7,7 @@ public class Games.Uid : Object {
                this.uid = uid;
        }
 
-       public string get_uid () {
+       public string to_string () {
                return uid;
        }
 }
diff --git a/src/database/database.vala b/src/database/database.vala
index 401f1b64..cffa937c 100644
--- a/src/database/database.vala
+++ b/src/database/database.vala
@@ -194,7 +194,7 @@ private class Games.Database : Object {
        }
 
        public Game? store_game (Game game) throws Error {
-               var uid = game.uid.get_uid ();
+               var uid = game.uid.to_string ();
                var uri = game.uri.to_string ();
                var title = game.name;
                var platform = game.platform.get_id ();
@@ -228,7 +228,7 @@ private class Games.Database : Object {
        }
 
        public void update_game (Game game, Game? prev_game = null) throws Error {
-               var uid = game.uid.get_uid ();
+               var uid = game.uid.to_string ();
                var uri = game.uri.to_string ();
                var title = game.name;
                var media_set = serialize_media_set (game);
@@ -254,7 +254,7 @@ private class Games.Database : Object {
        }
 
        public bool remove_game (string uri, Game game) throws Error {
-               var uid = game.uid.get_uid ();
+               var uid = game.uid.to_string ();
 
                delete_uri_query.reset ();
                bind_text (delete_uri_query, "$URI", uri);
diff --git a/src/grilo/grilo-cover.vala b/src/grilo/grilo-cover.vala
index 53ce7a26..23ef22a0 100644
--- a/src/grilo/grilo-cover.vala
+++ b/src/grilo/grilo-cover.vala
@@ -56,7 +56,6 @@ public class Games.GriloCover : Object, Cover {
                        return cover_path;
 
                var dir = Application.get_covers_dir ();
-               var uid = uid.get_uid ();
                cover_path = @"$dir/$uid.cover";
 
                return cover_path;
diff --git a/src/retro/retro-runner.vala b/src/retro/retro-runner.vala
index 2774c029..a6916eb7 100644
--- a/src/retro/retro-runner.vala
+++ b/src/retro/retro-runner.vala
@@ -454,11 +454,11 @@ public class Games.RetroRunner : Object, Runner {
                // Get the savestates directory of the game
                var data_dir_path = Application.get_data_dir ();
                var savestates_dir_path = Path.build_filename (data_dir_path, "savestates");
-               var uid = game.uid.get_uid ();
+               var uid = game.uid;
                var core_id = get_core_id ();
                var core_id_prefix = core_id.replace (".libretro", "");
 
-               return Path.build_filename (savestates_dir_path, uid + "-" + core_id_prefix);
+               return Path.build_filename (savestates_dir_path, @"$uid-$core_id_prefix");
        }
 
        // Returns the created Savestate or null if the Savestate couldn't be created