From c55ea22c584596897be792fb7a788f04a363b5a8 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sat, 10 Feb 2007 09:36:36 +0000 Subject: * 'add' percentages now cap at 100% (see the comment) * downloaded packages now pass ONLY the package name to the callback --- lib/libalpm/add.c | 18 ++++++++++++++---- lib/libalpm/alpm.c | 9 +++++---- lib/libalpm/server.c | 15 +++++++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f3cc07a5..cad5ae13 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -496,10 +496,20 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) char pathname[PATH_MAX]; struct stat buf; - STRNCPY(pathname, archive_entry_pathname (entry), PATH_MAX); - - if (info->size != 0) - percent = (double)archive_position_uncompressed(archive) / info->size; + STRNCPY(pathname, archive_entry_pathname(entry), PATH_MAX); + + if (info->size != 0) { + /* There's a problem here. These sizes don't match up. info->size is + * the COMPRESSED size, and info->isize is uncompressed. It appears, + * however, that these are the only two sizes available. It appears + * to be close enough, BUT easilly goes over 100%, so we'll stall + * there for now */ + percent = (double)archive_position_uncompressed(archive) / info->size; + if(percent >= 1.0) { + percent = 1.0; + } + } + if (needdisp == 0) { PROGRESS(trans, cb_state, what, (int)(percent * 100), alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); } diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 5872b139..8ca491b8 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -593,14 +593,15 @@ char SYMEXPORT *alpm_pkg_name_hasarch(char *pkgname) arch = _supported_archs[i]; /* whee, case insensitive compare */ - while(*arch && *cmp && tolower(*arch++) == tolower(*cmp++)) ; - if(*arch || *cmp) continue; + if(*arch || *cmp) { + continue; + } - return p; + return(p); } } - return NULL; + return(NULL); } /** @} */ diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c index e9713ce3..51f389d9 100644 --- a/lib/libalpm/server.c +++ b/lib/libalpm/server.c @@ -37,6 +37,7 @@ #include "util.h" #include "handle.h" #include "log.h" +#include "package.h" pmserver_t *_alpm_server_new(const char *url) { @@ -180,12 +181,22 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath, char realfile[PATH_MAX]; char output[PATH_MAX]; char *fn = (char *)lp->data; + char pkgname[PKG_NAME_LEN]; + char *p; fileurl = url_for_file(server, fn); if(!fileurl) { return(-1); } + /* Try to get JUST the name of the package from the filename */ + p = alpm_pkg_name_hasarch(fn); /* TODO remove this later */ + _alpm_pkg_splitname(fn, pkgname, NULL, (p != NULL)); + if(!strlen(pkgname)) { + /* just use the raw filename if we can't find crap */ + STRNCPY(pkgname, fn, PKG_NAME_LEN); + } + snprintf(realfile, PATH_MAX, "%s/%s", localpath, fn); snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn); @@ -278,7 +289,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath, } /* Progress 0 - initialize */ - if(handle->dlcb) handle->dlcb(fn, 0, ust.size); + if(handle->dlcb) handle->dlcb(pkgname, 0, ust.size); int nread = 0; char buffer[PM_DLBUF_LEN]; @@ -287,7 +298,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath, while((nwritten += fwrite(buffer, 1, (nread - nwritten), localf)) < nread) ; dltotal_bytes += nread; - if(handle->dlcb) handle->dlcb(fn, dltotal_bytes, ust.size); + if(handle->dlcb) handle->dlcb(pkgname, dltotal_bytes, ust.size); } fclose(localf); -- cgit v1.2.3-70-g09d2