Hide fopen wrapper and use reader interface consistently

1 files changed, 26 insertions, 44 deletions

diff --git a/src/reader.c b/src/reader.c
index a9db44f9..f8459e45 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -218,37 +218,6 @@ serd_reader_set_default_graph(SerdReader*     reader,
 	reader->default_graph = serd_node_copy(graph);
 }
 
-SerdStatus
-serd_reader_read_file(SerdReader* reader,
-                      const char* uri)
-{
-	char* const path = serd_file_uri_parse(uri, NULL);
-	if (!path) {
-		return SERD_ERR_BAD_ARG;
-	}
-
-	FILE* fd = serd_fopen(path, "rb");
-	if (!fd) {
-		serd_free(path);
-		return SERD_ERR_UNKNOWN;
-	}
-
-	SerdStatus st = serd_reader_start_stream(
-		reader, (SerdReadFunc)fread, (SerdStreamErrorFunc)ferror,
-		fd, path, SERD_PAGE_SIZE);
-
-	if (!st) {
-		st = serd_reader_read_document(reader);
-	}
-
-	const SerdStatus est = serd_reader_end_stream(reader);
-
-	fclose(fd);
-	free(path);
-
-	return st ? st : est;
-}
-
 static SerdStatus
 skip_bom(SerdReader* me)
 {
@@ -275,7 +244,31 @@ serd_reader_start_stream(SerdReader*         reader,
                          size_t              page_size)
 {
 	return serd_byte_source_open_source(
-		&reader->source, read_func, error_func, stream, name, page_size);
+		&reader->source, read_func, error_func, NULL, stream, name, page_size);
+}
+
+SerdStatus
+serd_reader_start_file(SerdReader* reader, const char* uri, bool bulk)
+{
+	char* const path = serd_file_uri_parse(uri, NULL);
+	if (!path) {
+		return SERD_ERR_BAD_ARG;
+	}
+
+	FILE* fd = serd_world_fopen(reader->world, path, "rb");
+	free(path);
+	if (!fd) {
+		return SERD_ERR_UNKNOWN;
+	}
+
+	return serd_byte_source_open_source(
+		&reader->source,
+		bulk ? (SerdReadFunc)fread : serd_file_read_byte,
+		(SerdStreamErrorFunc)ferror,
+		(SerdStreamCloseFunc)fclose,
+		fd,
+		uri,
+		bulk ? SERD_PAGE_SIZE : 1);
 }
 
 SerdStatus
@@ -312,18 +305,7 @@ serd_reader_read_chunk(SerdReader* reader)
 }
 
 SerdStatus
-serd_reader_end_stream(SerdReader* reader)
+serd_reader_finish(SerdReader* reader)
 {
 	return serd_byte_source_close(&reader->source);
 }
-
-SerdStatus
-serd_reader_read_string(SerdReader* reader, const char* utf8)
-{
-	serd_reader_start_string(reader, utf8);
-
-	const SerdStatus st  = serd_reader_read_document(reader);
-	const SerdStatus est = serd_byte_source_close(&reader->source);
-
-	return st ? st : est;
-}