[gnome-games/wip/exalm/rebrand: 56/124] uri-game-factory: Drop scheme support




commit fe0a77df8271caf0a4c9804e8d40e565f9953fc9
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Mar 29 22:35:57 2021 +0500

    uri-game-factory: Drop scheme support

 src/core/game-collection.vala             | 30 +++---------------------------
 src/core/uri-game-factory.vala            |  4 ----
 src/generic/generic-uri-game-factory.vala | 10 ----------
 3 files changed, 3 insertions(+), 41 deletions(-)
---
diff --git a/src/core/game-collection.vala b/src/core/game-collection.vala
index c6bcc305..1b7e3ae0 100644
--- a/src/core/game-collection.vala
+++ b/src/core/game-collection.vala
@@ -14,7 +14,6 @@ private class Games.GameCollection : Object {
        private Database database;
 
        private HashTable<string, Array<UriGameFactory>> factories_for_mime_type;
-       private HashTable<string, Array<UriGameFactory>> factories_for_scheme;
 
        private SourceFunc search_games_cb;
        private bool is_preloading_done;
@@ -28,7 +27,6 @@ private class Games.GameCollection : Object {
                games = new HashTable<string, Game> (str_hash, str_equal);
                cached_games = new HashTable<string, Game> (str_hash, str_equal);
                factories_for_mime_type = new HashTable<string, Array<UriGameFactory>> (str_hash, str_equal);
-               factories_for_scheme = new HashTable<string, Array<UriGameFactory>> (str_hash, str_equal);
 
                add_source (database.get_uri_source ());
        }
@@ -46,12 +44,6 @@ private class Games.GameCollection : Object {
                        factories_for_mime_type[mime_type].append_val (factory);
                }
 
-               foreach (var scheme in factory.get_schemes ()) {
-                       if (!factories_for_scheme.contains (scheme))
-                               factories_for_scheme[scheme] = new Array<UriGameFactory> ();
-                       factories_for_scheme[scheme].append_val (factory);
-               }
-
                factory.set_game_added_callback (store_game);
        }
 
@@ -169,31 +161,15 @@ private class Games.GameCollection : Object {
        private UriGameFactory[] get_factories_for_uri (Uri uri) {
                UriGameFactory[] factories = {};
 
-               string scheme;
                try {
-                       scheme = uri.get_scheme ();
+                       var file = uri.to_file ();
+                       foreach (var factory in get_factories_for_file (file))
+                               factories += factory;
                }
                catch (Error e) {
                        debug (e.message);
-
-                       return factories;
                }
 
-               if (scheme == "file") {
-                       try {
-                               var file = uri.to_file ();
-                               foreach (var factory in get_factories_for_file (file))
-                                       factories += factory;
-                       }
-                       catch (Error e) {
-                               debug (e.message);
-                       }
-               }
-               // TODO Add support for URN.
-               if (factories_for_scheme.contains (scheme))
-                       foreach (var factory in factories_for_scheme[scheme].data)
-                               factories += factory;
-
                return factories;
        }
 
diff --git a/src/core/uri-game-factory.vala b/src/core/uri-game-factory.vala
index b9315a37..f635c95b 100644
--- a/src/core/uri-game-factory.vala
+++ b/src/core/uri-game-factory.vala
@@ -5,10 +5,6 @@ public interface Games.UriGameFactory : Object {
                return {};
        }
 
-       public virtual string[] get_schemes () {
-               return {};
-       }
-
        public abstract void add_uri (Uri uri);
        public abstract Game? query_game_for_uri (Uri uri);
        public abstract void foreach_game (GameCallback game_callback);
diff --git a/src/generic/generic-uri-game-factory.vala b/src/generic/generic-uri-game-factory.vala
index 186f32c4..ce4b9277 100644
--- a/src/generic/generic-uri-game-factory.vala
+++ b/src/generic/generic-uri-game-factory.vala
@@ -4,14 +4,12 @@ public class Games.GenericUriGameFactory : Object, UriGameFactory {
        private GameUriAdapter game_uri_adapter;
        private HashTable<Uri, Game> game_for_uri;
        private string[] mime_types;
-       private string[] schemes;
        private unowned GameCallback game_added_callback;
 
        public GenericUriGameFactory (GameUriAdapter game_uri_adapter) {
                this.game_uri_adapter = game_uri_adapter;
                game_for_uri = new HashTable<Uri, Game> (Uri.hash, Uri.equal);
                mime_types = {};
-               schemes = {};
        }
 
        public string[] get_mime_types () {
@@ -22,14 +20,6 @@ public class Games.GenericUriGameFactory : Object, UriGameFactory {
                mime_types += mime_type;
        }
 
-       public string[] get_schemes () {
-               return schemes;
-       }
-
-       public void add_scheme (string scheme) {
-               schemes += scheme;
-       }
-
        public void add_uri (Uri uri) {
                if (game_for_uri.contains (uri))
                        return;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]