/**
- * Called by FS client to give information about the progress of an
+ * Called by FS client to give information about the progress of an
* operation.
*
* @param cls closure
static void *
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
{
- char *s;
+ char *s, *s2;
char *t;
switch (info->status)
{
case GNUNET_FS_STATUS_DOWNLOAD_START:
if (verbose > 1)
- fprintf (stderr, _("Starting download `%s'.\n"),
+ FPRINTF (stderr, _("Starting download `%s'.\n"),
info->value.download.filename);
break;
case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
if (verbose)
{
s = GNUNET_STRINGS_relative_time_to_string (info->value.download.eta);
+ if (info->value.download.specifics.progress.block_download_duration.rel_value
+ == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+ s2 = GNUNET_strdup (_("<unknown time>"));
+ else
+ s2 = GNUNET_STRINGS_relative_time_to_string (
+ info->value.download.specifics.progress.block_download_duration);
t = GNUNET_STRINGS_byte_size_fancy (info->value.download.completed *
1000LL /
- (info->value.download.duration.
- rel_value + 1));
- fprintf (stdout,
- _("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"),
+ (info->value.download.
+ duration.rel_value + 1));
+ FPRINTF (stdout,
+ _("Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to download\n"),
info->value.download.filename,
(unsigned long long) info->value.download.completed,
- (unsigned long long) info->value.download.size, s, t);
+ (unsigned long long) info->value.download.size, s, t, s2);
GNUNET_free (s);
+ GNUNET_free (s2);
GNUNET_free (t);
}
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- fprintf (stderr, _("Error downloading: %s.\n"),
+ FPRINTF (stderr, _("Error downloading: %s.\n"),
info->value.download.specifics.error.message);
GNUNET_SCHEDULER_shutdown ();
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
s = GNUNET_STRINGS_byte_size_fancy (info->value.download.completed * 1000 /
- (info->value.download.duration.
- rel_value + 1));
- fprintf (stdout, _("Downloading `%s' done (%s/s).\n"),
+ (info->value.download.
+ duration.rel_value + 1));
+ FPRINTF (stdout, _("Downloading `%s' done (%s/s).\n"),
info->value.download.filename, s);
GNUNET_free (s);
if (info->value.download.dc == dc)
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
break;
default:
- fprintf (stderr, _("Unexpected status: %d\n"), info->status);
+ FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
break;
}
return NULL;
if (NULL == args[0])
{
- fprintf (stderr, _("You need to specify a URI argument.\n"));
+ FPRINTF (stderr, "%s", _("You need to specify a URI argument.\n"));
return;
}
uri = GNUNET_FS_uri_parse (args[0], &emsg);
if (NULL == uri)
{
- fprintf (stderr, _("Failed to parse URI: %s\n"), emsg);
+ FPRINTF (stderr, _("Failed to parse URI: %s\n"), emsg);
GNUNET_free (emsg);
ret = 1;
return;
}
if ((!GNUNET_FS_uri_test_chk (uri)) && (!GNUNET_FS_uri_test_loc (uri)))
{
- fprintf (stderr, _("Only CHK or LOC URIs supported.\n"));
+ FPRINTF (stderr, "%s", _("Only CHK or LOC URIs supported.\n"));
ret = 1;
GNUNET_FS_uri_destroy (uri);
return;
}
if (NULL == filename)
{
- fprintf (stderr, _("Target filename must be specified.\n"));
+ FPRINTF (stderr, "%s", _("Target filename must be specified.\n"));
ret = 1;
GNUNET_FS_uri_destroy (uri);
return;
request_parallelism, GNUNET_FS_OPTIONS_END);
if (NULL == ctx)
{
- fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
+ FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
GNUNET_FS_uri_destroy (uri);
ret = 1;
return;
0, &GNUNET_GETOPT_set_one, &delete_incomplete},
{'n', "no-network", NULL,
gettext_noop ("only search the local peer (no P2P network search)"),
- 1, &GNUNET_GETOPT_set_uint, &local_only},
+ 0, &GNUNET_GETOPT_set_uint, &local_only},
{'o', "output", "FILENAME",
gettext_noop ("write the file to FILENAME"),
1, &GNUNET_GETOPT_set_string, &filename},