Merge lp:~mefrio-g/light-software-center/libappstore-port into lp:light-software-center

[Mario Guerriero]

This is a porting to libappstore lib

=== modified file 'build.sh'
--- build.sh	2012-07-10 16:27:53 +0000
+++ build.sh	2012-07-28 20:36:19 +0000
@@ -5,7 +5,7 @@
 echo -e "\t * libsqlheavy-dev"
 
 
-VALAC_PKGS="--pkg gio-2.0 --pkg packagekit-glib2 --pkg gtk+-3.0 --pkg sqlheavy-0.1"
+VALAC_PKGS="--pkg gio-2.0 --pkg packagekit-glib2 --pkg gtk+-3.0 --pkg sqlheavy-0.1 --pkg appstore"
 VALAC_FLAGS="--vapidir=vapi/  -X 
 -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE"
 BIN="light-software-center"
 
=== removed directory 'src/Backend'
=== removed file 'src/Backend/AppsManager.vala'
--- src/Backend/AppsManager.vala	2012-07-12 14:59:00 +0000
+++ src/Backend/AppsManager.vala	1970-01-01 00:00:00 +0000
@@ -1,207 +0,0 @@
-//  Copyright © 2012 Stephen Smally
-//      This program is free software; you can redistribute it and/or modify
-//      it under the terms of the GNU General Public License as published by
-//      the Free Software Foundation; either version 2 of the License, or
-//      (at your option) any later version.
-//      
-//      This program is distributed in the hope that it will be useful,
-//      but WITHOUT ANY WARRANTY; without even the implied warranty of
-//      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//      GNU General Public License for more details.
-//      
-//      You should have received a copy of the GNU General Public License
-//      along with this program; if not, write to the Free Software
-//      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-//      MA 02110-1301, USA.
-//      
-
-using PackageKit;
-using SQLHeavy;
-
-namespace Lsc.Backend { 
-    public class AppsManager : Object {
-        // Signals
-        public signal void app_added (LscApp app);
-        public signal void category_added (LscCategory cat);
-        public signal void loading_started (LoadingType load, string text);
-        public signal void loading_finished (LoadingType load);
-        public signal void loading_progress (int percentage);
-        public signal void details_received (LscApp app, Package pkg, Details details);
-        
-        // PackageKit stuffs
-        private Client client;
-        private Control control;
-        private Task task;
-        private Cancellable transaction;
-        
-        // SQLHeavy stuffs
-        private Database database;
-        
-        public void remove_packages (string[] ids, bool deps, bool auto) {
-			loading_started (LoadingType.REMOVE, "Removing packages...");
-			task.remove_packages_async (ids,
-			                            deps,
-			                            auto,
-			                            null,
-			                            (p) => {
-											if (p.percentage != -1) {
-												loading_progress (p.percentage);
-											}
-										},
-			                            () => {
-										    loading_finished (LoadingType.REMOVE);
-										});
-		}
-        
-        public void install_packages (string[] ids) {
-			loading_started (LoadingType.INSTALL, "Installing packages...");
-			task.install_packages_async (ids,
-			                             null,
-			                             (p) => {
-											 if (p.percentage != -1) {
-										         loading_progress (p.percentage);
-											 }
-										 },
-			                             () => {
-											 loading_finished (LoadingType.INSTALL);
-										 });
-		}
-        
-        public void get_pkgs (string category) {
-            try {
-				Query get_query = database.prepare ("SELECT * FROM '%s';".printf (category));
-				QueryResult result = get_query.execute ();
-				
-				for (int record = 1; ! result.finished; record++, result.next ()) {
-					app_added (new LscApp (
-					           result.fetch_string (0),
-					           result.fetch_string (1),
-					           result.fetch_string (2),
-					           result.fetch_string (3)));
-					//if ("x" in result.fetch_string (0))
-					    //stdout.printf ("\n%s", result.fetch_string (0));
-				}		
-			} catch (GLib.Error e) {
-				GLib.error ("Error retrieving packages: %s\n", e.message);
-			}
-				
-        }
-        
-        private void get_details_2 (LscApp pkg, Package p) {
-			client.get_details_async({p.get_id(), null},
-            null,
-            () => {
-				while (Gtk.events_pending()) {
-                    Gtk.main_iteration();
-				}
-			},
-            (obj, resu) => {
-				try {
-					Results res = client.generic_finish (resu);
-					details_received (pkg, p, res.get_details_array()[0]);
-			    } catch (GLib.Error e) {
-					stderr.printf ("ERROR! %s\n", e.message);
-				}
-				loading_finished (LoadingType.DETAILS);
-			}
-            );
-		}
-        
-        public void get_details (LscApp pkg) {
-			loading_started (LoadingType.DETAILS, "Loading infos...");
-			client.resolve_async(0,
-            {pkg.id, null},
-            null,
-            () => {
-				while (Gtk.events_pending()) {
-                    Gtk.main_iteration();
-				}
-			},
-            (obj, resu) => {
-				try {
-					Results res = client.generic_finish (resu);
-				    get_details_2 (pkg, res.get_package_array()[0]);
-				} catch (GLib.Error e) {
-					stdout.printf ("ERROR! %s\n", e.message);
-				}
-			});
-        }
-        
-        private int count_category (string category) {
-			try {
-				Query q = database.prepare ("SELECT COUNT (*) FROM '%s';".printf (category));
-	            QueryResult r = q.execute();
-	            return r.fetch_int (0);
-			} catch (GLib.Error e) {
-				stdout.printf ("ERROR! %s\n", e.message);
-			}
-			return -1;
-		}
-        
-        public void get_categories () {
-			loading_started(LoadingType.CATEGORIES, "Loading categories...");
-            try {
-				Query cat_query = database.prepare ("SELECT * FROM 'DIRECTORIES';");
-				QueryResult result = cat_query.execute ();
-				
-				for (int record = 1; ! result.finished; record++, result.next ()) {
-					category_added (new LscCategory (result.fetch_string (0),
-								  result.fetch_string (1),
-								  result.fetch_string (2),
-								  result.fetch_string (3),
-								  count_category (result.fetch_string (0))));
-				}
-			} catch (GLib.Error e) {
-				GLib.error ("Error retrieving packages: %s\n", e.message);
-			}
-            
-            loading_finished(LoadingType.CATEGORIES);
-        }
-        
-        public void search_for_apps (string search_string) {
-            
-            // Categories
-            try {
-				Query get_query = database.prepare ("SELECT * FROM 'DIRECTORIES';");
-				QueryResult result = get_query.execute ();
-				
-				// Foreach category
-				for (int record = 1; ! result.finished; record++, result.next ()) {
-					// Check for a package
-					stdout.printf ("\n%s", result.fetch_string (0));
-					try {
-				        get_query = database.prepare ("SELECT * FROM '%s';".printf (result.fetch_string (0)));
-				        result = get_query.execute ();
-				
-				        for (record = 1; ! result.finished; record++, result.next ()) {
-					        if (search_string in result.fetch_string (0)) // If something is found let's send the application
-					            app_added (new LscApp (
-					                   result.fetch_string (0),
-					                   result.fetch_string (1),
-					                   result.fetch_string (2),
-					                   result.fetch_string (3)));
-				        }		
-			        } catch (GLib.Error e) {
-				        GLib.error ("Error retrieving packages: %s\n", e.message);
-			        }
-				}		
-			} catch (GLib.Error e) {
-				GLib.error ("Error retrieving packages: %s\n", e.message);
-			}        
-        }
-        
-        public AppsManager () {
-            client = new Client();
-            control = new Control();
-            task = new Task();
-            transaction = new Cancellable();
-            stdout.printf ("Cache age: %ld\n", client.get_cache_age());
-            
-            try {
-	            database = new Database ("/var/cache/lsc-vala.db", FileMode.READ);
-			} catch (GLib.Error e) {
-				GLib.error ("Error opening the database: %s\nPlease run 'lsc-db-build -d /var/cache/lsc-packages.db' as root", e.message);
-			}
-        }
-    }
-}
 
=== removed file 'src/Backend/Backend.vala'
--- src/Backend/Backend.vala	2012-07-12 09:21:39 +0000
+++ src/Backend/Backend.vala	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-
-namespace Lsc.Backend {
-    public enum LoadingType {
-        PACKAGES, // Loaded packages
-        CATEGORIES, // Loaded categories
-        DETAILS, // Loading details
-        INSTALL,
-        REMOVE, // Installed or so
-        SEARCH; // When it is searching apps
-    }
-    
-    public enum ActionType {
-		INSTALL,
-		REMOVE;
-	}
-    
-    public enum ResponseId {
-		INFO,
-		INSTALL;
-	}
-    
-    public class LscCategory : Object {
-        public string id;
-        public string name;
-        public string summary;
-        public string icon;
-        public int records;
-        
-        public LscCategory (string id, string name, string summary, string icon, int records = 0) {
-            this.id = id;
-            this.name = name;
-            this.summary = summary;
-            this.icon = icon;
-            this.records = records;
-        }
-    }
-    
-    public class LscApp : Object {
-		public string id { get; private set; } // A valid id retrieved from a PkPackage
-		public string name { get; private set; }
-		public string summary { get; private set; }
-		public string icon { get; set; }
-		
-		public LscApp (string id, string name, string summary, string icon) {
-			this.id = id;
-			this.name = name;
-			this.summary = summary;
-			this.icon = icon;
-		}
-	}   
-}
 
=== modified file 'src/Frontend.vala'
--- src/Frontend.vala	2012-07-12 09:21:39 +0000
+++ src/Frontend.vala	2012-07-28 20:36:19 +0000
@@ -16,14 +16,13 @@
 //      
 
 using Gtk;
-using Lsc.Backend;
 using Lsc.Utils;
 using Lsc.Widgets;
 
 namespace Lsc {
     // Elements which should be accessible to every void or class
-    public LscCategory last_category;
-    public LscApp last_app;
+    public AppStore.Category last_category;
+    public AppStore.ModelApp last_app;
     
     public enum PageType {
         HOMEPAGE,
@@ -49,7 +48,7 @@
     }
     
     // Apps Manager which handle the PackageKit connection
-    public AppsManager apps_manager;
+    public AppStore.AppsManager apps_manager;
     
     public class Frontend : Window {
         // Widgets
@@ -64,7 +63,7 @@
         private int _width = 0;
         
         public Frontend () {
-            apps_manager = new AppsManager();
+            apps_manager = new AppStore.AppsManager();
             
             destroy.connect(Gtk.main_quit);
             size_allocate.connect(on_size_allocate);
@@ -110,35 +109,35 @@
             set_focus(null);
         }
         
-        public void on_info_message_response (ResponseId id, LscApp app) {
+        public void on_info_message_response (AppStore.ResponseId id, AppStore.ModelApp app) {
 			switch (id) {
-				case ResponseId.INFO:
+				case AppStore.ResponseId.INFO:
 				    load_details (app);
 				    break;
-				case ResponseId.INSTALL:
+				case AppStore.ResponseId.INSTALL:
 				    break;
 			}
 		}
         
-        public void load_details (LscApp app) {
+        public void load_details (AppStore.ModelApp app) {
 			info_message.set_visible (false);
 			last_app = app;
 			apps_manager.get_details (app);
 			pages_view.set_page(PageType.APPSINFO);
 		}
         
-        public void load_packages (LscCategory category) {
+        public void load_packages (AppStore.Category category) {
 			last_category = category;
             pages_view.set_page(PageType.APPSVIEW);
             pages_view.apps_view.apps_tree.clear();
-            apps_manager.get_pkgs(category.id);
+            apps_manager.get_apps(category.id);
             toolbar.label.label = category.name;
             info_message.set_visible (false);
         }
         
-        public void on_action_response (ActionType type, string id) {
+        public void on_action_response (AppStore.ActionType type, string id) {
 			switch (type) {
-				case ActionType.INSTALL:
+				case AppStore.ActionType.INSTALL:
 				    apps_manager.install_packages ({id, null});
 				    break;
 				default:
@@ -247,18 +246,18 @@
 			return true;
 		}
         
-        public void on_load_started (LoadingType load, string comment) {
+        public void on_load_started (AppStore.LoadingType load, string comment) {
             switch (load) {
-                case LoadingType.PACKAGES:
+                case AppStore.LoadingType.PACKAGES:
                     progress_info.load (comment);
                     break;
-                case LoadingType.DETAILS:
+                case AppStore.LoadingType.DETAILS:
                     pages_view.apps_info.start_load();
                     break;
-                case LoadingType.INSTALL:
+                case AppStore.LoadingType.INSTALL:
                     progress_info.load (comment);
                     break;
-                case LoadingType.REMOVE:
+                case AppStore.LoadingType.REMOVE:
                     progress_info.load (comment);
                     break;
                 default:
@@ -267,15 +266,15 @@
             info_box.set_visible (true);
         }
         
-        public void on_load_finished (LoadingType load) {
+        public void on_load_finished (AppStore.LoadingType load) {
             switch (load) {
-                case LoadingType.CATEGORIES:
+                case AppStore.LoadingType.CATEGORIES:
                     rework_categories_columns();
                     break;
-                case LoadingType.PACKAGES:
+                case AppStore.LoadingType.PACKAGES:
                     progress_info.clear();
                     break;
-                case LoadingType.DETAILS:
+                case AppStore.LoadingType.DETAILS:
                     progress_info.clear();
                     break;
                 default:
 
=== modified file 'src/Widgets/InfoMessage.vala'
--- src/Widgets/InfoMessage.vala	2012-07-10 09:44:20 +0000
+++ src/Widgets/InfoMessage.vala	2012-07-28 20:36:19 +0000
@@ -16,27 +16,26 @@
 //      
 
 using Gtk;
-using Lsc.Backend;
 
 namespace Lsc.Widgets {
     public class InfoMessage : InfoBar {
         // Signals
-        public signal void choosed (ResponseId id, LscApp app);
+        public signal void choosed (AppStore.ResponseId id, AppStore.ModelApp app);
         
         // Widgets
         public Label text;
         public Button info_button;
         public Button action_button;
-        private LscApp current_app;
+        private AppStore.ModelApp current_app;
         
-        public void update (LscApp app) {
+        public void update (AppStore.ModelApp app) {
 			current_app = app;
             set_visible (true);
             text.set_label("Selected package <b>%s</b>".printf (app.id));
         }
         
         public void get_response (InfoBar bar, int id) {
-			choosed ((ResponseId) id, current_app);
+			choosed ((AppStore.ResponseId) id, current_app);
 		}
         
         public InfoMessage () {
@@ -51,7 +50,7 @@
             text.use_markup = true;
             text.ellipsize = Pango.EllipsizeMode.END;
             
-            add_button(Stock.INFO, ResponseId.INFO);
+            add_button(Stock.INFO, AppStore.ResponseId.INFO);
             
             focus_out_event.connect(() => {
                 set_visible(false);
 
=== modified file 'src/Widgets/Pages/AppsInfo.vala'
--- src/Widgets/Pages/AppsInfo.vala	2012-07-10 19:06:05 +0000
+++ src/Widgets/Pages/AppsInfo.vala	2012-07-28 20:36:19 +0000
@@ -18,12 +18,11 @@
 using Gtk;
 using PackageKit;
 using Lsc.Widgets;
-using Lsc.Backend;
 using Granite.Widgets;
 
 namespace Lsc.Pages {
     public class AppsInfo : BlankBox {
-		public signal void action_response (ActionType type, string id);
+		public signal void action_response (AppStore.ActionType type, string id);
 		
         private Separator separator;
         public RoundBox reviews_box;
@@ -42,15 +41,15 @@
         private Label license;
         private Button action_button;
         private string pkg_id;
-        private ActionType action_type;
+        private AppStore.ActionType action_type;
         
-        public void set_action (ActionType type) {
+        public void set_action (AppStore.ActionType type) {
 			action_type = type;
 			switch (type) {
-				case ActionType.INSTALL:
+				case AppStore.ActionType.INSTALL:
 				    action_button.label = "Install";
 				    break;
-				case ActionType.REMOVE:
+				case AppStore.ActionType.REMOVE:
 				    action_button.label = "Remove";
 				    break;
 			}
@@ -61,17 +60,19 @@
 				case Info.INSTALLED:
 				    status_icon.set_from_stock (Stock.YES, IconSize.MENU);
 				    status_label.label = "Installed";
-				    set_action (ActionType.REMOVE);
+				    set_action (AppStore.ActionType.REMOVE);
 				    break;
 				default:
 				    status_icon.set_from_icon_name ("applications-internet", IconSize.MENU);
 				    status_label.label = "Available";
-				    set_action (ActionType.INSTALL);
+				    set_action (AppStore.ActionType.INSTALL);
 				    break;
 			}
 		}
         
-        public void set_details (LscApp app, Package pkg, Details details) {
+        public void set_details (AppStore.App app) {
+			var pkg = app.package;
+			
 			pkg_id = pkg.get_id();
 			
 			this.show_children();
@@ -84,14 +85,14 @@
             pkg_name.label = "<span size='x-large'><b>%s</b></span>".printf (app.name);
             short_description.label = "<big>%s</big>".printf (app.summary);
             
-            description.label = details.description;
+            description.label = app.description;
             
             image.set_from_icon_name (app.icon, IconSize.DIALOG);
             
             id.label = pkg.get_name();
             version.label = pkg.get_version();
-            size.label = Utils.size_to_str ((int) details.size);
-            license.label = details.license;
+            size.label = Utils.size_to_str ((int) app.size);
+            license.label = app.license;
             details_box.set_visible (false);
             s_nb.page = 0;
         }
 
=== modified file 'src/Widgets/Pages/AppsView.vala'
--- src/Widgets/Pages/AppsView.vala	2012-07-12 09:21:39 +0000
+++ src/Widgets/Pages/AppsView.vala	2012-07-28 20:36:19 +0000
@@ -17,13 +17,12 @@
 
 using Gtk;
 using PackageKit;
-using Lsc.Backend;
 
 namespace Lsc.Widgets {
     public class AppsTree : TreeView {
         // Signals
-        public signal void selected_row (LscApp app);
-        public signal void activated_row (LscApp app);
+        public signal void selected_row (AppStore.ModelApp app);
+        public signal void activated_row (AppStore.ModelApp app);
         
         // Vars
         private IconTheme theme;
@@ -31,7 +30,7 @@
         private TreeIter iter;
         private new TreePath path;
         
-        public void append_app (LscApp app) {            
+        public void append_app (AppStore.ModelApp app) {            
             model.append(out iter);
             //model.set(iter, 0, app.icon, 1, "<span size='medium'>"+Utils.escape_text (app.name)+"</span>\n<span size='small'>"+Utils.escape_text (app.summary)+"</span>", 2, app);
             model.set(iter, 0, app.icon, 1, "<b>"+Utils.escape_text (app.name)+"</b>\n"+Utils.escape_text (app.summary), 2, app); // FIXME: this actually take time
@@ -44,7 +43,7 @@
         public void on_cursor_changed (TreeView widget) {
             get_cursor(out path, null);
             if (path != null) {
-				LscApp val;
+				AppStore.ModelApp val;
                 model.get_iter(out iter, path);
                 model.get(iter, 2, out val);
                 selected_row(val);
@@ -54,7 +53,7 @@
         public void on_row_activated (TreePath path, TreeViewColumn column) {
             get_cursor(out this.path, null);
             if (path != null) {
-				LscApp val;
+				AppStore.ModelApp val;
                 model.get_iter(out iter, this.path);
                 model.get(iter, 2, out val);
                 activated_row(val);
@@ -69,7 +68,7 @@
             model = new ListStore(3,
                 t_string, // Icon name
                 t_string, // Name and description
-                typeof(LscApp)  // LscApp object
+                typeof(AppStore.ModelApp)  // AppStore.App object
             );
             
             set_model(model);
 
=== modified file 'src/Widgets/Pages/CategoriesView.vala'
--- src/Widgets/Pages/CategoriesView.vala	2012-07-11 18:59:07 +0000
+++ src/Widgets/Pages/CategoriesView.vala	2012-07-28 20:36:19 +0000
@@ -16,19 +16,18 @@
 //      
 
 using Gtk;
-using Lsc.Backend;
 
 namespace Lsc.Widgets {   
     public class CategoryButton : EventBox {
-		private LscCategory desc;
-		public signal void category_clicked (LscCategory cat);
+		private AppStore.Category desc;
+		public signal void category_clicked (AppStore.Category cat);
 		
 		private bool emit_clicked (Widget box, Gdk.EventButton button) {
 			category_clicked (desc);
 			return true;
 		}
 		
-        public CategoryButton (LscCategory desc, bool fill = false) {
+        public CategoryButton (AppStore.Category desc, bool fill = false) {
 			this.desc = desc;
 			
             sensitive = ! fill;
@@ -69,16 +68,16 @@
     }
     
     public class CategoriesView : GridView {
-        public signal void category_choosed (LscCategory cat);
+        public signal void category_choosed (AppStore.Category cat);
         
         // Vars
         private Box box_child;
         private CategoryButton button_child;
         public int columns { get; set; }
         private int actual_col;
-        private new List<LscCategory> children = null;
+        private new List<AppStore.Category> children = null;
         
-        public void add_category (LscCategory cat) {
+        public void add_category (AppStore.Category cat) {
             children.append(cat);
         }
         
@@ -89,7 +88,7 @@
             box_child = null;
             actual_col = columns;
             
-            foreach (LscCategory button_desc in children) {
+            foreach (AppStore.Category button_desc in children) {
                 if (actual_col == columns) {
                     box_child = new Box(Orientation.HORIZONTAL, 5);
                     box_child.homogeneous = true;
@@ -109,7 +108,7 @@
             }
             
             while (actual_col != columns) {
-                button_child = new CategoryButton(new LscCategory("", "", "", "", 0), true);
+                button_child = new CategoryButton(new AppStore.Category("", "", "", "", 0), true);
                 box_child.pack_start(button_child, true, true, 0);
                 button_child.show_all();
                 actual_col++;