[pacman-dev] [PATCH 2/2] Implement TotalDownload option.
Nathan Jones
nathanj at insightbb.com
Thu Nov 8 21:56:54 EST 2007
Setting this option will change the download progress to show the amount
downloaded, download rate, ETA, and download percent of the entire
download list rather than per each individual file.
This closes FS#7205.
Signed-off-by: Nathan Jones <nathanj at insightbb.com>
---
lib/libalpm/alpm.h | 3 +-
lib/libalpm/db.c | 3 +-
lib/libalpm/server.c | 63 ++++++++++++++++++++++++++++++++++++++++--------
lib/libalpm/server.h | 6 +++-
lib/libalpm/sync.c | 12 ++++++++-
src/pacman/callback.c | 28 ++++++++++++++++-----
src/pacman/callback.h | 2 +-
7 files changed, 93 insertions(+), 24 deletions(-)
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 5170c15..11f340e 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -81,7 +81,8 @@ int alpm_logaction(char *fmt, ...);
* Downloading
*/
-typedef void (*alpm_cb_download)(const char *filename, int xfered, int total);
+typedef void (*alpm_cb_download)(const char *filename, int xfered, int total,
+ int done);
/*
* Options
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index c06db3b..c81732e 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -257,7 +257,8 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
dbpath = alpm_option_get_dbpath();
- ret = _alpm_downloadfiles_forreal(db->servers, dbpath, files, lastupdate, newmtime);
+ ret = _alpm_downloadfiles_forreal(db->servers, dbpath, files, lastupdate,
+ newmtime, NULL, 0);
FREELIST(files);
if(ret == 1) {
/* mtimes match, do nothing */
diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c
index d4c0a05..5216641 100644
--- a/lib/libalpm/server.c
+++ b/lib/libalpm/server.c
@@ -133,13 +133,19 @@ static struct url *url_for_file(pmserver_t *server, const char *filename)
/*
* Download a list of files from a list of servers
* - if one server fails, we try the next one in the list
+ * - if *dl_total is non-NULL, then it will be used as the starting
+ * download amount when TotalDownload is set. It will also be
+ * set to the final download amount for the calling function to use.
+ * - totalsize is the total download size for use when TotalDownload
+ * is set. Use 0 if the total download size is not known.
*
* RETURN: 0 for successful download, 1 on error
*/
int _alpm_downloadfiles(alpm_list_t *servers, const char *localpath,
- alpm_list_t *files)
+ alpm_list_t *files, int *dl_total, unsigned long totalsize)
{
- return(_alpm_downloadfiles_forreal(servers, localpath, files, NULL, NULL));
+ return(_alpm_downloadfiles_forreal(servers, localpath, files, NULL, NULL,
+ dl_total, totalsize));
}
/*
@@ -150,15 +156,21 @@ int _alpm_downloadfiles(alpm_list_t *servers, const char *localpath,
* "YYYYMMDDHHMMSS" to match the form of ftplib's FtpModDate() function.
* - if *mtime2 is non-NULL, then it will be filled with the mtime
* of the remote file (from MDTM FTP cmd or Last-Modified HTTP header).
+ * - if *dl_total is non-NULL, then it will be used as the starting
+ * download amount when TotalDownload is set. It will also be
+ * set to the final download amount for the calling function to use.
+ * - totalsize is the total download size for use when TotalDownload
+ * is set. Use 0 if the total download size is not known.
*
* RETURN: 0 for successful download
* 1 if the mtimes are identical
* -1 on error
*/
int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
- alpm_list_t *files, const char *mtime1, char *mtime2)
+ alpm_list_t *files, const char *mtime1, char *mtime2, int *dl_total,
+ unsigned long totalsize)
{
- int dltotal_bytes = 0;
+ int dl_thisfile = 0;
alpm_list_t *lp;
int done = 0;
alpm_list_t *complete = NULL;
@@ -206,12 +218,15 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
if(stat(output, &st) == 0 && st.st_size > 0) {
_alpm_log(PM_LOG_DEBUG, "existing file found, using it\n");
fileurl->offset = (off_t)st.st_size;
- dltotal_bytes = st.st_size;
+ dl_thisfile = st.st_size;
+ if (dl_total != NULL) {
+ *dl_total += st.st_size;
+ }
localf = fopen(output, "a");
chk_resume = 1;
} else {
fileurl->offset = (off_t)0;
- dltotal_bytes = 0;
+ dl_thisfile = 0;
}
/* libdownload does not reset the error code, reset it in the case of previous errors */
@@ -267,7 +282,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
if(localf == NULL) {
_alpm_rmrf(output);
fileurl->offset = (off_t)0;
- dltotal_bytes = 0;
+ dl_thisfile = 0;
localf = fopen(output, "w");
if(localf == NULL) { /* still null? */
_alpm_log(PM_LOG_ERROR, _("cannot write to file '%s'\n"), output);
@@ -280,7 +295,13 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
}
/* Progress 0 - initialize */
- if(handle->dlcb) handle->dlcb(pkgname, 0, ust.size);
+ if(handle->dlcb) {
+ if(handle->totaldownload && dl_total != NULL && totalsize > 0) {
+ handle->dlcb(pkgname, *dl_total, totalsize, 0);
+ } else {
+ handle->dlcb(pkgname, 0, ust.size, 0);
+ }
+ }
int nread = 0;
char buffer[PM_DLBUF_LEN];
@@ -310,10 +331,30 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
if(nwritten != nread) {
}
- dltotal_bytes += nread;
+ dl_thisfile += nread;
+ if (dl_total != NULL) {
+ *dl_total += nread;
+ }
+
+ if(handle->dlcb) {
+ if(handle->totaldownload && dl_total != NULL && totalsize > 0) {
+ handle->dlcb(pkgname, *dl_total, totalsize, 0);
+ } else {
+ handle->dlcb(pkgname, dl_thisfile, ust.size, 0);
+ }
+ }
+ }
- if(handle->dlcb) handle->dlcb(pkgname, dltotal_bytes, ust.size);
+ /* this file has finished, let pacman know to go to a new line
+ * by setting the done parameter */
+ if(handle->dlcb) {
+ if(handle->totaldownload && dl_total != NULL && totalsize > 0) {
+ handle->dlcb(pkgname, *dl_total, totalsize, 1);
+ } else {
+ handle->dlcb(pkgname, dl_thisfile, ust.size, 1);
+ }
}
+
downloadFreeURL(fileurl);
fclose(localf);
fclose(dlf);
@@ -429,7 +470,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(const char *url)
alpm_list_t *files = alpm_list_add(NULL, filename);
/* download the file */
- if(_alpm_downloadfiles(servers, cachedir, files)) {
+ if(_alpm_downloadfiles(servers, cachedir, files, NULL, 0)) {
_alpm_log(PM_LOG_WARNING, _("failed to download %s\n"), url);
return(NULL);
}
diff --git a/lib/libalpm/server.h b/lib/libalpm/server.h
index 462d9b2..914ee6d 100644
--- a/lib/libalpm/server.h
+++ b/lib/libalpm/server.h
@@ -37,9 +37,11 @@ struct __pmserver_t {
pmserver_t *_alpm_server_new(const char *url);
void _alpm_server_free(pmserver_t *server);
-int _alpm_downloadfiles(alpm_list_t *servers, const char *localpath, alpm_list_t *files);
+int _alpm_downloadfiles(alpm_list_t *servers, const char *localpath,
+ alpm_list_t *files, int *dl_total, unsigned long totalsize);
int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath,
- alpm_list_t *files, const char *mtime1, char *mtime2);
+ alpm_list_t *files, const char *mtime1, char *mtime2,
+ int *dl_total, unsigned long totalsize);
#endif /* _ALPM_SERVER_H */
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 7791e74..1441e60 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -991,6 +991,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
pmtrans_t *tr = NULL;
int replaces = 0, retval = 0;
const char *cachedir = NULL;
+ int dltotal = 0, dl = 0;
ALPM_LOG_FUNC;
@@ -999,6 +1000,15 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
cachedir = _alpm_filecache_setup();
trans->state = STATE_DOWNLOADING;
+
+ /* Sum up the download sizes. This has to be in its own loop because
+ * the download loop is grouped by db. */
+ for(j = trans->packages; j; j = j->next) {
+ pmsyncpkg_t *sync = j->data;
+ pmpkg_t *spkg = sync->pkg;
+ dltotal += alpm_pkg_download_size(spkg, db_local);
+ }
+
/* group sync records by repository and download */
for(i = handle->dbs_sync; i; i = i->next) {
pmdb_t *current = i->data;
@@ -1062,7 +1072,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
if(files) {
EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL);
- if(_alpm_downloadfiles(current->servers, cachedir, files)) {
+ if(_alpm_downloadfiles(current->servers, cachedir, files, &dl, dltotal)) {
_alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"),
current->treename);
RET_ERR(PM_ERR_RETRIEVE, -1);
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 5160b3b..525945d 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -85,7 +85,7 @@ static float get_update_timediff(int first_call)
}
/* refactored from cb_trans_progress */
-static void fill_progress(const int percent, const int proglen)
+static void fill_progress(const int percent, const int proglen, const int done)
{
const unsigned int hashlen = proglen - 8;
const unsigned int hash = percent * hashlen / 100;
@@ -142,7 +142,7 @@ static void fill_progress(const int percent, const int proglen)
printf(" %3d%%", percent);
}
- if(percent == 100) {
+ if(done) {
printf("\n");
} else {
printf("\r");
@@ -351,6 +351,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
int tmp, digits, oprlen, textlen, pkglen;
char *opr = NULL;
wchar_t *wcopr = NULL;
+ int done = 0;
if(config->noprogressbar) {
return;
@@ -436,11 +437,12 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
free(wcopr);
/* call refactored fill progress function */
- fill_progress(percent, getcols() - infolen);
+ done = percent == 100 ? 1 : 0;
+ fill_progress(percent, getcols() - infolen, done);
}
/* callback to handle display of download progress */
-void cb_dl_progress(const char *filename, int xfered, int total)
+void cb_dl_progress(const char *filename, int xfered, int total, int done)
{
const int infolen = 50;
char *fname, *p;
@@ -450,10 +452,22 @@ void cb_dl_progress(const char *filename, int xfered, int total)
int percent;
char rate_size = 'K', xfered_size = 'K';
+ /* If the download list starts with a resumed .part file, and the
+ * TotalDownload option is set, it is possible for the xfered amount
+ * to start at a value greater than 0. This variable will ensure that
+ * initial_time is always initialized. */
+ static short has_init = 0;
+
if(config->noprogressbar) {
return;
}
+ if (!has_init) {
+ gettimeofday(&initial_time, NULL);
+ timediff = get_update_timediff(1);
+ has_init = 1;
+ }
+
/* this is basically a switch on xferred: 0, total, and anything else */
if(xfered == 0) {
/* set default starting values */
@@ -463,7 +477,7 @@ void cb_dl_progress(const char *filename, int xfered, int total)
timediff = get_update_timediff(1);
rate = 0.0;
eta_s = 0;
- } else if(xfered == total) {
+ } else if(xfered == total || done) {
/* compute final values */
struct timeval current_time;
float diff_sec, diff_usec;
@@ -472,7 +486,7 @@ void cb_dl_progress(const char *filename, int xfered, int total)
diff_sec = current_time.tv_sec - initial_time.tv_sec;
diff_usec = current_time.tv_usec - initial_time.tv_usec;
timediff = diff_sec + (diff_usec / 1000000.0);
- rate = total / (timediff * 1024.0);
+ rate = xfered / (timediff * 1024.0);
/* round elapsed time to the nearest second */
eta_s = (int)(timediff + 0.5);
@@ -541,7 +555,7 @@ void cb_dl_progress(const char *filename, int xfered, int total)
free(fname);
- fill_progress(percent, getcols() - infolen);
+ fill_progress(percent, getcols() - infolen, done);
return;
}
diff --git a/src/pacman/callback.h b/src/pacman/callback.h
index 742cd94..ac9ef40 100644
--- a/src/pacman/callback.h
+++ b/src/pacman/callback.h
@@ -35,7 +35,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
int howmany, int remain);
/* callback to handle display of download progress */
-void cb_dl_progress(const char *filename, int xfered, int total);
+void cb_dl_progress(const char *filename, int xfered, int total, int done);
/* callback to handle messages/notifications from pacman library */
void cb_log(pmloglevel_t level, char *fmt, va_list args);
--
1.5.3.5
More information about the pacman-dev
mailing list