add gnunet-guile search

2 files changed, 55 insertions, 2 deletions

diff --git a/gnunet-guile b/gnunet-guile
index 0edde50..ea6701b 100755
--- a/gnunet-guile
+++ b/gnunet-guile
@@ -151,7 +151,7 @@ Download the URI to FILENAME using CONFIGURATION.
 (define (publish args)
   "gnunet-guile publish CONFIGURATION FILE [KEYWORDS...]
 
-Publish on gnunet FILE using CONFIGURATION using KEYWORDS
+Publish on gnunet FILE using CONFIGURATION using KEYWORDS.
 "
   (let ((options (getopt-long (cons "gnunet-guile publish" args)
                               %download-options
@@ -162,10 +162,45 @@ Publish on gnunet FILE using CONFIGURATION using KEYWORDS
           ((configuration file keywords ...)
            (publish-exec configuration file keywords))))))
 
+;;; search
+
+(define (search/progress info)
+  (let ((status (fs-progress-info-status info)))
+    (cond
+     ((eq? status %fs-status-search-start)
+      (format #t "* Search in progress...\n"))
+     ((eq? status %fs-status-search-result)
+      (format #t "** ~a\n" (uri->string (fs-progress-info-search-result-uri info))))
+     ((eq? status %fs-status-search-error)
+      (format #t "* Error searching: ~a\n" (fs-progress-info-search-error-message info))))))
+
+(define (search/task configuration uri)
+  (lambda ()
+    (let ((fs (fs-start configuration "gnunet-guile" search/progress)))
+      (fs-search-start fs uri 1 %fs-search-option-none))))
+
+(define (search-exec configuration keywords)
+  (let ((configuration* (configuration-create))
+        (uri (apply fs-uri-ksk-create keywords)))
+    (configuration-load! configuration* configuration)
+    (scheduler-run (search/task configuration* uri))))
+
+(define (search args)
+  "gnunet-guile search CONFIGURATION KEYWORDS...
+
+Lookup files in gnunet that match KEYWORDS query using CONFIGURATION.
+"
+  (match args
+    ((configuration keywords ...)
+     (if (null? keywords)
+         (format #t "No keywords provided!\n")
+         (search-exec configuration keywords)))))
+
 ;;; cli
 
 (define %cli `((download ,download)
-               (publish ,publish)))
+               (publish ,publish)
+               (search ,search)))
 
 (define-public (main args)
   (subcommand 'gnunet-guile %cli (cdr args)))
diff --git a/gnunet.scm b/gnunet.scm
index c688026..67e2570 100644
--- a/gnunet.scm
+++ b/gnunet.scm
@@ -530,6 +530,14 @@ Return unique task identifier for the job, valid until THUNK is started."
   (ffi:make-pointer
    (bytestructure-ref info 'value 'publish 'specifics 'completed 'chk-uri)))
 
+(define-public (fs-progress-info-search-result-uri info)
+  (ffi:make-pointer
+   (bytestructure-ref info 'value 'search 'specifics 'result 'uri)))
+
+(define-public (fs-progress-info-search-error-message info)
+  (ffi:pointer->string
+   (bytestructure-ref info 'value 'search 'specifics 'error 'message)))
+
 (define (progress-callback-wrapper callback)
   (lambda (_ info)
     (callback (pointer->bytestructure %fs-progress-info info))))
@@ -791,6 +799,16 @@ with + if it must be mandatory"
     (let ((path (string-join (map uri-encode keywords) "+")))
       (string->uri (string-append "gnunet://fs/ksk/" path)))))
 
+;;; search
+
+(define-public %fs-search-option-none 0)
+(define-public %fs-search-option-loopback-only 1)
+
+(define-public fs-search-start
+  (let ((func (fs '* "GNUNET_FS_search_start" '* '* ffi:uint32 ffi:int '*)))
+    (lambda (fs uri anonymity options)
+      (func fs uri anonymity options ffi:%null-pointer))))
+
 ;; gnunet-identity bindings
 
 (define identity (dynamic-link* %libgnunet-identity))