1 files changed, 68 insertions, 25 deletions
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index cbe76150..ee67ccaa 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -51,43 +51,86 @@ static void saveEventProcessor(void * arg) {
  cls->ret = NULL;
  DEBUG_BEGIN();
  switch (event->type) {
+    /* search events */
+  case FSUI_search_started:
+    cls->ret = fs_search_started(event->data.SearchStarted.sc.pos,
+                                 event->data.SearchStarted.searchURI,
+                                 event->data.SearchStarted.anonymityLevel,
+                                 0,
+                                 NULL);
+    break;
  case FSUI_search_result:
-    displaySearchResult(&event->data.SearchResult.fi,
+    fs_search_result_received(event->data.SearchResult.sc.cctx,
-                        event->data.SearchResult.searchURI,
+                              &event->data.SearchResult.fi,
-                        NULL);
+                              event->data.SearchResult.searchURI);
    break;
  case FSUI_search_error:
-    GE_LOG(ectx,
+    fs_search_aborted(event->data.SearchError.sc.cctx);
-           GE_ERROR,
+    break;
-           _("Error while searching: %s\n"),
+  case FSUI_search_aborted:
-           event->data.SearchError.message);
+    fs_search_aborted(event->data.SearchAborted.sc.cctx);
+    break;
+  case FSUI_search_completed:
+    // FIXME...
+    fs_search_aborted(event->data.SearchCompleted.sc.cctx);
+    break;
+  case FSUI_search_suspended:
+    fs_search_aborted(event->data.SearchSuspended.sc.cctx);
    break;
+  case FSUI_search_resumed:
+    cls->ret = fs_search_started(event->data.SearchResumed.sc.pos,
+                                 event->data.SearchResumed.searchURI,
+                                 event->data.SearchResumed.anonymityLevel,
+                                 event->data.SearchResumed.fisSize,
+                                 event->data.SearchResumed.fis);
+  case FSUI_search_stopped:
+    fs_search_aborted(event->data.SearchError.sc.cctx);
+    break;
+    /* download events */
  case FSUI_download_aborted:
+    fs_download_aborted(event->data.DownloadAborted.dc.cctx);
+    break;
+  case FSUI_download_error:
+    fs_download_aborted(event->data.DownloadAborted.dc.cctx);
+    break;
  case FSUI_download_suspended:
-    /* ignore for now */
+    fs_download_stopped(event->data.DownloadAborted.dc.cctx);
    break;
  case FSUI_download_progress:
-    displayDownloadUpdate(event->data.DownloadProgress.uri,
+    fs_download_update(event->data.DownloadProgress.dc.cctx,
-                          event->data.DownloadProgress.completed,
+                       event->data.DownloadProgress.completed,
-                          event->data.DownloadProgress.last_block,
+                       event->data.DownloadProgress.last_block,
-                          event->data.DownloadProgress.last_size);
+                       event->data.DownloadProgress.last_size);
    break;
  case FSUI_download_completed:
-    displayDownloadComplete(event->data.DownloadProgress.uri,
+    fs_download_completed(event->data.DownloadCompleted.dc.cctx);
-                            event->data.DownloadProgress.filename);
-    addLogEntry(_("Download `%s' complete"), 
-                event->data.DownloadProgress.filename); 
-    gnunetgtk_notify(NOTIFY_NORMAL,
-                     _("Download `%s' complete"), 
-                     event->data.DownloadProgress.filename);    
    break;
-  case FSUI_download_error:
+  case FSUI_download_stopped:
-    GE_BREAK(ectx, 0);
+    fs_download_stopped(event->data.DownloadCompleted.dc.cctx);
-    GE_LOG(ectx,
+    break;
-           GE_ERROR,
+ case FSUI_download_started:
-           _("Error while downloading: %s\n"),
+    cls->ret = fs_download_started(event->data.DownloadStarted.dc.pos,
-           event->data.DownloadError.message);
+                                   event->data.DownloadStarted.total,
+                                   event->data.DownloadStarted.anonymityLevel,
+                                   &event->data.DownloadStarted.fi,
+                                   event->data.DownloadStarted.filename,
+                                   0,
+                                   get_time());
+    break;
+  case FSUI_download_resumed:
+    cls->ret = fs_download_started(event->data.DownloadResumed.dc.pos,
+                                   event->data.DownloadResumed.total,
+                                   event->data.DownloadResumed.anonymityLevel,
+                                   &event->data.DownloadResumed.fi,
+                                   event->data.DownloadResumed.filename,
+                                   event->data.DownloadResumed.completed,
+                                   event->data.DownloadResumed.eta);
    break;
+    /* upload */
  case FSUI_upload_progress:
    displayUploadUpdate(event->data.UploadProgress.uc.cctx,
                        event->data.UploadProgress.filename,

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c index cbe76150..ee67ccaa 100644 --- a/src/plugins/fs/fs.c +++ b/src/plugins/fs/fs.c
@@ -51,43 +51,86 @@ static void saveEventProcessor(void * arg) {
51	cls->ret = NULL;	51	cls->ret = NULL;
52	DEBUG_BEGIN();	52	DEBUG_BEGIN();
53	switch (event->type) {	53	switch (event->type) {
		54	/* search events */
		55	case FSUI_search_started:
		56	cls->ret = fs_search_started(event->data.SearchStarted.sc.pos,
		57	event->data.SearchStarted.searchURI,
		58	event->data.SearchStarted.anonymityLevel,
		59	0,
		60	NULL);
		61	break;
54	case FSUI_search_result:	62	case FSUI_search_result:
55	displaySearchResult(&event->data.SearchResult.fi,	63	fs_search_result_received(event->data.SearchResult.sc.cctx,
56	event->data.SearchResult.searchURI,	64	&event->data.SearchResult.fi,
57	NULL);	65	event->data.SearchResult.searchURI);
58	break;	66	break;
59	case FSUI_search_error:	67	case FSUI_search_error:
60	GE_LOG(ectx,	68	fs_search_aborted(event->data.SearchError.sc.cctx);
61	GE_ERROR,	69	break;
62	_("Error while searching: %s\n"),	70	case FSUI_search_aborted:
63	event->data.SearchError.message);	71	fs_search_aborted(event->data.SearchAborted.sc.cctx);
		72	break;
		73	case FSUI_search_completed:
		74	// FIXME...
		75	fs_search_aborted(event->data.SearchCompleted.sc.cctx);
		76	break;
		77	case FSUI_search_suspended:
		78	fs_search_aborted(event->data.SearchSuspended.sc.cctx);
64	break;	79	break;
		80	case FSUI_search_resumed:
		81	cls->ret = fs_search_started(event->data.SearchResumed.sc.pos,
		82	event->data.SearchResumed.searchURI,
		83	event->data.SearchResumed.anonymityLevel,
		84	event->data.SearchResumed.fisSize,
		85	event->data.SearchResumed.fis);
		86	case FSUI_search_stopped:
		87	fs_search_aborted(event->data.SearchError.sc.cctx);
		88	break;
		89
		90
		91	/* download events */
65	case FSUI_download_aborted:	92	case FSUI_download_aborted:
		93	fs_download_aborted(event->data.DownloadAborted.dc.cctx);
		94	break;
		95	case FSUI_download_error:
		96	fs_download_aborted(event->data.DownloadAborted.dc.cctx);
		97	break;
66	case FSUI_download_suspended:	98	case FSUI_download_suspended:
67	/* ignore for now */	99	fs_download_stopped(event->data.DownloadAborted.dc.cctx);
68	break;	100	break;
69	case FSUI_download_progress:	101	case FSUI_download_progress:
70	displayDownloadUpdate(event->data.DownloadProgress.uri,	102	fs_download_update(event->data.DownloadProgress.dc.cctx,
71	event->data.DownloadProgress.completed,	103	event->data.DownloadProgress.completed,
72	event->data.DownloadProgress.last_block,	104	event->data.DownloadProgress.last_block,
73	event->data.DownloadProgress.last_size);	105	event->data.DownloadProgress.last_size);
74	break;	106	break;
75	case FSUI_download_completed:	107	case FSUI_download_completed:
76	displayDownloadComplete(event->data.DownloadProgress.uri,	108	fs_download_completed(event->data.DownloadCompleted.dc.cctx);
77	event->data.DownloadProgress.filename);
78	addLogEntry(_("Download `%s' complete"),
79	event->data.DownloadProgress.filename);
80	gnunetgtk_notify(NOTIFY_NORMAL,
81	_("Download `%s' complete"),
82	event->data.DownloadProgress.filename);
83	break;	109	break;
84	case FSUI_download_error:	110	case FSUI_download_stopped:
85	GE_BREAK(ectx, 0);	111	fs_download_stopped(event->data.DownloadCompleted.dc.cctx);
86	GE_LOG(ectx,	112	break;
87	GE_ERROR,	113	case FSUI_download_started:
88	_("Error while downloading: %s\n"),	114	cls->ret = fs_download_started(event->data.DownloadStarted.dc.pos,
89	event->data.DownloadError.message);	115	event->data.DownloadStarted.total,
		116	event->data.DownloadStarted.anonymityLevel,
		117	&event->data.DownloadStarted.fi,
		118	event->data.DownloadStarted.filename,
		119	0,
		120	get_time());
		121	break;
		122	case FSUI_download_resumed:
		123	cls->ret = fs_download_started(event->data.DownloadResumed.dc.pos,
		124	event->data.DownloadResumed.total,
		125	event->data.DownloadResumed.anonymityLevel,
		126	&event->data.DownloadResumed.fi,
		127	event->data.DownloadResumed.filename,
		128	event->data.DownloadResumed.completed,
		129	event->data.DownloadResumed.eta);
90	break;	130	break;
		131
		132
		133	/* upload */
91	case FSUI_upload_progress:	134	case FSUI_upload_progress:
92	displayUploadUpdate(event->data.UploadProgress.uc.cctx,	135	displayUploadUpdate(event->data.UploadProgress.uc.cctx,
93	event->data.UploadProgress.filename,	136	event->data.UploadProgress.filename,