replace ec3_reader and ec3_writer with a unified image and tag io interface

This commit is contained in:
2025-02-23 20:52:59 +00:00
parent 2e4ee5c1b6
commit 9aeae388a4
32 changed files with 3458 additions and 264 deletions

View File

@@ -1,6 +1,18 @@
#if 0
#include "bin.h"
#include "chunk-table.h"
#include "commands.h"
#include "misc.h"
#include "pipeline.h"
#include "status.h"
#include "string-table.h"
#include "write.h"
#include <blue/cmd.h>
#include <blue/io/directory.h>
#include <blue/term/print.h>
#include <errno.h>
#include <stdio.h>
#define BUFFER_SIZE 65536
@@ -8,7 +20,11 @@ enum {
OPT_OUTPATH,
OPT_OUTPATH_PATH,
ARG_DIRECTORY,
OPT_IDENT,
OPT_IDENT_VAL,
OPT_DIRECTORY,
OPT_DIRECTORY_PATH,
OPT_TAGGED_DIRECTORY,
OPT_TAGGED_DIRECTORY_TAG,
@@ -17,11 +33,206 @@ enum {
OPT_VERBOSE,
};
static enum ec3_status capture_directory(
struct ec3_writer *writer,
struct chunk_table *chunk_tab,
uint64_t id,
const char *cpath)
{
b_path *path = b_path_create_from_cstr(cpath);
b_directory *dir;
b_status status = b_directory_open(NULL, path, &dir);
b_path_release(path);
if (!B_OK(status)) {
return EC3_ERR_NO_ENTRY;
}
struct ec3_tag_writer *volu;
enum ec3_status s2 = ec3_writer_create_tag(
writer,
EC3_TAG_WRITER_BUFFERED,
EC3_TAG_VOLU,
id,
0,
&volu);
if (s2 != EC3_SUCCESS) {
b_directory_release(dir);
return s2;
}
struct string_table *stab = ec3_writer_get_strings(writer);
b_directory_iterator it;
b_directory_iterator_begin(dir, &it, B_DIRECTORY_ITERATE_PARENT_FIRST);
while (b_directory_iterator_is_valid(&it)) {
printf("%s\n", b_path_ptr(it.filepath));
size_t key = string_table_get(stab, it.filename);
b_directory_iterator_next(&it);
}
ec3_tag_writer_finish(volu);
b_directory_release(dir);
return EC3_SUCCESS;
}
static int capture(
const b_command *self,
const b_arglist *opt,
const b_array *args)
{
const char *out_path = NULL;
b_arglist_get_string(opt, OPT_OUTPATH, OPT_OUTPATH_PATH, 0, &out_path);
FILE *outp = fopen(out_path, "wb");
if (!outp) {
b_err("cannot open '%s'", out_path);
b_i("reason: %s", strerror(errno));
return -1;
}
enum ec3_status status = EC3_SUCCESS;
uint64_t ident = 0;
const char *ident_str;
b_arglist_get_string(opt, OPT_IDENT, OPT_IDENT_VAL, 0, &ident_str);
if (ident_str) {
status = ec3_identifier_from_string(ident_str, &ident);
}
if (status != EC3_SUCCESS) {
b_err("'%s' is not a valid container identifier", ident_str);
return -1;
}
struct ec3_writer *writer = NULL;
struct ec3_parameters param = {
.p_outp = outp,
.p_cluster_size = EC3_CLUSTER_16K,
.p_compression_func = EC3_COMPRESSION_ZSTD,
.p_ident = ident,
};
status = ec3_writer_create(&param, &writer);
if (status != EC3_SUCCESS) {
b_err("cannot initialise EC3 writer");
return -1;
}
uint64_t ctab_id, cdat_id;
ec3_identifier_from_string("_CHKTAB0", &ctab_id);
ec3_identifier_from_string("_CHKDAT0", &cdat_id);
struct ec3_tag_writer *ctab, *cdat;
status = ec3_writer_create_tag(
writer,
EC3_TAG_WRITER_BUFFERED,
EC3_TAG_CTAB,
ctab_id,
0,
&ctab);
if (status != EC3_SUCCESS) {
b_err("cannot initialise EC3 writer");
return -1;
}
status = ec3_writer_create_tag(
writer,
EC3_TAG_WRITER_BUFFERED,
EC3_TAG_CDAT,
cdat_id,
0,
&cdat);
if (status != EC3_SUCCESS) {
b_err("cannot initialise EC3 writer");
return -1;
}
struct chunk_table chunk_tab;
#if 0
chunk_table_init_write(
ctab,
cdat,
ec3_get_cluster_size(param.p_cluster_size),
&chunk_tab);
#endif
uint64_t next_auto_id = 0;
b_arglist_iterator it = {0};
b_arglist_foreach_filtered(&it, opt, OPT_DIRECTORY, OPT_DIRECTORY_PATH)
{
printf("%s\n", it.value->val_str);
status = capture_directory(
writer,
&chunk_tab,
next_auto_id,
it.value->val_str);
next_auto_id++;
if (status != EC3_SUCCESS) {
b_err("an error occurred while writing to the "
"container");
return -1;
}
}
for (size_t i = 0;; i++) {
b_arglist_option *option = NULL;
b_status err = b_arglist_get_option(
opt,
OPT_TAGGED_DIRECTORY,
i,
&option);
if (!option) {
break;
}
b_arglist_value *tag = NULL, *path = NULL;
err = b_arglist_option_get_value(
option,
OPT_TAGGED_DIRECTORY_TAG,
0,
&tag);
err = b_arglist_option_get_value(
option,
OPT_TAGGED_DIRECTORY_PATH,
0,
&path);
printf("%s:%s\n", tag->val_str, path->val_str);
uint64_t id = 0;
status = ec3_identifier_from_string(tag->val_str, &id);
if (status != EC3_SUCCESS) {
b_err("'%s' is not a valid tag identifier", id);
return -1;
}
status = capture_directory(
writer,
&chunk_tab,
id,
path->val_str);
if (status != EC3_SUCCESS) {
b_err("an error occurred while writing to the "
"container");
return -1;
}
}
ec3_tag_writer_finish(ctab);
ec3_tag_writer_finish(cdat);
ec3_writer_finish(writer);
fclose(outp);
return 0;
}
@@ -39,6 +250,21 @@ B_COMMAND(CMD_CAPTURE, CMD_ROOT)
B_COMMAND_HELP_OPTION();
B_COMMAND_OPTION(OPT_IDENT)
{
B_OPTION_SHORT_NAME('I');
B_OPTION_LONG_NAME("ident");
B_OPTION_DESC(
"the string or number to use as the container "
"identifier");
B_OPTION_ARG(OPT_IDENT_VAL)
{
B_ARG_NAME("value");
B_ARG_NR_VALUES(1);
}
}
B_COMMAND_OPTION(OPT_OUTPATH)
{
B_OPTION_SHORT_NAME('o');
@@ -52,16 +278,21 @@ B_COMMAND(CMD_CAPTURE, CMD_ROOT)
}
}
B_COMMAND_ARG(ARG_DIRECTORY)
B_COMMAND_OPTION(OPT_DIRECTORY)
{
B_ARG_NAME("directory");
B_ARG_DESC(
B_OPTION_SHORT_NAME('d');
B_OPTION_LONG_NAME("directory");
B_OPTION_DESC(
"a directory to add to the container. a volume "
"will be created "
"within the container to store the specified "
"directory.");
B_ARG_NR_VALUES(B_ARG_1_OR_MORE_VALUES);
B_OPTION_ARG(OPT_DIRECTORY_PATH)
{
B_ARG_NAME("path");
B_ARG_NR_VALUES(1);
}
}
B_COMMAND_OPTION(OPT_TAGGED_DIRECTORY)
@@ -104,7 +335,7 @@ B_COMMAND(CMD_CAPTURE, CMD_ROOT)
B_COMMAND_USAGE()
{
B_COMMAND_USAGE_OPT(OPT_OUTPATH);
B_COMMAND_USAGE_ARG(ARG_DIRECTORY);
B_COMMAND_USAGE_OPT(OPT_DIRECTORY);
}
B_COMMAND_USAGE()
@@ -113,3 +344,4 @@ B_COMMAND(CMD_CAPTURE, CMD_ROOT)
B_COMMAND_USAGE_OPT(OPT_TAGGED_DIRECTORY);
}
}
#endif