* @param msg error message (or NULL)
*/
static void
-ds_put_cont (void *cls, int success,
+ds_put_cont (void *cls, int success,
struct GNUNET_TIME_Absolute min_expiration,
const char *msg)
{
* @param msg error message (typically NULL, not used)
*/
static void
-finish_release_reserve (void *cls, int success,
+finish_release_reserve (void *cls, int success,
struct GNUNET_TIME_Absolute min_expiration,
const char *msg)
{
struct GNUNET_FS_PublishContext *pc = cls;
pc->qre = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Releasing reserve done!\n");
signal_publish_completion (pc->fi, pc);
pc->all_done = GNUNET_YES;
{
if (NULL != pc->ns)
pc->sks_pc = GNUNET_FS_publish_sks (pc->h,
- pc->ns,
- pc->nid,
+ pc->ns,
+ pc->nid,
pc->nuid,
pc->fi->meta,
pc->fi->chk_uri,
pc->ksk_pc = NULL;
if (NULL != emsg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Error uploading KSK blocks: %s\n",
emsg);
signal_publish_error (p, pc, emsg);
}
else
{
- if (UINT64_MAX == offset)
+ if (UINT64_MAX == offset)
{
if (&GNUNET_FS_data_reader_file_ == p->data.file.reader)
- {
+ {
/* force closing the file to avoid keeping too many files open */
p->data.file.reader (p->data.file.reader_cls, offset, 0, NULL, NULL);
}
* @param tc scheduler's task context (not used)
*/
static void
-encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+encode_cont (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_FileInformation *p;
if (NULL != emsg)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error during tree walk: %s\n",
+ "Error during tree walk: %s\n",
emsg);
GNUNET_asprintf (&p->emsg,
- _("Publishing failed: %s"),
+ _("Publishing failed: %s"),
emsg);
GNUNET_free (emsg);
pi.status = GNUNET_FS_STATUS_PUBLISH_ERROR;
}
else
{
- /* final progress event */
+ /* final progress event */
GNUNET_assert (NULL != p->chk_uri);
flen = GNUNET_FS_uri_chk_get_file_size (p->chk_uri);
pi.status = GNUNET_FS_STATUS_PUBLISH_PROGRESS;
* @param block_size size of @a block (in bytes)
*/
static void
-block_proc (void *cls, const struct ContentHashKey *chk, uint64_t offset,
- unsigned int depth, enum GNUNET_BLOCK_Type type, const void *block,
+block_proc (void *cls,
+ const struct ContentHashKey *chk,
+ uint64_t offset,
+ unsigned int depth,
+ enum GNUNET_BLOCK_Type type,
+ const void *block,
uint16_t block_size)
{
struct GNUNET_FS_PublishContext *pc = cls;
* @param depth depth of the block in the tree, 0 for DBLOCK
*/
static void
-progress_proc (void *cls, uint64_t offset, const void *pt_block, size_t pt_size,
+progress_proc (void *cls, uint64_t offset,
+ const void *pt_block,
+ size_t pt_size,
unsigned int depth)
{
struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_FileInformation *p;
+ struct GNUNET_FS_FileInformation *par;
struct GNUNET_FS_ProgressInfo pi;
p = pc->fi_pos;
pi.value.publish.specifics.progress.data_len = pt_size;
pi.value.publish.specifics.progress.depth = depth;
p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, offset);
+ if ( (0 != depth) ||
+ (GNUNET_YES == p->is_directory) )
+ return;
+ while (NULL != (par = p->dir))
+ {
+ p = par;
+ GNUNET_assert (GNUNET_YES == par->is_directory);
+ p->data.dir.contents_completed += pt_size;
+ pi.status = GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY;
+ pi.value.publish.specifics.progress_directory.completed = p->data.dir.contents_completed;
+ pi.value.publish.specifics.progress_directory.total = p->data.dir.contents_size;
+ pi.value.publish.specifics.progress_directory.eta = GNUNET_TIME_calculate_eta (p->start_time,
+ p->data.dir.contents_completed,
+ p->data.dir.contents_size);
+ p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, 0);
+
+ }
}
GNUNET_FS_file_information_sync_ (p);
}
size = (GNUNET_YES == p->is_directory) ? p->data.dir.dir_size : p->data.file.file_size;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Creating tree encoder\n");
p->te =
GNUNET_FS_tree_encoder_create (pc->h, size, pc, &block_reader,
* @param msg the response we got
*/
static void
-process_index_start_response (void *cls,
+process_index_start_response (void *cls,
const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_FS_PublishContext *pc = cls;
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Can not index file `%s': %s. Will try to insert instead.\n"),
- p->filename,
+ p->filename,
_("failed to compute hash"));
p->data.file.do_index = GNUNET_NO;
GNUNET_FS_file_information_sync_ (p);
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Can not index file `%s': %s. Will try to insert instead.\n"),
- p->filename,
+ p->filename,
_("could not connect to `fs' service"));
p->data.file.do_index = GNUNET_NO;
publish_content (pc);
return;
}
/* find starting position */
- while ( (GNUNET_YES == p->is_directory) &&
- (NULL != p->data.dir.entries) &&
+ while ( (GNUNET_YES == p->is_directory) &&
+ (NULL != p->data.dir.entries) &&
(NULL == p->emsg) &&
(NULL == p->data.dir.entries->chk_uri) )
{
/* abort on error */
if (NULL != p->emsg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error uploading: %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Error uploading: %s\n",
p->emsg);
/* error with current file, abort all
* related files as well! */
struct GNUNET_FS_FileInformation *fi,
uint64_t length,
struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_Uri **uri,
+ struct GNUNET_FS_Uri **uri,
struct GNUNET_FS_BlockOptions *bo,
- int *do_index,
+ int *do_index,
void **client_info)
{
struct GNUNET_FS_PublishContext *pc = cls;
GNUNET_FS_publish_sks_cancel (pc->sks_pc);
pc->sks_pc = NULL;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Suspending publish operation\n");
GNUNET_free_non_null (fi->serialization);
fi->serialization = NULL;
static int
fip_signal_suspend (void *cls,
struct GNUNET_FS_FileInformation *fi,
- uint64_t length,
+ uint64_t length,
struct GNUNET_CONTAINER_MetaData *meta,
struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo,
+ struct GNUNET_FS_BlockOptions *bo,
int *do_index,
void **client_info)
{
* @param msg error message on error, otherwise NULL
*/
static void
-finish_reserve (void *cls, int success,
+finish_reserve (void *cls, int success,
struct GNUNET_TIME_Absolute min_expiration,
const char *msg)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reservation complete (%d)!\n", success);
if ((msg != NULL) || (success <= 0))
{
- GNUNET_asprintf (&pc->fi->emsg,
+ GNUNET_asprintf (&pc->fi->emsg,
_("Insufficient space for publishing: %s"),
msg);
signal_publish_error (pc->fi, pc, pc->fi->emsg);
}
+/**
+ * Calculate the total size of all of the files in the directory structure.
+ *
+ * @param fi file structure to traverse
+ */
+static uint64_t
+compute_contents_size (struct GNUNET_FS_FileInformation *fi)
+{
+ struct GNUNET_FS_FileInformation *ent;
+
+ if (GNUNET_YES != fi->is_directory)
+ return fi->data.file.file_size;
+ fi->data.dir.contents_size = 0;
+ for (ent = fi->data.dir.entries; NULL != ent; ent = ent->next)
+ fi->data.dir.contents_size += compute_contents_size (ent);
+ return fi->data.dir.contents_size;
+}
+
+
/**
* Publish a file or directory.
*
struct GNUNET_FS_PublishContext *
GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h,
struct GNUNET_FS_FileInformation *fi,
- const struct GNUNET_CRYPTO_EccPrivateKey *ns,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
const char *nid,
const char *nuid,
enum GNUNET_FS_PublishOptions options)
struct GNUNET_DATASTORE_Handle *dsh;
GNUNET_assert (NULL != h);
+ compute_contents_size (fi);
if (0 == (options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY))
{
dsh = GNUNET_DATASTORE_connect (h->cfg);
ret->fi = fi;
if (NULL != ns)
{
- ret->ns = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
+ ret->ns = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
*ret->ns = *ns;
GNUNET_assert (NULL != nid);
ret->nid = GNUNET_strdup (nid);