[gnome-games/wip/exalm/uid: 6/16] game: Make uid a property

[Alexander Mikhaylenko <alexm src gnome org>]

commit fe37996bb38cff3a01de5327ac2c1ec92a32f08c
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Mar 5 22:39:31 2020 +0500

    game: Make uid a property

 src/core/cover-loader.vala    |  2 +-
 src/core/game-collection.vala |  8 ++++----
 src/core/game-model.vala      |  4 ++--
 src/core/game.vala            | 15 ++++++---------
 src/database/database.vala    |  6 +++---
 src/retro/retro-runner.vala   |  4 ++--
 6 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/src/core/cover-loader.vala b/src/core/cover-loader.vala
index f58ac002..11c17d78 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.get_uid ().get_uid ();
+               var uid = game.uid.get_uid ();
 
                return @"$dir/$uid.png";
        }
diff --git a/src/core/game-collection.vala b/src/core/game-collection.vala
index f1896813..5a9ecc3b 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.get_uri ().to_string ()] = game;
 
-                                               var uid = game.get_uid ().get_uid ();
+                                               var uid = game.uid.get_uid ();
 
                                                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.get_uid ().get_uid ();
+                               var uid = game.uid.get_uid ();
 
                                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.get_uid ().get_uid ();
+               var uid = game.uid.get_uid ();
 
                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.get_uid ().get_uid ();
+                       var game_uid = game.uid.get_uid ();
 
                        if (game_uid != uid)
                                return;
diff --git a/src/core/game-model.vala b/src/core/game-model.vala
index 65e6495c..b1d29064 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.get_uid ().get_uid ();
-               var uid2 = b.get_uid ().get_uid ();
+               var uid1 = a.uid.get_uid ();
+               var uid2 = b.uid.get_uid ();
 
                return uid1.collate (uid2);
        }
diff --git a/src/core/game.vala b/src/core/game.vala
index afb499ce..5650f514 100644
--- a/src/core/game.vala
+++ b/src/core/game.vala
@@ -20,7 +20,8 @@ public class Games.Game : Object {
                }
        }
 
-       private Uid game_uid;
+       public Uid uid { get; private set; }
+
        private Uri game_uri;
        private Title game_title;
        private Icon game_icon;
@@ -29,16 +30,12 @@ public class Games.Game : Object {
        private MediaSet? media_set;
 
        public Game (Uid uid, Uri uri, Title title, Platform platform) {
-               game_uid = uid;
+               this.uid = uid;
                game_uri = uri;
                game_title = title;
                game_platform = platform;
        }
 
-       public Uid get_uid () {
-               return game_uid;
-       }
-
        public Uri get_uri () {
                return game_uri;
        }
@@ -87,7 +84,7 @@ public class Games.Game : Object {
        }
 
        public static uint hash (Game key) {
-               var uid = key.get_uid ().get_uid ();
+               var uid = key.uid.get_uid ();
 
                return str_hash (uid);
        }
@@ -96,8 +93,8 @@ public class Games.Game : Object {
                if (direct_equal (a, b))
                        return true;
 
-               var a_uid = a.get_uid ().get_uid ();
-               var b_uid = b.get_uid ().get_uid ();
+               var a_uid = a.uid.get_uid ();
+               var b_uid = b.uid.get_uid ();
 
                return str_equal (a_uid, b_uid);
        }
diff --git a/src/database/database.vala b/src/database/database.vala
index f2e9b6a4..3ce24612 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.get_uid ().get_uid ();
+               var uid = game.uid.get_uid ();
                var uri = game.get_uri ().to_string ();
                var title = game.name;
                var platform = game.get_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.get_uid ().get_uid ();
+               var uid = game.uid.get_uid ();
                var uri = game.get_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.get_uid ().get_uid ();
+               var uid = game.uid.get_uid ();
 
                delete_uri_query.reset ();
                bind_text (delete_uri_query, "$URI", uri);
diff --git a/src/retro/retro-runner.vala b/src/retro/retro-runner.vala
index c76d2395..056092e4 100644
--- a/src/retro/retro-runner.vala
+++ b/src/retro/retro-runner.vala
@@ -143,7 +143,7 @@ public class Games.RetroRunner : Object, Runner {
 
        private void init_phase_one () throws Error {
                // Step 1) Load the game's savestates ----------------------------------
-               game_savestates = Savestate.get_game_savestates (game.get_uid (), game.get_platform (), 
get_core_id ());
+               game_savestates = Savestate.get_game_savestates (game.uid, game.get_platform (), get_core_id 
());
                if (game_savestates.length != 0)
                        latest_savestate = game_savestates[0];
 
@@ -454,7 +454,7 @@ 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.get_uid ().get_uid ();
+               var uid = game.uid.get_uid ();
                var core_id = get_core_id ();
                var core_id_prefix = core_id.replace (".libretro", "");