encoding-tools 0.0.9 → 0.0.11

package/encoding-tools

@@ -36,6 +36,9 @@ const
   _txt2bin_module =
     require(
       "./libtxt2bin");
+const
+  _input_texts_check =
+    _txt2bin_module._input_texts_check;
 const
   _txt2bin =
     _txt2bin_module._txt2bin;
@@ -43,6 +46,8 @@ const
 module.exports = {
   _bin2txt:
     _bin2txt,
+  _input_texts_check:
+    _input_texts_check,
   _txt2bin:
     _txt2bin
 };

package/libbin2txt

@@ -135,7 +135,8 @@ async function
     _out,
     _buffer_size_bytes) {
   let
-    _msg;
+    _msg,
+    _output_files;
   const
     _size_max =
       0;
@@ -153,56 +154,69 @@ async function
       Math.ceil(
         _in_size_bytes /
         _buffer_size_bytes);
-  _msg =
-    `Splitting file '${_in}' in ` +
-    `'${_blocks_total}' blocks of ` +
-    `'${_buffer_size_bytes}' bytes.`;
-  _msg_info(
-    _msg);
-  const
-    _split_opts = [
-      _in,
-      `${_out}.block.`,
-      _blocks_total,
-      _size_max
-    ];
-  const
+  if ( 1 < _blocks_total ) {
+    _msg =
+      `Splitting file '${_in}' in ` +
+      `'${_blocks_total}' blocks of ` +
+      `'${_buffer_size_bytes}' bytes.`;
+    _msg_info(
+      _msg);
+    const
+      _split_opts = [
+        _in,
+        `${_out}.block.`,
+        _blocks_total,
+        _size_max
+      ];
     _output_files =
       await _split.apply(
         null,
         _split_opts);
-  _msg =
-    "Done.";
-  _msg_info(
-    _msg);
+    _msg =
+      "Done.";
+    _msg_info(
+      _msg);
+  }
+  else {
+    _output_files = [
+      _in
+    ]; 
+  }
   return _output_files;
 }
 
-function
+async function
   _base64_block_encode(
     _file) {
   let
     _string;
+  const
+    _cat_opts = {
+      "encoding":
+        null,
+      "flag":
+        "r"};
   const
     _content =
       _cat(
-        _file);
+        _file,
+        _cat_opts);
   if ( typeof window === 'undefined' &&
        ( typeof global !== 'undefined' &&
          global.global === global ) &&
        typeof __webpack_require__ !== 'function' ) {
-    const
-      _buffer =
-        Buffer.from(
-          _content);
+    // const
+    //   _buffer =
+    //     await Buffer.from(
+    //       _content);
     _string =
-      _buffer.toString(
+      _content.toString(
         "base64");
   }
   else {
     _string =
-      btoa(
-        _string);
+      await btoa(
+        _content);
   }
   return _string;
 }
@@ -230,6 +244,7 @@ async function
         _chunk_current +
         _total /
           _length);
+  console.log("prefix", _prefix);
   if ( _chunks < 2 ) {
     _out =
       _prefix;
@@ -264,7 +279,7 @@ async function
     _msg_info(
       _msg);
     if ( _chunk < _chunks ) {
-      _printf(
+      _file_write(
         _out,
         _cut);
     }
@@ -282,7 +297,7 @@ async function
           _msg);
         _file_write(
           _out,
-          _cut);
+          `${_cut}\n`);
       }
     }
   }
@@ -307,7 +322,7 @@ async function
     _msg;
   const
     _txt =
-      _base64_block_encode(
+      await _base64_block_encode(
         _block);
   _msg =
     `Block '${_block}' encoded ` +
@@ -374,12 +389,11 @@ async function
     _amount_only) {
   let
     _block,
-    _chunk_current,
-    _chunks_total,
     _block_current,
     _block_last,
+    _chunk_current,
+    _chunks_total,
     _msg,
-    _rm_args,
     _worker;
   if ( typeof window !== 'undefined' ) {
     const
@@ -423,7 +437,7 @@ async function
     }
     if ( _format === "base64" ) {
       _chunk_current =
-        _base64_encode(
+        await _base64_encode(
           _block,
           _chunk_current,
           _length,
@@ -444,11 +458,18 @@ async function
         1);
     }
   }
+  const
+    _rm_args =
+      [];
   for ( _block of _blocks ) {
-    _rm_args = [
-      _block
-    ];
-    _rm(
+    if ( _block != _in ) {
+      _rm_args.push(
+        _block);
+    }
+  }
+  if ( 0 < _rm_args.length ) {
+    _rm.apply(
+      null,
       _rm_args);
   }
   if ( _amount_only === "true" ) {

package/libtxt2bin

@@ -88,6 +88,11 @@ const
 const
   _file_append =
     _libcrash._file_append;
+/* global
+     _file_exists */
+const
+  _file_exists =
+    _libcrash._file_exists;
 /* global
      _file_read */
 const
@@ -179,7 +184,7 @@ async function
     _msg);
 }
 
-function
+async function
   _base64_decode(
     _output_file,
     _input_files,
@@ -202,9 +207,14 @@ function
     _input_files[
       0];
   if ( 0 < _input_files.length ) {
+    const
+      _tmp_dir =
+        await _mktemp();
+    console.log(
+      _tmp_dir);
     _txt =
       _path_join( [
-        _mktemp(),
+        _tmp_dir,
         "merge.base64" ]);
     _assemble(
       _txt,
@@ -222,11 +232,48 @@ function
 }
 
 function
+  _input_texts_check(
+    _input_texts) {
+  let
+    _file,
+    _input_file_exists;
+  for ( _file of _input_texts ) {
+    _input_file_exists =
+      _file_exists(
+        _file);
+    if ( ! _input_file_exists ) {
+      const
+        _msg =
+          `Input file '${_file}' does not ` +
+          `exist.`;
+        _msg_error(
+          _msg,
+          1);
+    }
+  }
+}
+
+async function
   _txt2bin(
     _output_file,
     _encoding_format,
     _argument_type,
-    _input_files) {
+    _input_files,
+    _input_files_sanity_check) {
+  const
+    _input_files_sanity_check_type =
+      typeof(
+        _input_files_sanity_check);
+  if ( _input_files_sanity_check_type == "undefined" ||
+         _input_files_sanity_check == "" ||
+         _input_files_sanity_check == "true" ) {
+    _input_files_sanity_check =
+      true;
+  }
+  if ( _input_files_sanity_check == "false" ) {
+    _input_files_sanity_check =
+      false;
+  }
   if ( _argument_type == "list" ) {
     const
       _list =
@@ -237,8 +284,12 @@ function
         _list).split(
           "\n");
   }
+  if ( _input_files_sanity_check ) {
+    _input_texts_check(
+      _input_files);
+  }
   if ( _encoding_format == "base64" ) {
-    _base64_decode(
+    await _base64_decode(
       _output_file,
       _input_files,
       _argument_type);
@@ -246,6 +297,8 @@ function
 }
 
 module.exports = {
+  _input_texts_check:
+    _input_texts_check,
   _txt2bin:
     _txt2bin
 };

package/package.json

@@ -2,7 +2,7 @@
   "name":
     "encoding-tools",
   "version":
-    "0.0.9",
+    "0.0.11",
   "description":
     "A multi-language collection of encoding tools.",
   "funding": {
@@ -60,7 +60,7 @@
   },
   "devDependencies": {
     "crash-js-webpack":
-      "^0.0.19",
+      "^0.0.25",
     "eslint":
       "^10.3.0",
     "globals":
@@ -80,7 +80,9 @@
     "base64-stream":
       "^1.0.0",
     "crash-js":
-      "^0.1.125",
+      "^0.1.130",
+    "fs":
+      "npm:@themartiancompany/fs@^0.0.8",
     "tmcsplit":
       "^0.0.10",
     "yargs":

package/txt2bin

@@ -122,6 +122,11 @@ const
   _encoding_tools =
     require(
       "./encoding-tools");
+/* global
+     _input_texts_check */
+const
+  _input_texts_check =
+    _encoding_tools._input_texts_check;
 /* global
      _txt2bin */
 const
@@ -180,13 +185,14 @@ function
     _line;
   const
     _text = [
-      `                Call date: ${make_date}`,
+      `                Make date: ${make_date}`,
       `      Runtime environment: ${runtime_environment}`,
       `            Argument type: ${argument_type}`,
       `          Encoding format: ${encoding_format}`,
       `              Output file: ${output_file}`,
       `       Input text file(s): ${input_texts}`,
     ];
+  _msg_info("perche");
   for ( _line of _text ) {
     _msg_info(
       _line);
@@ -251,6 +257,8 @@ function
     argument_type =
       "file";
   }
+  _input_texts_check(
+    input_texts);
 }
 
 function 
@@ -279,11 +287,13 @@ function
     "y";
   _help_display =
     false;
-  if ( "h" in _argv ) {
+  if ( _argv[
+         "h"]) {
     _help_display =
       true;
   }
-  if ( "help" in _argv ) {
+  if ( _argv[
+         "help"] ) {
     _help_display =
       true;
   }
@@ -343,11 +353,13 @@ function
       _argv[
         "encoding-format"];
   }
-  if ( "v" in _argv ) {
+  if ( _argv[
+         "v"] ) {
     verbose =
       true;
   }
-  if ( "verbose" in _argv ) {
+  if ( _argv[
+         "verbose"] ) {
     verbose =
       true;
   }
@@ -397,6 +409,7 @@ if ( _cmdline_check(
 else {
   _url_parse();
 }
+_overrides_set();
 _config_show();
 app_opts = [
   output_file,