[gnunet-scheme] 07/324: Fix some exports and imports

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 05b8d6414cf0237bfd19f3bb83da98d27af09d1a
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Nov 4 21:22:10 2020 +0100

    Fix some exports and imports
---
 gnu/gnunet/directory.scm | 24 ++++++++++++++----------
 gnu/gnunet/metadata.scm  |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/gnu/gnunet/directory.scm b/gnu/gnunet/directory.scm
index 1e69c71..94c8a8a 100644
--- a/gnu/gnunet/directory.scm
+++ b/gnu/gnunet/directory.scm
@@ -59,7 +59,7 @@
          (ice-9 receive)
           (only (gnu gnunet fs-uri) chk-uri-file-length chk-uri-parse)
           (only (srfi srfi-43) vector-unfold)
-         #;(gnu gnunet metadata))
+         (only (gnu gnunet metadata) meta-data-extend))
 
   ;; constant from gnunet-0.13.1/src/fs/fs.h
   (define DBLOCK_SIZE (* 32 1024))
@@ -70,6 +70,9 @@
   ;; is a GNUnet directory.
   (define directory-magic #u8(#x89 #x47 #x4e #x44 #x0d #x0a #x1a #x0a))
 
+  ;; mime type for gnunet directories
+  (define directory-mime "application/gnunet-directory")
+
   ;; Corresponds to BuilderEntry, without the linked list
   (define-record-type (<directory-entry> %make-directory-entry
                                         directory-entry?)
@@ -86,10 +89,10 @@ The MIMETYPE may not be already set.
 
 @param md metadata to add mimetype to"
     ;; TODO: check for pre-existing mime-types
-    (meta-data-insert md "<gnunet>" EXTRACTOR_METATYPE_MIMETYPE
-                     EXTRACTOR_METAFORMAT_UTF8 "text/plain"
-                     GNUNET_FS_DIRECTORY_MIME
-                     (1+ (string-length GNUNET_FS_DIRECTORY_MIME))))
+    (meta-data-extend md extractor:METATYPE_MIMETYPE
+                     extractor:METAFORMAT_UTF8
+                     "text/plain"
+                     (string->utf8 directory-mime)))
 
   (define (make-directory-entry uri meta-old data)
     "Create a directory entry, possibly inlined.
@@ -109,11 +112,12 @@ use or inuse of data."
           (if (and data
                   (< fsize MAX-INLINE-SIZE)
                   (< 0 fsize)) ; data not too large?
-              (let* ((meta (meta-data-insert meta-old "<gnunet>"
-                                            EXTRACTOR_METAFORMAT_BINARY
-                                            #f
-                                            data
-                                            fsize))
+              (let* ((meta
+                     (meta-data-extend meta-old
+                                       extractor:METATYPE_GNUNET_FULL_DATA
+                                       extractor:METAFORMAT_BINARY
+                                       #f
+                                       data))
                     (slen (+ (string-length uri) 1))
                      (mdxs (meta-data-deserialized-size meta)))
                (if (= (floor/ (+ slen 4 mdxs -1) DBLOCK_SIZE)
diff --git a/gnu/gnunet/metadata.scm b/gnu/gnunet/metadata.scm
index 08f297d..2430718 100644
--- a/gnu/gnunet/metadata.scm
+++ b/gnu/gnunet/metadata.scm
@@ -36,8 +36,8 @@
 ;; TODO: (de-)serialisation, dependencies, other procedures
 (library (gnu gnunet metadata)
   (export meta-item? meta-item-mime-type meta-item-data meta-item-format
-         make-meta-item
-         meta-data?)
+         make-meta-item meta-item=?
+         meta-data? create-meta-data meta-data-extend meta-data=?)
   (import (rnrs base)
          (rnrs records syntactic)
          (rnrs bytevectors)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.