[pacman-dev] [PATCH 1/2] Add TotalDownload option.

Nathan Jones nathanj at insightbb.com
Fri Nov 9 19:54:18 EST 2007


This will be used in the next commit.

Signed-off-by: Nathan Jones <nathanj at insightbb.com>
---
 doc/pacman.conf.5.txt |    5 +++++
 src/pacman/conf.h     |    3 +++
 src/pacman/pacman.c   |    3 +++
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 06ba81d..7589b47 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -109,6 +109,11 @@ Options
 	Download delta files instead of complete packages if possible.  Requires
 	the xdelta program to be installed.
 
+*TotalDownload*::
+	When downloading, display the amount downloaded, download rate, ETA,
+	and completed percentage of the entire download list list rather
+	than the percent of each individual download target. The progress
+	bar is still based solely on the current file download.
 
 Repository Sections
 -------------------
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 7249f06..b7844d7 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -65,6 +65,9 @@ typedef struct __config_t {
 	unsigned short chomp; /* I Love Candy! */
 	unsigned short usecolor; /* enable colorful output */
 	unsigned short showsize; /* show individual package sizes */
+	unsigned short totaldownload; /* When downloading, display the amount
+	                                 downloaded, rate, ETA, and percent
+	                                 downloaded of the total download list */
 } config_t;
 
 /* Operations */
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 9c650f2..41fbe6d 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -572,6 +572,9 @@ static int _parseconfig(const char *file, const char *givensection,
 				} else if(strcmp(key, "UseDelta") == 0 || strcmp(upperkey, "USEDELTA") == 0) {
 					alpm_option_set_usedelta(1);
 					pm_printf(PM_LOG_DEBUG, "config: usedelta\n");
+				} else if(strcmp(key, "TotalDownload") == 0 || strcmp(upperkey, "TOTALDOWNLOAD") == 0) {
+					config->totaldownload = 1;
+					pm_printf(PM_LOG_DEBUG, "config: totaldownload\n");
 				} else {
 					pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"),
 							file, linenum, key);
-- 
1.5.3.5




More information about the pacman-dev mailing list