e83e868a77
In FS#43434, Downloads which fail and are restarted on a different server will resume and may display a negative download speed. The payload's progress in libalpm was not properly reset which ultimately caused terminal noise because the line width calculation assumes positive download speeds. This patch fixes the incomplete reset of the payload by mimicing what be_sync.c:alpm_db_update() does over in sync.c:download_single_file(). The new dload.c:_alpm_dload_payload_reset_for_retry() extends beyond the current behavior by updating initial_size and prevprogress for this case. This makes pacman reset the progress properly in the next invocation of the callback and display positive download speeds. Fixes FS#43434. Signed-off-by: Martin Kühne <mysatyre@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
57 lines
1.6 KiB
C
57 lines
1.6 KiB
C
/*
|
|
* dload.h
|
|
*
|
|
* Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>
|
|
* Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef ALPM_DLOAD_H
|
|
#define ALPM_DLOAD_H
|
|
|
|
#include "alpm_list.h"
|
|
#include "alpm.h"
|
|
|
|
struct dload_payload {
|
|
alpm_handle_t *handle;
|
|
const char *tempfile_openmode;
|
|
char *remote_name;
|
|
char *tempfile_name;
|
|
char *destfile_name;
|
|
char *content_disp_name;
|
|
char *fileurl;
|
|
alpm_list_t *servers;
|
|
long respcode;
|
|
off_t initial_size;
|
|
off_t max_size;
|
|
off_t prevprogress;
|
|
int force;
|
|
int allow_resume;
|
|
int errors_ok;
|
|
int unlink_on_fail;
|
|
int trust_remote_name;
|
|
#ifdef HAVE_LIBCURL
|
|
CURLcode curlerr; /* last error produced by curl */
|
|
#endif
|
|
};
|
|
|
|
void _alpm_dload_payload_reset(struct dload_payload *payload);
|
|
void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload);
|
|
|
|
int _alpm_download(struct dload_payload *payload, const char *localpath,
|
|
char **final_file, const char **final_url);
|
|
|
|
#endif /* ALPM_DLOAD_H */
|
|
|
|
/* vim: set noet: */
|