print: move progress bar update logic to apk_print_progress

- let the apk_print functions deal with the forced print itself. We
  avoid that the callbacks need to deal with the force flag. We can
  also get rid of the APK_PRINT_PROGRESS_* defines.

- let the reader of --progress-fd decide how often things are updated
  rather than having a fixed granularity off 1/100 (percent)

- avoid detect screen size and percent/bar calculations in case the
  --no-progress was given

- track satistics for both the ascii bar and percent info and update bar
  only if either percent or bar changes. This makes the bar go smoother
  when width is wider than 100 chars and it makes the percent counter
  go smooth when screen width is less thann 100 chars. It also
  simplifies the callbacks as they no longer need to deal with update
  granularity.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/fetch.c b/src/fetch.c
index eaa6961..7891ac2 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -28,7 +28,7 @@
 
 struct fetch_ctx {
 	unsigned int flags;
-	int outdir_fd, errors, prog_flags;
+	int outdir_fd, errors;
 	struct apk_database *db;
 	size_t done, total;
 };
@@ -94,8 +94,7 @@ static int fetch_parse(void *ctx, struct apk_db_options *dbopts,
 static void progress_cb(void *pctx, size_t bytes_done)
 {
 	struct fetch_ctx *ctx = (struct fetch_ctx *) pctx;
-	apk_print_progress(muldiv(100, ctx->done + bytes_done, ctx->total) | ctx->prog_flags);
-	ctx->prog_flags = 0;
+	apk_print_progress(ctx->done + bytes_done, ctx->total);
 }
 
 static int fetch_package(apk_hash_item item, void *pctx)
@@ -133,8 +132,6 @@ static int fetch_package(apk_hash_item item, void *pctx)
 	if (apk_flags & APK_SIMULATE)
 		return 0;
 
-	ctx->prog_flags = APK_PRINT_PROGRESS_FORCE;
-
 	r = apk_repo_format_item(db, repo, pkg, &urlfd, url, sizeof(url));
 	if (r < 0)
 		goto err;