From b7948f8c9ad54c30e2579fd5da4626c6f3de325a Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 28 Jun 2020 23:26:48 +0200
Subject: WIP: Make Reader always read from a ByteSource

---
 src/serdi.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'src/serdi.c')

diff --git a/src/serdi.c b/src/serdi.c
index e8ef9897..1925cd88 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -103,25 +103,34 @@ read_file(SerdWorld* const      world,
   syntax = syntax ? syntax : serd_guess_syntax(filename);
   syntax = syntax ? syntax : SERD_TRIG;
 
-  SerdStatus  st     = SERD_SUCCESS;
-  SerdReader* reader = serd_reader_new(world, syntax, flags, sink, stack_size);
-
-  serd_reader_add_blank_prefix(reader, add_prefix);
-
+  SerdByteSource* byte_source = NULL;
   if (!strcmp(filename, "-")) {
     SerdNode* name = serd_new_string(SERD_STATIC_STRING("stdin"));
 
-    st = serd_reader_start_stream(
-      reader, serd_file_read_byte, (SerdStreamErrorFunc)ferror, stdin, name, 1);
+    byte_source = serd_byte_source_new_function(
+      serd_file_read_byte, (SerdStreamErrorFunc)ferror, stdin, name, 1);
 
     serd_node_free(name);
   } else {
-    st = serd_reader_start_file(reader, filename, bulk_read);
+    byte_source =
+      serd_byte_source_new_filename(filename, bulk_read ? SERD_PAGE_SIZE : 1u);
   }
 
+  if (!byte_source) {
+    SERDI_ERRORF("failed to open input file `%s'\n", filename);
+    return SERD_ERR_UNKNOWN;
+  }
+
+  SerdReader* reader = serd_reader_new(world, syntax, flags, sink, stack_size);
+
+  serd_reader_add_blank_prefix(reader, add_prefix);
+
+  SerdStatus st = serd_reader_start(reader, byte_source);
+
   st = st ? st : serd_reader_read_document(reader);
 
   serd_reader_free(reader);
+  serd_byte_source_free(byte_source);
 
   return st;
 }
@@ -307,6 +316,9 @@ main(int argc, char** argv)
   SerdStatus st         = SERD_SUCCESS;
   SerdNode*  input_name = NULL;
   if (input_string) {
+    SerdByteSource* const byte_source =
+      serd_byte_source_new_string(input_string, NULL);
+
     SerdReader* const reader =
       serd_reader_new(world,
                       input_syntax ? input_syntax : SERD_TRIG,
@@ -316,13 +328,12 @@ main(int argc, char** argv)
 
     serd_reader_add_blank_prefix(reader, add_prefix);
 
-    SerdNode* name = serd_new_string(SERD_STATIC_STRING("string"));
-    if (!(st = serd_reader_start_string(reader, input_string, name))) {
+    if (!(st = serd_reader_start(reader, byte_source))) {
       st = serd_reader_read_document(reader);
     }
 
-    serd_node_free(name);
     serd_reader_free(reader);
+    serd_byte_source_free(byte_source);
   }
 
   size_t prefix_len = 0;
-- 
cgit v1.2.1