Remote templates v2 (#237)

Author: Philip-Scott

data/com.github.philip-scott.spice-up.appdata.xml

@@ -26,7 +26,7 @@
     <binary>spice-up</binary>
   </provides>
   <releases>
-    <release version="1.6.0" date="2018-9-23">
+    <release version="1.6.1" date="2018-10-3">
       <description>
         <p>Slide Transitions and the Slide List Redesign</p>
         <ul>

src/Services/Fetcher.vala

@@ -20,9 +20,9 @@
 */
 
 public class Spice.Services.Fetcher {
-    private const string TEMPLATES_URL = "https://spice-up-dev.azurewebsites.net/api/get-templates";
+    private const string TEMPLATES_URL = "https://spice-up-prod.azurewebsites.net/api/";
     private const int64 CACHE_LIFE = 43200; // 1/2 a day
-    public const int CURRENT_VERSION = 1;
+    public const string CURRENT_VERSION = "2";
 
     private File cache_file;
     private string cache = "";
@@ -32,7 +32,7 @@ public class Spice.Services.Fetcher {
         cache_file = File.new_for_path (Environment.get_tmp_dir () + "/com.github.philip-scott.spice-up.cache.json");
     }
 
-    public void fetch () {
+    public void fetch_templates () {
         var now = new DateTime.now_utc ().to_unix ();
 
         var settigns = Spice.Services.Settings.get_instance ();
@@ -44,7 +44,7 @@ public class Spice.Services.Fetcher {
             debug ("Getting templates from server\n");
             new Thread<void*> ("fetch-templates", () => {
                 var session = new Soup.Session ();
-                var message = new Soup.Message ("GET", TEMPLATES_URL);
+                var message = new Soup.Message ("GET", TEMPLATES_URL + "get-templates");
 
                 session.send_message (message);
 
@@ -56,6 +56,7 @@ public class Spice.Services.Fetcher {
                 mutex.lock ();
 
                 cache = data.str;
+
                 if (cache != "") {
                     save_to_cache (cache);
                     settigns.last_fetch = now.to_string ();
@@ -70,6 +71,20 @@ public class Spice.Services.Fetcher {
         }
     }
 
+    public static string get_template_data (string template) {
+        var session = new Soup.Session ();
+        var message = new Soup.Message ("GET", TEMPLATES_URL + template);
+
+        session.send_message (message);
+
+        var data = new StringBuilder ();
+        foreach (var c in message.response_body.data) {
+            data.append ("%c".printf (c));
+        }
+
+        return data.str;
+    }
+
     public string get_data () {
         mutex.lock ();
         if (cache == "" && cache_file.query_exists ()) {

src/Widgets/Library/Library.vala

@@ -57,7 +57,26 @@ public class Spice.Widgets.Library.Library : Gtk.ScrolledWindow {
         item_box.min_children_per_line = 2;
 
         item_box.child_activated.connect ((child) => {
-            item_selected ((child as LibraryItem).data);
+            var library_item = child as LibraryItem;
+            if (library_item == null) return;
+
+            if (library_item.remote_path == null) {
+                item_selected (library_item.data);
+            } else {
+                sensitive = false;
+                new Thread<void*> ("fetch-template", () => {
+                    var data = Spice.Services.Fetcher.get_template_data (library_item.remote_path);
+
+                    Idle.add (() => {
+                        item_selected (data);
+                        sensitive = true;
+                        return GLib.Source.REMOVE;
+                    });
+                    return null;
+                });
+            }
+
+
         });
     }
 
@@ -80,8 +99,8 @@ public class Spice.Widgets.Library.Library : Gtk.ScrolledWindow {
         item_box.add (item);
     }
 
-    public void add_from_data (string data, string? file_name) {
-        var item = new LibraryItem.from_data (data, file_name);
+    public void add_remote (string file_name, string path, string data) {
+        var item = new LibraryItem.from_remote (data, file_name, path);
         item_box.add (item);
     }
 }

src/Widgets/Library/LibraryItem.vala

@@ -37,6 +37,7 @@ public class Spice.Widgets.Library.LibraryItem : Gtk.FlowBoxChild {
     }
 
     public string data { get; construct set; }
+    public string? remote_path {get; construct set; default = null; }
 
     private SlideWidget slide_widget;
     private Gtk.Popover? popover = null;
@@ -51,11 +52,12 @@ public class Spice.Widgets.Library.LibraryItem : Gtk.FlowBoxChild {
         get_thumbnail ();
     }
 
-    public LibraryItem.from_data (string data, string? file_name) {
-        Object (data: data);
+    public LibraryItem.from_remote (string data, string file_name, string path) {
+        Object (data: data, remote_path: path);
 
         title_label.label = file_name;
-        load_thumbnail ();
+        load_thumbnail (data);
+        set_tooltip_text (_("Create Presentation"));
     }
 
     construct {
@@ -202,19 +204,21 @@ public class Spice.Widgets.Library.LibraryItem : Gtk.FlowBoxChild {
             new Thread<void*> ("content-loading", () => {
                 if (real_file) {
                     get_file_data ();
+                    load_thumbnail (Utils.get_thumbnail_data (data));
+                } else if (remote_path != null) {
+                    load_thumbnail (data);
                 } else {
                     get_template_data ();
+                    load_thumbnail (Utils.get_thumbnail_data (data));
                 }
 
-                load_thumbnail ();
-
                 return null;
             });
         }
     }
 
-    private void load_thumbnail () {
-        var pixbuf = Utils.base64_to_pixbuf (Utils.get_thumbnail_data (data));
+    private void load_thumbnail (string base64_image) {
+        var pixbuf = Utils.base64_to_pixbuf (base64_image);
 
         Idle.add (() => {
             slide_widget.pixbuf = pixbuf;

src/Widgets/Welcome.vala

@@ -33,7 +33,7 @@ public class Spice.Welcome : Gtk.Box {
 
     public Welcome () {
         fetcher = new Spice.Services.Fetcher ();
-        fetcher.fetch ();
+        fetcher.fetch_templates ();
 
         orientation = Gtk.Orientation.HORIZONTAL;
         get_style_context ().add_class ("view");
@@ -121,14 +121,18 @@ public class Spice.Welcome : Gtk.Box {
 
         if (json_data == null) return;
 
-        if (json_data.get_int_member ("version") > Spice.Services.Fetcher.CURRENT_VERSION) return;
+        if (json_data.get_string_member ("version") != Spice.Services.Fetcher.CURRENT_VERSION) return;
 
         var templates_array = json_data.get_array_member ("templates");
 
         Idle.add (() => {
             foreach (var raw in templates_array.get_elements ()) {
                 var template = raw.get_object ();
-                templates.add_from_data (template.get_string_member ("data"), template.get_string_member ("name"));
+                templates.add_remote (
+                    template.get_string_member ("name"),
+                    template.get_string_member ("url"),
+                    template.get_string_member ("preview")
+                );
             }
             return GLib.Source.REMOVE;
         });