1 files changed, 20 insertions, 412 deletions

diff --git a/nautilus-installer/src/installer.c b/nautilus-installer/src/installer.c
index cdf659e92..12782c0d5 100644
--- a/nautilus-installer/src/installer.c
+++ b/nautilus-installer/src/installer.c
@@ -26,9 +26,8 @@
 
 #include <gnome.h>
 #include "installer.h"
-#include <eazel-install-public.h>
 #include <libtrilobite/helixcode-utils.h>
-
+#include "interface.h"
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -41,318 +40,7 @@
 #define EAZEL_SERVICES_DIR_HOME "/var/eazel"
 #define EAZEL_SERVICES_DIR EAZEL_SERVICES_DIR_HOME "/services"
 
-#define HOSTNAME "testmachine.eazel.com"
-#define PORT_NUMBER 80
-#define TMP_DIR "/tmp/eazel-install"
-#define RPMRC "/usr/lib/rpm/rpmrc"
-#define REMOTE_RPM_DIR "/RPMS"
-
-static char *package_list[LAST] = {
-	"/package-list.xml",
-	"/package-list-stable.xml",
-	"/services-only-list.xml",
-	"/package-list.xml",
-	"/package-uninstall-list.xml",
-};
-
 static char *failure_info = NULL;
-int installer_debug = 0;
-int installer_test = 0;
-int installer_force = 0;
-int installer_local = 0;
-static char *server = NULL;
-static int port = 0;
-
-static void 
-eazel_install_progress (EazelInstall *service, 
-			const PackageData *package,
-			int package_num, int num_packages, 
-			int amount, int total,
-			int total_size_completed, int total_size, 
-			GtkWidget *widget) 
-{
-	GtkProgressBar *progressbar, *progress_overall;
-	GtkWidget *summary;
-	GtkLabel *package_label;
-
-	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
-	summary = gtk_object_get_data (GTK_OBJECT (widget), "summary");
-	progressbar = gtk_object_get_data (GTK_OBJECT (widget), "progressbar_single");
-	progress_overall = gtk_object_get_data (GTK_OBJECT (widget), "progressbar_overall");
-
-	if (amount == 0) {
-		char *tmp;
-		tmp = g_strdup_printf ("Installing %s", package->name);
-		gtk_label_set_text (package_label, tmp);
-		g_free (tmp);
-
-		gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "%p%% (%v of %u kb)");
-		gtk_progress_configure (GTK_PROGRESS (progressbar), 0, 0, (float)(total/1024));		
-#ifdef NO_TEXT_BOX
-		gtk_label_set_text (GTK_LABEL (summary), package->description);
-#else
-		gtk_text_backward_delete (GTK_TEXT (summary), 
-					  gtk_text_get_length (GTK_TEXT (summary)));
-		gtk_text_insert (GTK_TEXT (summary), 
-				 NULL, NULL, NULL,
-				 package->description, strlen (package->description));
-#endif
-		fprintf (stdout, "\n");
-	}
-
-	if (installer_debug) {
-		float pct;
-		pct = ( (total > 0) ? ((float) ((((float) amount) / total) * 100)): 100.0);
-		fprintf (stdout, "Install Progress - %s - %d %d (%d %d) %% %f\r", 
-			 package->name?package->name:"(null)", 
-			 amount, total, 
-			 total_size_completed, total_size, 
-			 pct);
-	}
-
-	gtk_progress_set_value (GTK_PROGRESS (progressbar), 
-				(float)(amount/1024 > total/1024 ? total/1024 : amount/1024));
-	gtk_progress_set_value (GTK_PROGRESS (progress_overall), 
-				(float)total_size_completed>total_size ? total_size : total_size_completed);
-
-	fflush (stdout);
-	if (amount == total && installer_debug) {
-		fprintf (stdout, "\n");
-	}
-}
-
-
-static void 
-eazel_download_progress (EazelInstall *service, 
-			 const char *name,
-			 int amount, 
-			 int total,
-			 GtkWidget *widget) 
-{
-	GtkProgressBar *progressbar;
-	GtkLabel *package_label;
-
-	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
-	progressbar = gtk_object_get_data (GTK_OBJECT (widget), "progressbar_single");
-
-	if (amount == 0) {
-		char *tmp;
-		tmp = g_strdup_printf ("Retrieving %s", name);
-		gtk_label_set_text (package_label, tmp);
-		g_free (tmp);
-
-		gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "%p%% (%v of %u kb)");
-		gtk_progress_configure (GTK_PROGRESS (progressbar), 0, 0, (float)(total/1024));
-	}
-
-	if (installer_debug) {
-		float pct;
-		pct = ( (total > 0) ? ((float) ((((float) amount) / total) * 100)): 100.0);
-		fprintf (stdout, "DOWNLOAD Progress - %s - %d %d %% %f\r", 
-			 name?name:"(null)", amount, total, pct); 
-		fflush (stdout);
-	}
-	
-	gtk_progress_set_value (GTK_PROGRESS (progressbar), amount/1024);
-
-	if (amount != total) {		
-		/* g_main_iteration (FALSE); */
-		/* gtk_main_iteration (); */
-	} else if (amount == total) {		
-		/*
-		gtk_progress_set_format_string (GTK_OBJECT (progressbar), "done..."); 
-		g_main_iteration (FALSE);
-		*/
-	}
-}
-
-static void
-install_failed_helper (EazelInstall *service,
-		       const PackageData *pd,
-		       char *indent,
-		       char **str)
-{
-	GList *iterator;
-
-	if (pd->toplevel) {
-		char *tmp;
-		tmp = g_strdup_printf ("%s\n***The package %s failed. Here's the dep tree\n", 
-				       (*str)?*str:"", pd->name);
-		g_free (*str);
-		(*str) = tmp;
-	}
-	switch (pd->status) {
-	case PACKAGE_DEPENDENCY_FAIL: {
-		char *tmp;
-		tmp = g_strdup_printf ("%s%s-%s failed\n", 
-				       (*str)?*str:"", indent, rpmfilename_from_packagedata (pd));
-		g_free (*str);
-		(*str) = tmp;
-		break;
-	}
-	case PACKAGE_CANNOT_OPEN: {
-		char *tmp;
-		tmp = g_strdup_printf ("%s%s-%s NOT FOUND\n", 
-				       (*str)?*str:"", indent, rpmfilename_from_packagedata (pd));
-		g_free (*str);
-		(*str) = tmp;
-		break;		
-	}
-	case PACKAGE_SOURCE_NOT_SUPPORTED: {
-		char *tmp;
-		tmp = g_strdup_printf ("%s%s-%s is a source\n", 
-				       (*str)?*str:"", indent, rpmfilename_from_packagedata (pd));
-		g_free (*str);
-		(*str) = tmp;
-		break;
-	}
-	case PACKAGE_BREAKS_DEPENDENCY: {
-		char *tmp;
-		tmp = g_strdup_printf ("%s%s-%s breaks\n", 
-				       (*str)?*str:"", indent, rpmfilename_from_packagedata (pd));
-		g_free (*str);
-		(*str) = tmp;
-		break;
-	}
-	default: {
-		char *tmp;
-		tmp = g_strdup_printf ("%s%s-%s\n", 
-				       (*str)?*str:"", indent, rpmfilename_from_packagedata (pd));
-		g_free (*str);
-		(*str) = tmp;
-		break;
-	}
-	}
-	for (iterator = pd->soft_depends; iterator; iterator = iterator->next) {			
-		PackageData *pack;
-		char *indent2;
-		indent2 = g_strconcat (indent, iterator->next ? " |" : "  " , NULL);
-		pack = (PackageData*)iterator->data;
-		install_failed_helper (service, pack, indent2, str);
-		g_free (indent2);
-	}
-	for (iterator = pd->breaks; iterator; iterator = iterator->next) {			
-		PackageData *pack;
-		char *indent2;
-		indent2 = g_strconcat (indent, iterator->next ? " |" : "  " , NULL);
-		pack = (PackageData*)iterator->data;
-		install_failed_helper (service, pack, indent2, str);
-		g_free (indent2);
-	}
-}
-
-
-static void
-install_failed (EazelInstall *service,
-		const PackageData *pd,
-		char **output)
-{
-	if (pd->toplevel == TRUE) {
-		install_failed_helper (service, pd, g_strdup (""), output);
-	}
-}
-
-static void
-download_failed (EazelInstall *service,
-		 const char *name,
-		 char **output)
-{
-	if (*output) {		
-		(*output) = g_strdup_printf ("%s\nDownload of %s failed", *output, name);
-	} else {
-		(*output) = g_strdup_printf ("Download of %s failed", name);
-	}
-}
-
-static void
-eazel_install_preflight (EazelInstall *service,
-			 int total_size,
-			 int num_packages,
-			 GtkWidget *widget)
-{
-	GtkProgressBar *progress_overall;
-	GtkLabel *package_label;
-	GtkWidget *summary;
-	char *summary_string;
-	char *tmp;
-
-	summary = gtk_object_get_data (GTK_OBJECT (widget), "summary");
-	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
-	progress_overall = gtk_object_get_data (GTK_OBJECT (widget), "progressbar_overall");
-
-	gtk_progress_set_format_string (GTK_PROGRESS (progress_overall), "Total completion %p%%");
-	gtk_progress_configure (GTK_PROGRESS (progress_overall), 0, 0, (float)total_size);
-	gtk_widget_show (GTK_WIDGET (progress_overall));
-
-	summary_string = g_strdup_printf (_("Now starting the install process.\n"
-					    "Starting the process takes some time, please be patient.\n"
-					    "In total, %d mb of software will be installed"), 
-					  total_size/(1024*1024));
-	tmp = g_strdup_printf ("Preparing RPM, %d packages (%d mb)", num_packages, total_size/(1024*1024));
-
-	if (installer_debug) {
-		fprintf (stdout, "PREFLIGHT: %s\n", tmp);
-	}
-
-	gtk_label_set_text (package_label, tmp);
-#ifdef NO_TEXT_BOX
-	gtk_label_set_text (GTK_LABEL (summary), summary_string);
-#else
-	gtk_text_backward_delete (GTK_TEXT (summary), 
-				  gtk_text_get_length (GTK_TEXT (summary)));
-	gtk_text_insert (GTK_TEXT (summary), 
-			 NULL, NULL, NULL,
-			 summary_string, strlen (summary_string));
-#endif
-	g_main_iteration (FALSE);
-}
-
-static void
-eazel_install_dep_check (EazelInstall *service,
-			 const PackageData *pack,
-			 const PackageData *needs,
-			 GtkWidget *widget)
-{
-	GtkLabel *package_label;
-	GtkWidget *summary;
-	char *tmp;
-
-	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
-	summary = gtk_object_get_data (GTK_OBJECT (widget), "summary");
-
-	tmp = g_strdup_printf ("%s needs %s", pack->name, needs->name);
-
-	if (installer_debug) {
-		fprintf (stdout, "DEP CHECK : %s\n", tmp);
-	}
-
-	gtk_label_set_text (package_label, tmp);
-	g_free (tmp);
-	tmp = g_strdup_printf ("Fetching dependencies for %s", pack->name);
-		
-#ifdef NO_TEXT_BOX
-	gtk_label_set_text (GTK_LABEL (summary), tmp);
-#else
-	gtk_text_backward_delete (GTK_TEXT (summary), 
-				  gtk_text_get_length (GTK_TEXT (summary)));
-	gtk_text_insert (GTK_TEXT (summary), 
-			 NULL, NULL, NULL,
-			 tmp, strlen (tmp));
-#endif
-	g_free (tmp);
-
-	g_main_iteration (FALSE);
-}
-
-static gboolean
-eazel_install_delete_files (EazelInstall *service,
-			    GtkWidget *widget) 
-{
-	if (installer_debug) {
-		fprintf (stdout, "Deleting rpm's\n");
-	}
-	return TRUE ;
-}
 
 static void
 make_dirs ()
@@ -380,19 +68,19 @@ make_dirs ()
 }
 
 void
-check_system (GtkWidget *window)
+check_system (EazelInstaller *installer)
 {
 	DistributionInfo dist;
 
 	dist = trilobite_get_distribution ();
 
 #ifndef NAUTILUS_INSTALLER_RELEASE
-	if (!installer_test) {
+	if (!installer->test) {
 		GnomeDialog *d;
 		d = GNOME_DIALOG (gnome_warning_dialog_parented (_("This is a warning, you're running\n"
 								   "the installer for real, without \n"
 								   "the --test flag... Beware!"),
-								 GTK_WINDOW (window)));
+								 GTK_WINDOW (installer->window)));
 		gnome_dialog_run_and_close (d);
 	} 
 #endif
@@ -402,7 +90,7 @@ check_system (GtkWidget *window)
 		d = GNOME_DIALOG (gnome_warning_dialog_parented (_("This preview installer only works\n"
 								   "for RPM based systems. You will have\n"
 								   "to download the source yourself."),
-								 GTK_WINDOW (window)));
+								 GTK_WINDOW (installer->window)));
 		gnome_dialog_run_and_close (d);
 		exit (1);
 	}
@@ -415,11 +103,12 @@ check_system (GtkWidget *window)
 								   "installer and go to http://www.helixcode.com\n"
 								   "and download the full HelixCode Gnome\n"
 								   "installation"),
-								 GTK_WINDOW (window)));
+								 GTK_WINDOW (installer->window)));
 		gnome_dialog_run_and_close (d);
 	}
 }
 
+#if 0
 void
 revert_nautilus_install (EazelInstall *service)
 {
@@ -435,104 +124,23 @@ revert_nautilus_install (EazelInstall *service)
 		}
 	}
 }
+#endif 
 
-void installer (GtkWidget *window,
-		gint method) 
+void 
+eazel_installer_do_install (EazelInstaller *installer,
+			    GList *categories)
 {
-	EazelInstall *service;
-	GtkWidget *druid;
-/*
-	GtkProgressBar *progressbar;
-	GtkLabel *package_label;
-	GtkLabel *action_label;
-*/
-	
-	/* We set force, update and downgrade to true. */
-	service = EAZEL_INSTALL (gtk_object_new (TYPE_EAZEL_INSTALL,
-						 "verbose", TRUE,
-						 "silent", FALSE,
-						 "debug", TRUE,
-						 "test", installer_test ? TRUE : FALSE, 
-						 "force", installer_force ? TRUE : FALSE,
-						 "depend", FALSE,
-						 "update", TRUE,
-						 "uninstall", method==UNINSTALL ? TRUE : FALSE,
-						 "downgrade", TRUE,
-						 "protocol", installer_local ? PROTOCOL_LOCAL: PROTOCOL_HTTP,
-						 "tmp_dir", TMP_DIR,
-						 "rpmrc_file", RPMRC,
-						 "server", HOSTNAME,
-						 "package_list", installer_local, 
-						 "package_list_storage_path", package_list [ method ],
-						 "server_port", PORT_NUMBER,
-						 "transaction_dir", EAZEL_SERVICES_DIR,
-						 NULL));
-	g_assert (service != NULL);
-
-	g_free (failure_info);
-	failure_info = NULL;
-
-	if (!installer_debug) {
-		eazel_install_open_log (service, "/tmp/nautilus-install.log");
-	}
-
-	g_assert (service != NULL);
-
-	gtk_signal_connect (GTK_OBJECT (service), "download_progress", 
-			    GTK_SIGNAL_FUNC (eazel_download_progress), window);
-	gtk_signal_connect (GTK_OBJECT (service), "install_progress", 
-			    GTK_SIGNAL_FUNC (eazel_install_progress), window);
-	gtk_signal_connect (GTK_OBJECT (service), "preflight_check", 
-			    GTK_SIGNAL_FUNC (eazel_install_preflight), window);
-	gtk_signal_connect (GTK_OBJECT (service), "dependency_check", 
-			    GTK_SIGNAL_FUNC (eazel_install_dep_check), window);
-	gtk_signal_connect (GTK_OBJECT (service), "delete_files", 
-			    GTK_SIGNAL_FUNC (eazel_install_delete_files), window);
-	gtk_signal_connect (GTK_OBJECT (service), "download_failed", 
-			    download_failed, &failure_info); 
-	gtk_signal_connect (GTK_OBJECT (service), "install_failed", 
-			    GTK_SIGNAL_FUNC (install_failed), &failure_info);
-
-	switch (method) {
-	case FULL_INST:
-	case NAUTILUS_ONLY:
-	case SERVICES_ONLY:
-		eazel_install_install_packages (service, NULL, NULL);
-		break;
-	case UPGRADE:	
-	{
-		GList *categories;
-		CategoryData *cat;
-		PackageData *pack;
-
-		cat = categorydata_new ();
-		pack = packagedata_new ();
-		pack->name = g_strdup ("nautilus");
-		pack->distribution = trilobite_get_distribution ();
-		cat->packages = g_list_prepend (NULL, pack);
-		categories = g_list_prepend (NULL, cat);
-		eazel_install_install_packages (service, categories, NULL);
-	}
-	break;
-	case UNINSTALL:
-		revert_nautilus_install (service, NULL);
-		break;
-	};
-
-	gtk_object_destroy (GTK_OBJECT (service)); 
-
-/*
-	progressbar = gtk_object_get_data (GTK_OBJECT (window), "progressbar_single");
-	gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "done");
-	progressbar = gtk_object_get_data (GTK_OBJECT (window), "progressbar_overall");
-	gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "done");
-*/
+       	
+	eazel_install_install_packages (installer->service, categories, NULL);
+#if 0
+	revert_nautilus_install (service, NULL);
+#endif
 
-	if (failure_info && strlen (failure_info)>1) {
-		if (installer_debug) {
-			fprintf (stdout, "ERROR :\n%s", failure_info);
+	if (installer->failure_info && strlen (installer->failure_info)>1) {
+		if (installer->debug) {
+			fprintf (stdout, "ERROR :\n%s", installer->failure_info);
 		}
-		gnome_error_dialog_parented (failure_info, GTK_WINDOW (window));
+		gnome_error_dialog_parented (installer->failure_info, GTK_WINDOW (installer->window));
 	} else {
 	}
 }