File PackageKit-zypp-progress-info.patch of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File PackageKit-zypp-progress-info.patch of Package PackageKit (Revision fecb8d7454830fcc6cb16f6815173ab3)

Currently displaying revision fecb8d7454830fcc6cb16f6815173ab3 , Show latest

From 0b7108ba11d87ea74e8e6de6abe50a641d1516d6 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 22 Oct 2014 10:24:06 +0200
Subject: [PATCH] zypp: Improve progress status

The ZYpp backend gained support for 'overall progress status' during
* download
* install
phases.

This makes the experience in most UIs much better, as they can give
proper feedback. The previous progress only updated each ITEM (so,
package xxx progress) as opposed to the overall progress.
---
 backends/zypp/pk-backend-zypp.cpp | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index 7a969c8..c4767e6 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -148,6 +148,11 @@ gchar * _repoName;
  */
 gboolean _updating_self = FALSE;
 
+/* We need to track the number of packages to download in global scope */
+guint _dl_count = 0;
+guint _dl_progress = 0;
+guint _dl_status = 0;
+
 /**
  * Build a package_id from the specified resolvable.  The returned
  * gchar * should be freed with g_free ().
@@ -243,6 +248,12 @@ struct InstallResolvableReportReceiver : public zypp::callback::ReceiveReport<zy
 
 	virtual void start (zypp::Resolvable::constPtr resolvable) {
 		clear_package_id ();
+
+		/* This is the first package we see coming as INSTALLING - resetting counter and modus */
+		if (_dl_status != PK_INFO_ENUM_INSTALLING) {
+			_dl_progress = 0;
+			_dl_status = PK_INFO_ENUM_INSTALLING;
+		}
 		_package_id = zypp_build_package_id_from_resolvable (resolvable->satSolvable ());
 		MIL << resolvable << " " << _package_id << std::endl;
 		gchar* summary = g_strdup(zypp::asKind<zypp::ResObject>(resolvable)->summary().c_str ());
@@ -269,8 +280,10 @@ struct InstallResolvableReportReceiver : public zypp::callback::ReceiveReport<zy
 
 	virtual void finish (zypp::Resolvable::constPtr resolvable, Error error, const std::string &reason, RpmLevel level) {
 		MIL << reason << " " << _package_id << " " << resolvable << std::endl;
+		pk_backend_job_set_percentage(_job, (double)++_dl_progress / _dl_count * 100);
 		if (_package_id != NULL) {
 			//pk_backend_job_package (_backend, PK_INFO_ENUM_INSTALLED, _package_id, "TODO: Put the package summary here if possible");
+			update_sub_percentage (100, PK_STATUS_ENUM_INSTALL);
 			clear_package_id ();
 		}
 	}
@@ -356,6 +369,11 @@ struct DownloadProgressReportReceiver : public zypp::callback::ReceiveReport<zyp
 	{
 		MIL << resolvable << " " << file << std::endl;
 		clear_package_id ();
+		/* This is the first package we see coming as INSTALLING - resetting counter and modus */
+		if (_dl_status != PK_INFO_ENUM_DOWNLOADING) {
+			_dl_progress = 0;
+			_dl_status = PK_INFO_ENUM_DOWNLOADING;
+		}
 		_package_id = zypp_build_package_id_from_resolvable (resolvable->satSolvable ());
 		gchar* summary = g_strdup(zypp::asKind<zypp::ResObject>(resolvable)->summary().c_str ());
 
@@ -381,6 +399,7 @@ struct DownloadProgressReportReceiver : public zypp::callback::ReceiveReport<zyp
 	{
 		MIL << resolvable << " " << error << " " << _package_id << std::endl;
 		update_sub_percentage (100, PK_STATUS_ENUM_DOWNLOAD);
+		pk_backend_job_set_percentage(_job, (double)++_dl_progress / _dl_count * 100);
 		clear_package_id ();
 	}
 };
@@ -1364,7 +1383,9 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo
 
 		// Gather up any dependencies
 		pk_backend_job_set_status (job, PK_STATUS_ENUM_DEP_RESOLVE);
+		pk_backend_job_set_percentage(job, 0);
 		zypp->resolver ()->setIgnoreAlreadyRecommended (TRUE);
+		pk_backend_job_set_percentage(job, 100);
 		if (!zypp->resolver ()->resolvePool ()) {
 			// Manual intervention required to resolve dependencies
 			// TODO: Figure out what we need to do with PackageKit
@@ -1400,12 +1421,18 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo
 		switch (type) {
 		case INSTALL:
 			pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL);
+			pk_backend_job_set_percentage(job, 0);
+			_dl_progress = 0;
 			break;
 		case REMOVE:
 			pk_backend_job_set_status (job, PK_STATUS_ENUM_REMOVE);
+			pk_backend_job_set_percentage(job, 0);
+			_dl_progress = 0;
 			break;
 		case UPDATE:
 			pk_backend_job_set_status (job, PK_STATUS_ENUM_UPDATE);
+			pk_backend_job_set_percentage(job, 0);
+			_dl_progress = 0;
 			break;
 		}
 
@@ -1441,7 +1468,10 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo
 
 		// look for licenses to confirm
 
+		_dl_count = 0;
 		for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) {
+			if (it->status ().isToBeInstalled ())
+				_dl_count++;
 			if (it->status ().isToBeInstalled () && !(it->resolvable()->licenseToConfirm().empty ())) {
 				gchar *eula_id = g_strdup ((*it)->name ().c_str ());
 				gboolean has_eula = pk_backend_is_eula_valid (backend, eula_id);
@@ -1506,6 +1536,7 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo
 			goto exit;
 		}
 
+		pk_backend_job_set_percentage(job, 100);
 		ret = TRUE;
 	} catch (const repo::RepoNotFoundException &ex) {
 		pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, ex.asUserString().c_str() );
-- 
2.1.2

Places

File PackageKit-zypp-progress-info.patch of Package PackageKit (Revision fecb8d7454830fcc6cb16f6815173ab3)

Places