gnunet-guile publish: do not do directory scan.

Publish directly _whatever_ is passed as filename argument.

1 files changed, 10 insertions, 36 deletions

diff --git a/gnunet-guile b/gnunet-guile
index e806f8d..0edde50 100755
--- a/gnunet-guile
+++ b/gnunet-guile
@@ -86,10 +86,6 @@ Download the URI to FILENAME using CONFIGURATION.
 
 ;;; publish, gnunet-publish.c
 
-;; XXX: we have to use global, because gnunet doesn't expose it in
-;; directory-scan callback aka. publish/task/directory-scan
-(define %directory-scanner #f)
-
 (define (publish/keywords-callback uri error)
   (if error
       (format #t "* Error while publishing keywords: ~a\n" error)
@@ -130,41 +126,19 @@ Download the URI to FILENAME using CONFIGURATION.
   (lambda ()
     (fs-publish-stop publish-context)))
 
-(define (publish/task/directory-scan fs)
-  (lambda (filename directory? reason)
-    (cond
-     ((eq? reason %fs-directory-scanner-file-start)
-      (format #t "* Scanning ~a.\n" filename))
-     ((eq? reason %fs-directory-scanner-file-ignored)
-      (format #t "* There was trouble processing file ~a, skipping it.\n" filename))
-     ((eq? reason %fs-directory-scanner-all-counted)
-      (format #t "* Preprocessing complete.\n"))
-     ((eq? reason %fs-directory-scanner-extract-finished)
-      (format #t "* Extracting meta data from file `~a' complete.\n" filename))
-     ((eq? reason %fs-directory-scanner-finished)
-      (let ((share-tree (fs-directory-scan-get-result* %directory-scanner)))
-        (let ((fi (fs-file-information-create-from-file
-                   fs
-                   (fs-share-tree-item-filename share-tree)
-                   ;; XXX: force keyword to be 'jjj'
-                   (fs-uri-ksk-create "jjj") ;; (fs-share-tree-item-ksk-uri share-tree)
-                   (fs-share-tree-item-meta share-tree)
-                   %gnunet-yes
-                   (fs-block-options))))
-          ;; TODO: call GNUNET_FS_file_information_inspect
-          (let ((publish-context (fs-publish-start fs fi)))
-            (scheduler-add-shutdown (publish/task/shutdown publish-context))))))
-     ((eq? reason %fs-directory-scanner-error)
-      (scheduler-shutdown))
-     (else (error "should not happen")))))
-
 (define (publish/task configuration filename keywords)
   (lambda ()
     (let ((fs (fs-start configuration "gnunet-guile" (publish/progress keywords))))
-      (set! %directory-scanner
-        (fs-directory-scan-start filename
-                                 #t
-                                 (publish/task/directory-scan fs))))))
+      (let ((fi (fs-file-information-create-from-file
+                 fs
+                 filename
+                 ;; XXX: force keyword to be 'jjj'
+                 (fs-uri-ksk-create "jjj")
+                 (container-meta-data-create)
+                 %gnunet-yes
+                 (fs-block-options))))
+        (let ((publish-context (fs-publish-start fs fi)))
+          (scheduler-add-shutdown (publish/task/shutdown publish-context)))))))
 
 (define (publish-exec configuration filename keywords)
   (let ((configuration* (configuration-create)))