search for: simplestreams_parser

Easy way to parse JSON from a file, without reading it all to string first. --- common/mltools/JSON_parser-c.c | 25 +++++++++++++++++++++++++ common/mltools/JSON_parser.ml | 1 + common/mltools/JSON_parser.mli | 3 +++ common/mltools/JSON_parser_tests.ml | 23 +++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/common/mltools/JSON_parser-c.c

...to parse the JSON indexes of the Simple Streams v1.0 format. Read only datatype=image-downloads contents, and only the latest versions of each content available as disk image (disk.img or disk1.img). --- builder/Makefile.am | 13 ++- builder/builder.ml | 2 + builder/simplestreams_parser.ml | 213 +++++++++++++++++++++++++++++++++++++++ builder/simplestreams_parser.mli | 19 ++++ builder/sources.ml | 9 ++ builder/sources.mli | 1 + builder/virt-builder.pod | 7 ++ builder/yajl-c.c | 143 ++++++++++++++++++++++++++ builder/...

No need to read the whole file manually. --- builder/simplestreams_parser.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/simplestreams_parser.ml b/builder/simplestreams_parser.ml index ccbfdff67..407eb11fb 100644 --- a/builder/simplestreams_parser.ml +++ b/builder/simplestreams_parser.ml @@ -44,7 +44,7 @@ let get_index ~downloader ~sigchec...

...uilder.ml | 11 +- builder/cache.ml | 2 +- builder/cache.mli | 6 +- builder/downloader.mli | 2 +- builder/index.ml | 4 +- builder/index.mli | 2 +- builder/index_parser.ml | 4 +- builder/simplestreams_parser.ml | 213 +++++++++++++++++++++++++++++++++++++++ builder/simplestreams_parser.mli | 19 ++++ builder/sources.ml | 9 ++ builder/sources.mli | 1 + builder/utils.ml | 7 ++ builder/virt-builder.pod | 7 ++ builder/yajl-c.c...

...disk.img or disk1.img). Add a simple test, using the "released" images from the CirrOS project. --- .gitignore | 1 + builder/Makefile.am | 6 + builder/builder.ml | 2 + builder/simplestreams_parser.ml | 204 ++++++++++ builder/simplestreams_parser.mli | 19 + builder/sources.ml | 9 + builder/sources.mli | 1 + builder/test-simplestreams/streams/v1/index.json | 18 + .../v1/net.cirros-c...

Extract the yajl object_get_* helpers in the Yajl module since this could be useful for any Yajl user code. --- builder/simplestreams_parser.ml | 52 -------------------------------------- builder/yajl.ml | 55 +++++++++++++++++++++++++++++++++++++++++ builder/yajl.mli | 29 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 52 deletions(-) diff --git a/builder/simplestreams_parser.ml b/builder/sim...

....mli | 6 +- builder/downloader.mli | 2 +- builder/index.ml | 4 +- builder/index.mli | 2 +- builder/index_parser.ml | 4 +- builder/simplestreams_parser.ml | 204 ++++++++++ builder/simplestreams_parser.mli | 19 + builder/sources.ml | 9 + builder/sources.mli | 1 + builder/test-simplestreams/streams/v1/index.json | 18 + .../v1/net.cirros-c...

...der/builder.ml | 12 ++++++++++-- builder/downloader.ml | 10 ++++++---- builder/downloader.mli | 2 +- builder/index_parser.ml | 4 +--- builder/sigchecker.ml | 32 ++++++++++++++------------------ builder/sigchecker.mli | 2 +- builder/simplestreams_parser.ml | 4 +--- 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index 799208a..ebbcad3 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -177,8 +177,15 @@ let main () = None in + (* Create a single temporary directory f...

...der/builder.ml | 12 ++++++++++-- builder/downloader.ml | 10 ++++++---- builder/downloader.mli | 2 +- builder/index_parser.ml | 4 +--- builder/sigchecker.ml | 32 ++++++++++++++------------------ builder/sigchecker.mli | 2 +- builder/simplestreams_parser.ml | 4 +--- 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index 799208a..ebbcad3 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -177,8 +177,15 @@ let main () = None in + (* Create a single temporary directory f...

...++++++++++ builder/cache.mli | 6 +++--- builder/downloader.mli | 2 +- builder/index.ml | 13 +++++++++++-- builder/index.mli | 7 ++++++- builder/index_parser.ml | 2 +- builder/list_entries.ml | 16 +++++++++++++--- builder/simplestreams_parser.ml | 2 +- 9 files changed, 52 insertions(+), 15 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index 3f7c79bc9..519cdbc79 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -94,7 +94,10 @@ let selected_cli_item cmdline index = let item = try List.find (...

...l | 6 ++++-- builder/cache.mli | 6 +++--- builder/downloader.mli | 2 +- builder/index.ml | 9 +++++++-- builder/index.mli | 8 +++++++- builder/index_parser.ml | 4 ++-- builder/list_entries.ml | 6 +++--- builder/simplestreams_parser.ml | 2 +- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index 3f7c79bc9..41c0a4ccc 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -94,7 +94,7 @@ let selected_cli_item cmdline index = let item = try List.find ( f...

...| 8 ++++++++ builder/cache.mli | 6 +++--- builder/downloader.mli | 2 +- builder/index.ml | 10 ++++++++-- builder/index.mli | 5 ++++- builder/index_parser.ml | 6 ++++-- builder/list_entries.ml | 13 ++++++++++--- builder/simplestreams_parser.ml | 2 +- 9 files changed, 44 insertions(+), 16 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index 3f7c79bc9..8a950cd8f 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -94,7 +94,9 @@ let selected_cli_item cmdline index = let item = try List.find (...

...+ builder/builder.ml | 6 +-- builder/downloader.ml | 94 +++++++++++++++++++++-------------------- builder/downloader.mli | 10 +---- builder/index.ml | 2 +- builder/index.mli | 2 +- builder/index_parser.ml | 2 +- builder/simplestreams_parser.ml | 2 +- builder/sources.ml | 10 ++--- builder/sources.mli | 2 +- 10 files changed, 63 insertions(+), 68 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index ad32940..5c41cfa 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -144,6 +1...

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 10 ++++++---- mllib/curl.mli | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..baa75ec 100644 --- a/mllib/curl.ml +++

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 16 +++++++++++----- mllib/curl.mli | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..7d07125 100644 --- a/mllib/curl.ml

...ing. There should be no change in functionality. --- .gitignore | 2 +- builder/Makefile.am | 57 ++++--------------- builder/index_parser.ml | 2 +- builder/repository_main.ml | 2 +- builder/simplestreams_parser.ml | 6 +- builder/utils.ml | 2 +- builder/utils.mli | 4 +- .../mltools/JSON_parser-c.c | 8 +-- .../yajl.ml => common/mltools/JSON_parser.ml | 38 ++++++------- .../mltools/JSON_parser.mli...

...~gpgkey:source.Sources.gpgkey - ~tmpdir in - match source.Sources.format with - | Sources.FormatNative -> - Index_parser.get_index ~downloader ~sigchecker source - | Sources.FormatSimpleStreams -> - Simplestreams_parser.get_index ~downloader ~sigchecker source + try + let sigchecker = + Sigchecker.create ~gpg:cmdline.gpg + ~check_signature:cmdline.check_signature + ~gpgkey:source.Sources.gpgkey +...

--- builder/simplestreams_parser.ml | 9 +- .../test-virt-builder-list-simplestreams.sh | 64 ++++++------- builder/utils.mli | 2 +- common/mltools/JSON_parser-c.c | 96 ++++++++++++------- common/mltools/JSON_parser.ml | 29 ++---- common/mltools/JSON_p...

v2: - Added back the null value. - Reran the tests. Rich.

An evolution of: https://www.redhat.com/archives/libguestfs/2018-August/msg00155.html