diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-06-27 11:11:54 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-06-27 11:11:54 +0000 |
commit | af68c3a1fa672b4e64f96698453a0371a8c3794e (patch) | |
tree | dfd55bace731d707b5dd3606db7c1e9228984221 | |
parent | bca37a7213a37ffc72af213f04d6758e82a155f1 (diff) | |
download | gnunet-af68c3a1fa672b4e64f96698453a0371a8c3794e.tar.gz gnunet-af68c3a1fa672b4e64f96698453a0371a8c3794e.zip |
communicate download activity status with each event
-rw-r--r-- | TODO | 18 | ||||
-rw-r--r-- | src/fs/fs_download.c | 1 | ||||
-rw-r--r-- | src/include/gnunet_fs_service.h | 5 |
3 files changed, 19 insertions, 5 deletions
@@ -7,11 +7,18 @@ | |||
7 | - only connect() sockets that are ready (select()) [Nils] | 7 | - only connect() sockets that are ready (select()) [Nils] |
8 | [On W32, we need to select after calling socket before doing connect etc.] | 8 | [On W32, we need to select after calling socket before doing connect etc.] |
9 | * GNUNET-GTK: [CG] | 9 | * GNUNET-GTK: [CG] |
10 | - directory support: | 10 | - from-URI only tab: |
11 | + download start: recursive/directory (!) & from-URI only | 11 | + display from open directory (needs 'from-URI only' tab!) |
12 | + handle download lost-parent (move to 'from-URI only' tab) | 12 | + handle download lost-parent (move to 'from-URI only' tab!) |
13 | + display content of directory | 13 | - recursive downloads: |
14 | + open directory | 14 | + download start: recursive/directory (!) |
15 | * display directory content from download as part of search | ||
16 | * honor recursion option (may already be done, check!) | ||
17 | - TEST download-start from-URI only in event handler | ||
18 | |||
19 | * BUGS: | ||
20 | Jun 27 11:51:54 core-7670 ERROR Assertion failed at gnunet-service-core.c:3616. | ||
21 | |||
15 | 22 | ||
16 | 0.9.0pre2: | 23 | 0.9.0pre2: |
17 | * CORE: | 24 | * CORE: |
@@ -79,6 +86,7 @@ | |||
79 | + copy URI to clipboard | 86 | + copy URI to clipboard |
80 | + save-as gnunet-directory | 87 | + save-as gnunet-directory |
81 | - events: | 88 | - events: |
89 | + implement clear button in search tabs (to stop downloads) | ||
82 | + search resume | 90 | + search resume |
83 | + search error | 91 | + search error |
84 | + download error | 92 | + download error |
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index 057f57b53..92c4b831d 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c | |||
@@ -170,6 +170,7 @@ GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi, | |||
170 | = GNUNET_TIME_calculate_eta (dc->start_time, | 170 | = GNUNET_TIME_calculate_eta (dc->start_time, |
171 | dc->completed, | 171 | dc->completed, |
172 | dc->length); | 172 | dc->length); |
173 | pi->value.download.is_active = (dc->client == NULL) ? GNUNET_NO : GNUNET_YES; | ||
173 | if (0 == (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE)) | 174 | if (0 == (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE)) |
174 | dc->client_info = dc->h->upcb (dc->h->upcb_cls, | 175 | dc->client_info = dc->h->upcb (dc->h->upcb_cls, |
175 | pi); | 176 | pi); |
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index a6d116deb..09ae3682a 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h | |||
@@ -961,6 +961,11 @@ struct GNUNET_FS_ProgressInfo | |||
961 | uint32_t anonymity; | 961 | uint32_t anonymity; |
962 | 962 | ||
963 | /** | 963 | /** |
964 | * Is the download currently active. | ||
965 | */ | ||
966 | int is_active; | ||
967 | |||
968 | /** | ||
964 | * Additional values for specific events. | 969 | * Additional values for specific events. |
965 | */ | 970 | */ |
966 | union { | 971 | union { |