GNOME.org
 

[gnome-games/wip/exalm/uid: 1/16] Make Uid a class and remove GenericUid

commit 14ca082d76fc36e453b764560ad8f7030bd041be
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Mar 5 22:26:48 2020 +0500

    Make Uid a class and remove GenericUid

 plugins/desktop/src/desktop-plugin.vala               |  2 +-
 plugins/dreamcast/src/dreamcast-plugin.vala           |  2 +-
 plugins/game-cube/src/game-cube-plugin.vala           |  2 +-
 plugins/libretro/src/libretro-plugin.vala             |  2 +-
 plugins/love/src/love-plugin.vala                     |  2 +-
 plugins/mame/src/mame-game-uri-adapter.vala           |  2 +-
 plugins/ms-dos/src/ms-dos-plugin.vala                 |  2 +-
 plugins/nintendo-ds/src/nintendo-ds-plugin.vala       |  2 +-
 plugins/playstation/src/playstation-game-factory.vala |  2 +-
 plugins/sega-cd/src/sega-cd-plugin.vala               |  2 +-
 plugins/sega-saturn/src/sega-saturn-plugin.vala       |  2 +-
 plugins/steam/src/steam-plugin.vala                   |  2 +-
 plugins/turbografx-cd/src/turbografx-cd-plugin.vala   |  2 +-
 plugins/virtual-boy/src/virtual-boy-plugin.vala       |  2 +-
 plugins/wii/src/wii-plugin.vala                       |  2 +-
 src/core/uid.vala                                     | 12 ++++++++++--
 src/database/database.vala                            |  2 +-
 src/generic/generic-uid.vala                          | 13 -------------
 src/meson.build                                       |  1 -
 src/retro/retro-simple-game-uri-adapter.vala          |  2 +-
 20 files changed, 27 insertions(+), 33 deletions(-)
---
diff --git a/plugins/desktop/src/desktop-plugin.vala b/plugins/desktop/src/desktop-plugin.vala
index 2f89356b..5334d582 100644
--- a/plugins/desktop/src/desktop-plugin.vala
+++ b/plugins/desktop/src/desktop-plugin.vala
@@ -61,7 +61,7 @@ private class Games.DesktopPlugin : Object, Plugin {
                var path = file.get_path ();
 
                var app_info = new DesktopAppInfo.from_filename (path);
-               var uid = new GenericUid (get_uid (app_info));
+               var uid = new Uid (get_uid (app_info));
                var title = new DesktopTitle (app_info);
                var icon = new DesktopIcon (app_info);
 
diff --git a/plugins/dreamcast/src/dreamcast-plugin.vala b/plugins/dreamcast/src/dreamcast-plugin.vala
index 526012bf..d8962928 100644
--- a/plugins/dreamcast/src/dreamcast-plugin.vala
+++ b/plugins/dreamcast/src/dreamcast-plugin.vala
@@ -46,7 +46,7 @@ private class Games.DreamcastPlugin : Object, Plugin {
                var header = new DreamcastHeader (file);
                header.check_validity ();
 
-               var uid = new GenericUid (get_uid (header));
+               var uid = new Uid (get_uid (header));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, MIME_TYPE);
                var cover = new CompositeCover ({
diff --git a/plugins/game-cube/src/game-cube-plugin.vala b/plugins/game-cube/src/game-cube-plugin.vala
index 51354f6e..c2ffd812 100644
--- a/plugins/game-cube/src/game-cube-plugin.vala
+++ b/plugins/game-cube/src/game-cube-plugin.vala
@@ -45,7 +45,7 @@ private class Games.GameCubePlugin : Object, Plugin {
                var header = new GameCubeHeader (file);
                header.check_validity ();
 
-               var uid = new GenericUid (get_uid (header));
+               var uid = new Uid (get_uid (header));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, MIME_TYPE);
                var cover = new CompositeCover ({
diff --git a/plugins/libretro/src/libretro-plugin.vala b/plugins/libretro/src/libretro-plugin.vala
index b4a65fec..a4e773c8 100644
--- a/plugins/libretro/src/libretro-plugin.vala
+++ b/plugins/libretro/src/libretro-plugin.vala
@@ -60,7 +60,7 @@ private class Games.LibretroPlugin : Object, Plugin {
        private static Game game_for_uri (Uri uri) throws Error {
                var core_descriptor = get_core_descriptor (uri);
 
-               var uid = new GenericUid (get_uid (core_descriptor));
+               var uid = new Uid (get_uid (core_descriptor));
                var title = new LibretroTitle (core_descriptor);
                var icon = new LibretroIcon (core_descriptor);
 
diff --git a/plugins/love/src/love-plugin.vala b/plugins/love/src/love-plugin.vala
index 2bdc4cb4..098c74f3 100644
--- a/plugins/love/src/love-plugin.vala
+++ b/plugins/love/src/love-plugin.vala
@@ -36,7 +36,7 @@ private class Games.LovePlugin : Object, Plugin {
        }
 
        private static Game game_for_uri (Uri uri) throws Error {
-               var uid = new GenericUid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
+               var uid = new Uid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
                var package = new LovePackage (uri);
                var title = new LoveTitle (package);
                var icon = new LoveIcon (package);
diff --git a/plugins/mame/src/mame-game-uri-adapter.vala b/plugins/mame/src/mame-game-uri-adapter.vala
index 1bd1e82f..59583c57 100644
--- a/plugins/mame/src/mame-game-uri-adapter.vala
+++ b/plugins/mame/src/mame-game-uri-adapter.vala
@@ -18,7 +18,7 @@ private class Games.MameGameUriAdapter : GameUriAdapter, Object {
                        throw new MameError.INVALID_GAME_ID (_("Invalid MAME game id “%s” for “%s”."), 
game_id, uri.to_string ());
 
                var uid_string = @"mame-$game_id".down ();
-               var uid = new GenericUid (uid_string);
+               var uid = new Uid (uid_string);
 
                var title_string = supported_games[game_id];
                title_string = title_string.split ("(")[0];
diff --git a/plugins/ms-dos/src/ms-dos-plugin.vala b/plugins/ms-dos/src/ms-dos-plugin.vala
index b50d6552..5c3ac606 100644
--- a/plugins/ms-dos/src/ms-dos-plugin.vala
+++ b/plugins/ms-dos/src/ms-dos-plugin.vala
@@ -32,7 +32,7 @@ private class Games.MsDosPlugin : Object, Plugin {
        }
 
        private static Game game_for_uri (Uri uri) throws Error {
-               var uid = new GenericUid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
+               var uid = new Uid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, MIME_TYPE);
                var cover = new CompositeCover ({
diff --git a/plugins/nintendo-ds/src/nintendo-ds-plugin.vala b/plugins/nintendo-ds/src/nintendo-ds-plugin.vala
index ece7d308..b599fb29 100644
--- a/plugins/nintendo-ds/src/nintendo-ds-plugin.vala
+++ b/plugins/nintendo-ds/src/nintendo-ds-plugin.vala
@@ -36,7 +36,7 @@ private class Games.NintendoDsPlugin : Object, Plugin {
        }
 
        private static Game game_for_uri (Uri uri) throws Error {
-               var uid = new GenericUid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
+               var uid = new Uid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
                var title = new FilenameTitle (uri);
                var icon = new NintendoDsIcon (uri);
                var media = new GriloMedia (title, MIME_TYPE);
diff --git a/plugins/playstation/src/playstation-game-factory.vala 
b/plugins/playstation/src/playstation-game-factory.vala
index a22b20e6..984821e2 100644
--- a/plugins/playstation/src/playstation-game-factory.vala
+++ b/plugins/playstation/src/playstation-game-factory.vala
@@ -152,7 +152,7 @@ public class Games.PlayStationGameFactory : Object, UriGameFactory {
                var uid_string = @"$PLATFORM_UID_PREFIX-$disc_set_id".down ();
 
                var gameinfo = get_gameinfo ();
-               var uid = new GenericUid (uid_string);
+               var uid = new Uid (uid_string);
                var title = new CompositeTitle ({
                        new GameinfoDiscIdGameTitle (gameinfo, disc_set_id),
                        new FilenameTitle (uri)
diff --git a/plugins/sega-cd/src/sega-cd-plugin.vala b/plugins/sega-cd/src/sega-cd-plugin.vala
index 81eb1a18..34b06531 100644
--- a/plugins/sega-cd/src/sega-cd-plugin.vala
+++ b/plugins/sega-cd/src/sega-cd-plugin.vala
@@ -81,7 +81,7 @@ private class Games.SegaCDPlugin : Object, Plugin {
 
                var bin_uri = new Uri (bin_file.get_uri ());
                var header_offset = header.get_offset ();
-               var uid = new GenericUid (Fingerprint.get_uid_for_chunk (bin_uri, SEGA_CD_UID_PREFIX, 
header_offset, SegaCDHeader.HEADER_LENGTH));
+               var uid = new Uid (Fingerprint.get_uid_for_chunk (bin_uri, SEGA_CD_UID_PREFIX, header_offset, 
SegaCDHeader.HEADER_LENGTH));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, SEGA_CD_MIME_TYPE);
                var cover = new CompositeCover ({
diff --git a/plugins/sega-saturn/src/sega-saturn-plugin.vala b/plugins/sega-saturn/src/sega-saturn-plugin.vala
index b510ec9c..302ad7bc 100644
--- a/plugins/sega-saturn/src/sega-saturn-plugin.vala
+++ b/plugins/sega-saturn/src/sega-saturn-plugin.vala
@@ -70,7 +70,7 @@ private class Games.SegaSaturnPlugin : Object, Plugin {
                var header = new SegaSaturnHeader (bin_file);
                header.check_validity ();
 
-               var uid = new GenericUid (get_uid (header));
+               var uid = new Uid (get_uid (header));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, SEGA_SATURN_MIME_TYPE);
                var cover = new CompositeCover ({
diff --git a/plugins/steam/src/steam-plugin.vala b/plugins/steam/src/steam-plugin.vala
index 947ad47e..7a932a37 100644
--- a/plugins/steam/src/steam-plugin.vala
+++ b/plugins/steam/src/steam-plugin.vala
@@ -102,7 +102,7 @@ private class Games.SteamPlugin : Object, Plugin {
                        assert_not_reached ();
                }
 
-               var uid = new GenericUid (@"$PLATFORM_UID_PREFIX-$prefix$game_id".down ());
+               var uid = new Uid (@"$PLATFORM_UID_PREFIX-$prefix$game_id".down ());
                var title = new GenericTitle (game_title);
                var icon = new SteamIcon (app_id, game_id);
                var cover = new SteamCover (game_id);
diff --git a/plugins/turbografx-cd/src/turbografx-cd-plugin.vala 
b/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
index 450ac3f0..0bdc9472 100644
--- a/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
+++ b/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
@@ -42,7 +42,7 @@ private class Games.TurboGrafxCDPlugin : Object, Plugin {
                if (!is_valid_disc (uri))
                        throw new TurboGrafxCDError.INVALID_DISC ("“%s” isn’t a valid TurboGrafx-CD disc.", 
uri.to_string ());
 
-               var uid = new GenericUid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
+               var uid = new Uid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, PHONY_MIME_TYPE);
                var cover = new CompositeCover ({
diff --git a/plugins/virtual-boy/src/virtual-boy-plugin.vala b/plugins/virtual-boy/src/virtual-boy-plugin.vala
index a3c5516b..729632e9 100644
--- a/plugins/virtual-boy/src/virtual-boy-plugin.vala
+++ b/plugins/virtual-boy/src/virtual-boy-plugin.vala
@@ -40,7 +40,7 @@ private class Games.VirtualBoyPlugin : Object, Plugin {
                var header = new VirtualBoyHeader (file);
                header.check_validity ();
 
-               var uid = new GenericUid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
+               var uid = new Uid (Fingerprint.get_uid (uri, PLATFORM_UID_PREFIX));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, MIME_TYPE);
                var cover = new CompositeCover ({
diff --git a/plugins/wii/src/wii-plugin.vala b/plugins/wii/src/wii-plugin.vala
index 8617b7ac..c1ff2697 100644
--- a/plugins/wii/src/wii-plugin.vala
+++ b/plugins/wii/src/wii-plugin.vala
@@ -45,7 +45,7 @@ private class Games.WiiPlugin : Object, Plugin {
                var header = new WiiHeader (file);
                header.check_validity ();
 
-               var uid = new GenericUid (get_uid (header));
+               var uid = new Uid (get_uid (header));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, MIME_TYPE);
                var cover = new CompositeCover ({
diff --git a/src/core/uid.vala b/src/core/uid.vala
index 0bfde305..5ae18aa1 100644
--- a/src/core/uid.vala
+++ b/src/core/uid.vala
@@ -1,5 +1,13 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-public interface Games.Uid : Object {
-       public abstract string get_uid () throws Error;
+public class Games.Uid : Object {
+       private string uid;
+
+       public Uid (string uid) {
+               this.uid = uid;
+       }
+
+       public string get_uid () throws Error {
+               return uid;
+       }
 }
diff --git a/src/database/database.vala b/src/database/database.vala
index df7f8280..f2e9b6a4 100644
--- a/src/database/database.vala
+++ b/src/database/database.vala
@@ -313,7 +313,7 @@ private class Games.Database : Object {
        }
 
        private Game create_game (string uid, string uri, string title, string platform, string? media_set) {
-               var game_uid = new GenericUid (uid);
+               var game_uid = new Uid (uid);
                var game_uri = new Uri (uri);
                var game_title = new GenericTitle (title);
                var game_platform = PlatformRegister.get_register ().get_platform (platform);
diff --git a/src/meson.build b/src/meson.build
index 6ffee93e..d1500e79 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -67,7 +67,6 @@ vala_sources = [
   'generic/generic-platform.vala',
   'generic/generic-runner-factory.vala',
   'generic/generic-title.vala',
-  'generic/generic-uid.vala',
   'generic/generic-uri-game-factory.vala',
 
   'grilo/grilo-cover.vala',
diff --git a/src/retro/retro-simple-game-uri-adapter.vala b/src/retro/retro-simple-game-uri-adapter.vala
index 35eed310..73aaf4c2 100644
--- a/src/retro/retro-simple-game-uri-adapter.vala
+++ b/src/retro/retro-simple-game-uri-adapter.vala
@@ -10,7 +10,7 @@ private class Games.RetroSimpleGameUriAdapter : GameUriAdapter, Object {
        }
 
        public Game game_for_uri (Uri uri) throws Error {
-               var uid = new GenericUid (Fingerprint.get_uid (uri, simple_type.prefix));
+               var uid = new Uid (Fingerprint.get_uid (uri, simple_type.prefix));
                var title = new FilenameTitle (uri);
                var media = new GriloMedia (title, simple_type.mime_type);
                var cover = new CompositeCover ({
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]