[swell-foop/arnaudb/libgnome-games-support] Use lggs Scores dialog.

[Arnaud B. <arnaudb src gnome org>]

commit d5c092b34fbcbf0f8a44b577c4175925818ee42b
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat May 2 23:48:56 2020 +0200

    Use lggs Scores dialog.
    
    Fixes #7.

 data/swell-foop.ui       |   1 -
 meson.build              |   2 +
 org.gnome.SwellFoop.json |  20 +++++
 src/history.vala         | 114 ----------------------------
 src/meson.build          |   4 +-
 src/score-dialog.vala    | 188 -----------------------------------------------
 src/swell-foop.vala      |  19 +++--
 src/window.vala          | 154 +++++++++++++++++++++++++++++++++-----
 8 files changed, 170 insertions(+), 332 deletions(-)
---
diff --git a/data/swell-foop.ui b/data/swell-foop.ui
index 8b17aac..9fe4b78 100644
--- a/data/swell-foop.ui
+++ b/data/swell-foop.ui
@@ -53,7 +53,6 @@
   </menu>
   <requires lib="gtk+" version="3.12"/>
   <template class="SwellFoopWindow" parent="GtkApplicationWindow">
-    <property name="visible">True</property>
     <property name="resizable">False</property>
     <property name="icon-name">org.gnome.SwellFoop</property>
     <!-- Translators: title of the window displayed by window managers; name of the application -->
diff --git a/meson.build b/meson.build
index ff39ce0..e5560b8 100644
--- a/meson.build
+++ b/meson.build
@@ -25,6 +25,8 @@ gobject_dep     = dependency('gobject-2.0')
 gtk_dep         = dependency('gtk+-3.0', version: '>= 3.24')
 clutter_dep     = dependency('clutter-1.0', version: '>= 1.14.0')
 clutter_gtk_dep = dependency('clutter-gtk-1.0', version: '>= 1.5.0')
+lggs_dep        = dependency('libgnome-games-support-1')
+gee_dep         = dependency('gee-0.8', version: '>= 0.14.0')
 
 # Check for compilers
 valac = meson.get_compiler('vala')
diff --git a/org.gnome.SwellFoop.json b/org.gnome.SwellFoop.json
index f42f32e..d2f5667 100644
--- a/org.gnome.SwellFoop.json
+++ b/org.gnome.SwellFoop.json
@@ -19,6 +19,26 @@
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
     "modules" : [
+        {
+            "name": "libgee",
+            "config-opts": ["--enable-introspection=no"],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/libgee.git";
+                }
+            ]
+        },
+        {
+            "name": "libgnome-games-support",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/libgnome-games-support.git";
+                }
+            ]
+        },
         {
             "name" : "swell-foop",
             "buildsystem" : "meson",
diff --git a/src/meson.build b/src/meson.build
index b5ef3f9..070bba4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,8 +1,6 @@
 sources = [
-  'history.vala',
   'game.vala',
   'game-view.vala',
-  'score-dialog.vala',
   'swell-foop.vala',
   'window.vala',
 ]
@@ -20,6 +18,8 @@ deps = [
   gtk_dep,
   clutter_dep,
   clutter_gtk_dep,
+  lggs_dep,
+  gee_dep,
 ]
 
 c_flags = [
diff --git a/src/swell-foop.vala b/src/swell-foop.vala
index d5044f6..2ae9cdb 100644
--- a/src/swell-foop.vala
+++ b/src/swell-foop.vala
@@ -21,15 +21,20 @@ public class SwellFoop : Gtk.Application
     private Gtk.Dialog? preferences_dialog = null;
 
     /* Store size options */
-    internal Size [] sizes = {
-        /* Translators: name of a possible size of the grid, as seen in the Preferences dialog “board size” 
combobox */
-        { "small",  _("Small"),   6,  5 },
+    internal static Size [] sizes;
+    class construct
+    {
+        sizes = {
+            /* Translators: name of a possible size of the grid, as seen in the Preferences dialog “board 
size” combobox */
+            { "small",  _("Small"),   6,  5 },
 
-        /* Translators: name of a possible size of the grid, as seen in the Preferences dialog “board size” 
combobox */
-        { "normal", _("Normal"), 15, 10 },
+            /* Translators: name of a possible size of the grid, as seen in the Preferences dialog “board 
size” combobox */
+            { "normal", _("Normal"), 15, 10 },
 
-        /* Translators: name of a possible size of the grid, as seen in the Preferences dialog “board size” 
combobox */
-        { "large",  _("Large"),  20, 15 }};
+            /* Translators: name of a possible size of the grid, as seen in the Preferences dialog “board 
size” combobox */
+            { "large",  _("Large"),  20, 15 }
+        };
+    }
 
     private const GLib.ActionEntry[] action_entries =
     {
diff --git a/src/window.vala b/src/window.vala
index 3beb6a9..c7161bd 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -27,9 +27,6 @@ private class SwellFoopWindow : ApplicationWindow
 
     public GLib.Settings settings { private get; protected construct; }
 
-    /* Game history */
-    private History history;
-
     /* Game being played */
     private Game? game = null;
 
@@ -53,6 +50,8 @@ private class SwellFoopWindow : ApplicationWindow
 
         add_events (Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK);
 
+        init_scores ();
+
         /* show the current score */
         update_score_cb (0);
 
@@ -102,9 +101,6 @@ private class SwellFoopWindow : ApplicationWindow
 
         /* When the mouse leaves the window we need to update the view */
         clutter_embed.leave_notify_event.connect (view.board_left_cb);
-
-        history = new History (Path.build_filename (Environment.get_user_data_dir (), "swell-foop", 
"history"));
-        history.load ();
     }
 
     private inline Stack build_first_run_stack ()
@@ -152,10 +148,7 @@ private class SwellFoopWindow : ApplicationWindow
 
     private void complete_cb ()
     {
-        var date = new DateTime.now_local ();
-        var entry = new HistoryEntry (date, game.columns, game.rows, game.color_num, game.score);
-        history.add (entry);
-        history.save ();
+        Idle.add (() => { add_score (); return Source.REMOVE; });
         game_in_progress = false;
     }
 
@@ -166,13 +159,13 @@ private class SwellFoopWindow : ApplicationWindow
 
     private Size get_board_size ()
     {
-        for (var i = 0; i < ((SwellFoop) application).sizes.length; i++)
+        for (var i = 0; i < SwellFoop.sizes.length; i++)
         {
-            if (((SwellFoop) application).sizes[i].id == settings.get_string ("size"))
-                return ((SwellFoop) application).sizes[i];
+            if (SwellFoop.sizes [i].id == settings.get_string ("size"))
+                return SwellFoop.sizes [i];
         }
 
-        return ((SwellFoop) application).sizes[0];
+        return SwellFoop.sizes [0];
     }
 
     /*\
@@ -222,12 +215,7 @@ private class SwellFoopWindow : ApplicationWindow
 
     private inline void scores_cb (/* SimpleAction action, Variant? variant */)
     {
-        var dialog = new ScoreDialog (history);
-        dialog.modal = true;
-        dialog.transient_for = this;
-
-        dialog.run ();
-        dialog.destroy ();
+        scores_context.run_dialog ();
     }
 
     private inline void new_game_cb (/* SimpleAction action, Variant? variant */)
@@ -305,4 +293,130 @@ private class SwellFoopWindow : ApplicationWindow
 
         return false;
     }
+
+    /*\
+    * * scores
+    \*/
+
+    private Games.Scores.Context scores_context;
+    private static HashTable<string, Games.Scores.Category> score_categories;
+
+    class construct
+    {
+        score_categories = new HashTable<string, Games.Scores.Category> (str_hash, str_equal);
+        for (uint8 i = 2; i <= 4; i++)
+            foreach (unowned Size size in SwellFoop.sizes)
+            {
+                string id = @"$(size.id)-$i";
+                string name = ngettext ("%s, %d color", "%s, %d colors", i).printf (size.name, i);
+                Games.Scores.Category category = new Games.Scores.Category (id, name);
+                score_categories.insert (id, (owned) category);
+            }
+    }
+
+    private inline void init_scores ()  // called on construct
+    {
+        scores_context = new Games.Scores.Context.with_importer (
+            "swell-foop",
+            /* Translators: in the Scores dialog, label introducing for which board configuration (size and 
number of colors) the best scores are displayed */
+            _("Type"),
+            this,
+            category_request,
+            Games.Scores.Style.POINTS_GREATER_IS_BETTER,
+            new Games.Scores.HistoryFileImporter (parse_old_score));
+    }
+
+    private inline Games.Scores.Category? category_request (string key)
+    {
+        Games.Scores.Category? category = score_categories.lookup (key);
+        if (category == null)
+            assert_not_reached ();
+        return (!) category;
+    }
+
+    private inline void parse_old_score (string line, out Games.Scores.Score? score, out 
Games.Scores.Category? category)
+    {
+        score = null;
+        category = null;
+
+        string [] tokens = line.split (" ");
+        if (tokens.length != 5)
+            return;
+
+        int64 date = Games.Scores.HistoryFileImporter.parse_date (tokens [0]);
+        if (date == 0)
+            return;
+
+        uint64 number_64;
+
+        uint8 cols;
+        uint8 rows;
+        // cols
+        if (!uint64.try_parse (tokens [1], out number_64))
+            return;
+        if (number_64 == 0 || number_64 > 255)
+            return;
+        cols = (uint8) number_64;
+        // rows
+        if (!uint64.try_parse (tokens [2], out number_64))
+            return;
+        if (number_64 == 0 || number_64 > 255)
+            return;
+        rows = (uint8) number_64;
+
+        string id = "";
+        foreach (unowned Size size in SwellFoop.sizes)
+        {
+            if (size.rows == rows && size.columns == cols)
+            {
+                id = size.id;
+                break;
+            }
+        }
+        if (id == "")
+            return;
+
+        uint8 colors;
+        long score_value;
+        // colors
+        if (!uint64.try_parse (tokens [3], out number_64))
+            return;
+        if (number_64 < 2 || number_64 > 4)
+            return;
+        colors = (uint8) number_64;
+        // score
+        if (!uint64.try_parse (tokens [4], out number_64))
+            return;
+        if (number_64 > long.MAX)
+            return;
+        score_value = (long) number_64;
+
+        category = category_request (@"$id-$colors");
+        score = new Games.Scores.Score (score_value, date);
+        score.user = Environment.get_real_name ();
+        if (score.user == "Unknown")
+            score.user = Environment.get_user_name ();
+    }
+
+    private inline void add_score ()
+    {
+        string id = @"$(get_board_size ().id)-$(game.color_num)";
+        Games.Scores.Category? category = score_categories.lookup (id);
+        if (category == null)
+            assert_not_reached ();
+        scores_context.add_score.begin (game.score,
+                                        (!) category,
+                                        /* cancellable */ null,
+                                        (object, result) => {
+                try
+                {
+                    scores_context.add_score.end (result);
+                }
+                catch (Error e)
+                {
+                    warning ("Failed to add score: %s", e.message);
+                }
+                scores_context.run_dialog ();
+            });
+    }
 }