rtty-soda 0.2.0__tar.gz → 0.2.2__tar.gz

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rtty-soda
-Version: 0.2.0
+Version: 0.2.2
 Summary: A CLI tool for Unix-like environments to encrypt a RTTY session using NaCl
 Keywords: cli,encryption,libsodium,nacl,rtty
 Author: Theo Saveliev
@@ -57,8 +57,8 @@ A CLI tool for Unix-like environments to encrypt a RTTY session using NaCl.
 #### Docker
 
 ```
-% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.0
-% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.0-tools
+% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.2
+% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.2-tools
 ```
 
 
@@ -112,8 +112,9 @@ Options:
   -e, --encoding TEXT     [default: base64]
   -o, --output-file FILE  Write output to file.
   --group-len INTEGER     [default: 0]
-  --line-len INTEGER      [default: 0]
+  --line-len INTEGER      [default: 80]
   --padding INTEGER       [default: 0]
+  -v, --verbose           Show verbose output.
   -h, --help              Show this message and exit.
 ```
 
@@ -128,11 +129,11 @@ transmit text messages in Morse code in a telegraphy system.
 The first telegraph key was invented by Alfred Vail, an associate of Samuel Morse.
 (c) Wikipedia
 
-% soda encrypt-public alice bob_pub message --line-len 80 | tee encrypted
-cCipniCmJVAb2mc3JLoDo/DAun7cMunWS5bMqtKRPc/e3d2vfRm8wnqTsYjOXVOCZRj78/GqcVweBV0
-mE43X7xO8B0OVyKKgqPAqnAJxwggTLPmWtKFrTwKi0utf7n6fIQuDaCths0qO6FF5rm0znc/3KYKP3D
-/WbgE/IBrTOAV6P+mLUnGlzO6U/HdtDCjk1ZB45EN0Q76dDzYav+bliCrVWiAUfZUCtEQ/6B4fi9Aqn
-KRDC4XSnd7nLs/ZkhL8hkM13xJ+1MBGbIvEjaY=
+% soda encrypt-public alice bob_pub message --group-len 79 | tee encrypted
+q+zCgyCfHdlSHrcuyM/Yfw1+ZvqNRXgY0O7gGrauPyQlsI0MdPXoVlkfyKZUtg6Jcqn47d4BGLMBITo
+y3Wp9+9FvI1rolCd7JmyIxRIHHYWqxux+czh88aDdGjbDQ2pRNX68TU33PylBDw/H+VfYSZ6fyw1xdJ
+005pJeEXCzpOXljvXMgAElBIFJ/vsluunrRI9Sw6WcnrCsPYFxTFRZVOvsq6U8PJwnhnaDyLW0Z28Op
+dS71gNH/7xA7P1LbFwxSD0jAjDqPZdLYkPzd94=
 
 % soda encrypt-public -h
 Usage: soda encrypt-public [OPTIONS] PRIVATE_KEY_FILE PUBLIC_KEY_FILE
@@ -150,7 +151,7 @@ Options:
   -c, --compression TEXT    [default: zstd]
   -o, --output-file FILE    Write output to file.
   --group-len INTEGER       [default: 0]
-  --line-len INTEGER        [default: 0]
+  --line-len INTEGER        [default: 80]
   --padding INTEGER         [default: 0]
   -v, --verbose             Show verbose output.
   -h, --help                Show this message and exit.
@@ -180,7 +181,6 @@ Options:
   -e, --data-encoding TEXT  [default: base64]
   -c, --compression TEXT    [default: zstd]
   -o, --output-file FILE    Write output to file.
-  --padding INTEGER         [default: 0]
   -v, --verbose             Show verbose output.
   -h, --help                Show this message and exit.
 ```
@@ -210,7 +210,7 @@ Options:
   -c, --compression TEXT    [default: zstd]
   -o, --output-file FILE    Write output to file.
   --group-len INTEGER       [default: 0]
-  --line-len INTEGER        [default: 0]
+  --line-len INTEGER        [default: 80]
   --padding INTEGER         [default: 0]
   -v, --verbose             Show verbose output.
   -h, --help                Show this message and exit.
@@ -239,7 +239,7 @@ Options:
   -c, --compression TEXT    [default: zstd]
   -o, --output-file FILE    Write output to file.
   --group-len INTEGER       [default: 0]
-  --line-len INTEGER        [default: 0]
+  --line-len INTEGER        [default: 80]
   --padding INTEGER         [default: 0]
   -v, --verbose             Show verbose output.
   -h, --help                Show this message and exit.
@@ -269,8 +269,9 @@ Options:
   -p, --profile TEXT      [default: sensitive]
   -o, --output-file FILE  Write output to file.
   --group-len INTEGER     [default: 0]
-  --line-len INTEGER      [default: 0]
+  --line-len INTEGER      [default: 80]
   --padding INTEGER       [default: 0]
+  -v, --verbose           Show verbose output.
   -h, --help              Show this message and exit.
 ```
 
@@ -287,22 +288,27 @@ That works as follows:
 Plaintext: 239
 Ciphertext: 276
 Overhead: 1.155
+Groups: 1
 % soda es shared message -c zlib -v > /dev/null
 Plaintext: 239
 Ciphertext: 280
 Overhead: 1.172
+Groups: 1
 % soda es shared message -c bz2 -v > /dev/null
 Plaintext: 239
 Ciphertext: 340
 Overhead: 1.423
+Groups: 1
 % soda es shared message -c lzma -v > /dev/null
 Plaintext: 239
 Ciphertext: 324
 Overhead: 1.356
+Groups: 1
 % soda es shared message -c raw -v > /dev/null
 Plaintext: 239
 Ciphertext: 372
 Overhead: 1.556
+Groups: 1
 ```
 
 
@@ -311,12 +317,16 @@ Overhead: 1.556
 The rtty-soda supports various encodings:
 
 ```
-% soda encrypt-public alice bob_pub message --data-encoding base36 --group-len 5 --line-len 80
-9TPUZ T8OA3 PNC2Z XEH87 EPMCN NDQJJ GX0DE YW16D OJ2FC D3PCM B148K 6UZFN 9RQX7
-8C83X 6O8WS MQ4CX 26C7H 35EK5 CVSIX IFSVN KPV6A TRV1F 573WI JFFGE I7N3Z Z4N6D
-FSSOB DJUBK PC2YW Z6RG0 SUD2N OIYH8 WHJMN YYSKQ EBEVJ ZT0M1 DYJ7E NJ25J FMXNE
-7LHUQ N5UIH SK5O7 96LWM IZ7BA R8SIV 6G55R Q50L4 PJH5Z 2JQNX JZTPK BG140 AKXOB
-DKR4K POW9A HCQSQ JLSJ1 11AZY P8BM4 F3GUC SFX04 RMD0G 4V0PL RLRHN G8D8
+% soda encrypt-public alice bob_pub message --data-encoding base36 --group-len 5 --verbose
+D0MQT LF0K5 N997D JJXZ9 K85DJ DCEIF 3I2BN GCYOG KN02L 5TPKE 4UV25 AKD0R O9BKS
+6Y40L T2NET GQKXA B4C4X 6J88W N4HZK 5ACFE 8JWTC UZJBH LRXPE CJLL5 N8L2I BX2NS
+D9LYW H6EAT 1J2OA IHZC3 8L2JM 6XLS9 5M6Y2 E9FLU GHDVB WZWK7 WC2RQ OLQH6 OT725
+706MK ZSU6O V6PWA UHOTM XVFSK HE3OO M4E51 4R00I U3YL8 FJXFQ PZLM8 WYO6Z 50G5Q
+SM6BH GT1T7 ZBSDB 8COJ6 7DXCF K7T36 RSU06 6R9AS J7TEA D9BT7 Q8BCG D4YX
+Plaintext: 239
+Ciphertext: 382
+Overhead: 1.598
+Groups: 64
 ```
 
 

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/README.md

@@ -34,8 +34,8 @@ A CLI tool for Unix-like environments to encrypt a RTTY session using NaCl.
 #### Docker
 
 ```
-% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.0
-% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.0-tools
+% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.2
+% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.2-tools
 ```
 
 
@@ -89,8 +89,9 @@ Options:
   -e, --encoding TEXT     [default: base64]
   -o, --output-file FILE  Write output to file.
   --group-len INTEGER     [default: 0]
-  --line-len INTEGER      [default: 0]
+  --line-len INTEGER      [default: 80]
   --padding INTEGER       [default: 0]
+  -v, --verbose           Show verbose output.
   -h, --help              Show this message and exit.
 ```
 
@@ -105,11 +106,11 @@ transmit text messages in Morse code in a telegraphy system.
 The first telegraph key was invented by Alfred Vail, an associate of Samuel Morse.
 (c) Wikipedia
 
-% soda encrypt-public alice bob_pub message --line-len 80 | tee encrypted
-cCipniCmJVAb2mc3JLoDo/DAun7cMunWS5bMqtKRPc/e3d2vfRm8wnqTsYjOXVOCZRj78/GqcVweBV0
-mE43X7xO8B0OVyKKgqPAqnAJxwggTLPmWtKFrTwKi0utf7n6fIQuDaCths0qO6FF5rm0znc/3KYKP3D
-/WbgE/IBrTOAV6P+mLUnGlzO6U/HdtDCjk1ZB45EN0Q76dDzYav+bliCrVWiAUfZUCtEQ/6B4fi9Aqn
-KRDC4XSnd7nLs/ZkhL8hkM13xJ+1MBGbIvEjaY=
+% soda encrypt-public alice bob_pub message --group-len 79 | tee encrypted
+q+zCgyCfHdlSHrcuyM/Yfw1+ZvqNRXgY0O7gGrauPyQlsI0MdPXoVlkfyKZUtg6Jcqn47d4BGLMBITo
+y3Wp9+9FvI1rolCd7JmyIxRIHHYWqxux+czh88aDdGjbDQ2pRNX68TU33PylBDw/H+VfYSZ6fyw1xdJ
+005pJeEXCzpOXljvXMgAElBIFJ/vsluunrRI9Sw6WcnrCsPYFxTFRZVOvsq6U8PJwnhnaDyLW0Z28Op
+dS71gNH/7xA7P1LbFwxSD0jAjDqPZdLYkPzd94=
 
 % soda encrypt-public -h
 Usage: soda encrypt-public [OPTIONS] PRIVATE_KEY_FILE PUBLIC_KEY_FILE
@@ -127,7 +128,7 @@ Options:
   -c, --compression TEXT    [default: zstd]
   -o, --output-file FILE    Write output to file.
   --group-len INTEGER       [default: 0]
-  --line-len INTEGER        [default: 0]
+  --line-len INTEGER        [default: 80]
   --padding INTEGER         [default: 0]
   -v, --verbose             Show verbose output.
   -h, --help                Show this message and exit.
@@ -157,7 +158,6 @@ Options:
   -e, --data-encoding TEXT  [default: base64]
   -c, --compression TEXT    [default: zstd]
   -o, --output-file FILE    Write output to file.
-  --padding INTEGER         [default: 0]
   -v, --verbose             Show verbose output.
   -h, --help                Show this message and exit.
 ```
@@ -187,7 +187,7 @@ Options:
   -c, --compression TEXT    [default: zstd]
   -o, --output-file FILE    Write output to file.
   --group-len INTEGER       [default: 0]
-  --line-len INTEGER        [default: 0]
+  --line-len INTEGER        [default: 80]
   --padding INTEGER         [default: 0]
   -v, --verbose             Show verbose output.
   -h, --help                Show this message and exit.
@@ -216,7 +216,7 @@ Options:
   -c, --compression TEXT    [default: zstd]
   -o, --output-file FILE    Write output to file.
   --group-len INTEGER       [default: 0]
-  --line-len INTEGER        [default: 0]
+  --line-len INTEGER        [default: 80]
   --padding INTEGER         [default: 0]
   -v, --verbose             Show verbose output.
   -h, --help                Show this message and exit.
@@ -246,8 +246,9 @@ Options:
   -p, --profile TEXT      [default: sensitive]
   -o, --output-file FILE  Write output to file.
   --group-len INTEGER     [default: 0]
-  --line-len INTEGER      [default: 0]
+  --line-len INTEGER      [default: 80]
   --padding INTEGER       [default: 0]
+  -v, --verbose           Show verbose output.
   -h, --help              Show this message and exit.
 ```
 
@@ -264,22 +265,27 @@ That works as follows:
 Plaintext: 239
 Ciphertext: 276
 Overhead: 1.155
+Groups: 1
 % soda es shared message -c zlib -v > /dev/null
 Plaintext: 239
 Ciphertext: 280
 Overhead: 1.172
+Groups: 1
 % soda es shared message -c bz2 -v > /dev/null
 Plaintext: 239
 Ciphertext: 340
 Overhead: 1.423
+Groups: 1
 % soda es shared message -c lzma -v > /dev/null
 Plaintext: 239
 Ciphertext: 324
 Overhead: 1.356
+Groups: 1
 % soda es shared message -c raw -v > /dev/null
 Plaintext: 239
 Ciphertext: 372
 Overhead: 1.556
+Groups: 1
 ```
 
 
@@ -288,12 +294,16 @@ Overhead: 1.556
 The rtty-soda supports various encodings:
 
 ```
-% soda encrypt-public alice bob_pub message --data-encoding base36 --group-len 5 --line-len 80
-9TPUZ T8OA3 PNC2Z XEH87 EPMCN NDQJJ GX0DE YW16D OJ2FC D3PCM B148K 6UZFN 9RQX7
-8C83X 6O8WS MQ4CX 26C7H 35EK5 CVSIX IFSVN KPV6A TRV1F 573WI JFFGE I7N3Z Z4N6D
-FSSOB DJUBK PC2YW Z6RG0 SUD2N OIYH8 WHJMN YYSKQ EBEVJ ZT0M1 DYJ7E NJ25J FMXNE
-7LHUQ N5UIH SK5O7 96LWM IZ7BA R8SIV 6G55R Q50L4 PJH5Z 2JQNX JZTPK BG140 AKXOB
-DKR4K POW9A HCQSQ JLSJ1 11AZY P8BM4 F3GUC SFX04 RMD0G 4V0PL RLRHN G8D8
+% soda encrypt-public alice bob_pub message --data-encoding base36 --group-len 5 --verbose
+D0MQT LF0K5 N997D JJXZ9 K85DJ DCEIF 3I2BN GCYOG KN02L 5TPKE 4UV25 AKD0R O9BKS
+6Y40L T2NET GQKXA B4C4X 6J88W N4HZK 5ACFE 8JWTC UZJBH LRXPE CJLL5 N8L2I BX2NS
+D9LYW H6EAT 1J2OA IHZC3 8L2JM 6XLS9 5M6Y2 E9FLU GHDVB WZWK7 WC2RQ OLQH6 OT725
+706MK ZSU6O V6PWA UHOTM XVFSK HE3OO M4E51 4R00I U3YL8 FJXFQ PZLM8 WYO6Z 50G5Q
+SM6BH GT1T7 ZBSDB 8COJ6 7DXCF K7T36 RSU06 6R9AS J7TEA D9BT7 Q8BCG D4YX
+Plaintext: 239
+Ciphertext: 382
+Overhead: 1.598
+Groups: 64
 ```
 
 

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rtty-soda"
-version = "0.2.0"
+version = "0.2.2"
 description = "A CLI tool for Unix-like environments to encrypt a RTTY session using NaCl"
 readme = "README.md"
 license = { text = "MIT" }

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/cli_io.py

@@ -11,6 +11,7 @@ import click
 from rtty_soda.encoders import Encoder, decode_bytes, encode_str
 
 __all__ = [
+    "format_output",
     "pad_newlines",
     "print_stats",
     "read_bytes",
@@ -40,15 +41,15 @@ def read_encoded_stripped(source: Path) -> bytes:
     return encode_str(data)
 
 
-def read_bytes(source: Path, is_binary: bool) -> bytes:
-    if is_binary:
+def read_bytes(source: Path, encoder: Encoder) -> bytes:
+    if encoder.is_binary:
         return source.read_bytes()
 
     return read_encoded_stripped(source)
 
 
-def read_key_bytes(source: Path, is_binary: bool, encoder: Encoder) -> bytes:
-    key = read_bytes(source, is_binary)
+def read_key_bytes(source: Path, encoder: Encoder) -> bytes:
+    key = read_bytes(source, encoder)
     return encoder.decode(key)
 
 
@@ -63,48 +64,36 @@ def write_bytes_atomic(target: Path, data: bytes) -> None:
     temp_path.replace(target)
 
 
-def split_groups(data: str, group_len: int, line_len: int) -> str:
-    step = group_len if group_len > 0 else line_len - 1
-    groups = (data[i : i + step] for i in range(0, len(data), step))
-    result: list[str] = []
-    line: list[str] = []
-    i = 0
-    gpl = line_len // (step + 1)
-    for group in groups:
-        line.append(group)
-        i += 1
-        if i == gpl:
-            result.append(" ".join(line))
-            i = 0
-            line = []
-
-    if line:
-        result.append(" ".join(line))
-
-    return "\n".join(result)
-
-
-def pad_newlines(data: bytes, count: int) -> bytes:
-    padding = b"\n" * count
-    return padding + data + padding
-
-
-def write_output(
-    target: Path | None,
-    data: bytes,
-    is_binary: bool,
-    group_len: int,
-    line_len: int,
-    padding: int,
-) -> None:
-    if not is_binary and (group_len > 0 or line_len > 0):
-        text = decode_bytes(data)
-        text = split_groups(text, group_len, line_len)
-        data = encode_str(text)
+def split_groups(data: str, group_len: int, line_len: int) -> tuple[str, int]:
+    step, gpl = group_len, line_len // (group_len + 1)
+    groups = [data[i : i + step] for i in range(0, len(data), step)]
+    lines = [" ".join(groups[i : i + gpl]) for i in range(0, len(groups), gpl)]
+    return "\n".join(lines), len(groups)
+
+
+def pad_newlines(data: str, count: int) -> str:
+    padding = "\n" * count
+    return padding + data.strip() + "\n" + padding
+
+
+def format_output(
+    data: bytes, encoder: Encoder, group_len: int, line_len: int, padding: int
+) -> tuple[bytes, int]:
+    groups = 1
+    if encoder.is_binary:
+        return data, groups
+
+    text = decode_bytes(data)
+    if 0 < group_len < line_len:
+        text, groups = split_groups(text, group_len, line_len)
 
     if padding > 0:
-        data = pad_newlines(data, padding)
+        text = pad_newlines(text, padding)
+
+    return encode_str(text), groups
+
 
+def write_output(target: Path | None, data: bytes) -> None:
     if target is None or target.stem == "-":
         add_nl = not data.endswith(b"\n")
         click.echo(data, nl=add_nl)

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/encoders/base26_encoder.py

@@ -1,6 +1,6 @@
 import string
+from typing import ClassVar
 
-from .encoder import Encoder
 from .functions import base_to_bytes, bytes_to_base, decode_bytes, encode_str
 
 __all__ = ["ALPHABET", "Base26Encoder"]
@@ -8,7 +8,9 @@ __all__ = ["ALPHABET", "Base26Encoder"]
 ALPHABET = string.ascii_uppercase
 
 
-class Base26Encoder(Encoder):
+class Base26Encoder:
+    is_binary: ClassVar = False
+
     @staticmethod
     def encode(data: bytes) -> bytes:
         return encode_str(bytes_to_base(data, ALPHABET))

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/encoders/base31_encoder.py

@@ -1,4 +1,5 @@
-from .encoder import Encoder
+from typing import ClassVar
+
 from .functions import base_to_bytes, bytes_to_base, decode_bytes, encode_str
 
 __all__ = ["ALPHABET", "Base31Encoder"]
@@ -6,7 +7,9 @@ __all__ = ["ALPHABET", "Base31Encoder"]
 ALPHABET = "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЭЮЯ"
 
 
-class Base31Encoder(Encoder):
+class Base31Encoder:
+    is_binary: ClassVar = False
+
     @staticmethod
     def encode(data: bytes) -> bytes:
         return encode_str(bytes_to_base(data, ALPHABET))

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/encoders/base36_encoder.py

@@ -1,6 +1,6 @@
 import string
+from typing import ClassVar
 
-from .encoder import Encoder
 from .functions import base_to_bytes, bytes_to_base, decode_bytes, encode_str
 
 __all__ = ["ALPHABET", "Base36Encoder"]
@@ -8,7 +8,9 @@ __all__ = ["ALPHABET", "Base36Encoder"]
 ALPHABET = string.digits + string.ascii_uppercase
 
 
-class Base36Encoder(Encoder):
+class Base36Encoder:
+    is_binary: ClassVar = False
+
     @staticmethod
     def encode(data: bytes) -> bytes:
         return encode_str(bytes_to_base(data, ALPHABET))

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/encoders/base64_encoder.py

@@ -1,11 +1,12 @@
 import base64
-
-from .encoder import Encoder
+from typing import ClassVar
 
 __all__ = ["Base64Encoder"]
 
 
-class Base64Encoder(Encoder):
+class Base64Encoder:
+    is_binary: ClassVar = False
+
     @staticmethod
     def encode(data: bytes) -> bytes:
         return base64.b64encode(data)

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/encoders/base94_encoder.py

@@ -1,4 +1,5 @@
-from .encoder import Encoder
+from typing import ClassVar
+
 from .functions import base_to_bytes, bytes_to_base, decode_bytes, encode_str
 
 __all__ = ["ALPHABET", "Base94Encoder"]
@@ -6,7 +7,9 @@ __all__ = ["ALPHABET", "Base94Encoder"]
 ALPHABET = "".join([chr(i) for i in range(33, 127)])
 
 
-class Base94Encoder(Encoder):
+class Base94Encoder:
+    is_binary: ClassVar = False
+
     @staticmethod
     def encode(data: bytes) -> bytes:
         return encode_str(bytes_to_base(data, ALPHABET))

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/encoders/encoder.py

@@ -4,6 +4,8 @@ __all__ = ["Encoder"]
 
 
 class Encoder(Protocol):
+    is_binary: bool
+
     @staticmethod
     def encode(data: bytes) -> bytes: ...
 

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/encoders/raw_encoder.py

@@ -1,9 +1,11 @@
-from .encoder import Encoder
+from typing import ClassVar
 
 __all__ = ["RawEncoder"]
 
 
-class RawEncoder(Encoder):
+class RawEncoder:
+    is_binary: ClassVar = True
+
     @staticmethod
     def encode(data: bytes) -> bytes:
         return data

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/main.py

@@ -6,6 +6,7 @@ from nacl.public import PrivateKey, PublicKey
 
 from rtty_soda.archivers import ARCHIVERS, UNARCHIVERS
 from rtty_soda.cli_io import (
+    format_output,
     print_stats,
     read_bytes,
     read_key_bytes,
@@ -42,29 +43,33 @@ def cli() -> None:
 @click.option("--encoding", "-e", default="base64", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
 @click.option("--group-len", default=0, show_default=True)
-@click.option("--line-len", default=0, show_default=True)
+@click.option("--line-len", default=80, show_default=True)
 @click.option("--padding", default=0, show_default=True)
+@click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def genkey_cmd(
-    encoding: str, output_file: Path | None, group_len: int, line_len: int, padding: int
+    encoding: str,
+    output_file: Path | None,
+    group_len: int,
+    line_len: int,
+    padding: int,
+    verbose: bool,
 ) -> None:
     """Generate Private Key.
 
     Encoding: base26 | base31 | base36 | base64 | base94 | binary
     """
     enc = ENCODERS[encoding]
-    is_bin = encoding == "binary"
 
     key = bytes(PrivateKey.generate())
     key = enc.encode(key)
 
-    write_output(
-        target=output_file,
-        data=key,
-        is_binary=is_bin,
-        group_len=group_len,
-        line_len=line_len,
-        padding=padding,
+    key, groups = format_output(
+        data=key, encoder=enc, group_len=group_len, line_len=line_len, padding=padding
     )
+    write_output(target=output_file, data=key)
+
+    if verbose:
+        click.echo(f"Groups: {groups}", err=True)
 
 
 @cli.command()  # pyright: ignore[reportAny]
@@ -72,8 +77,9 @@ def genkey_cmd(
 @click.option("--encoding", "-e", default="base64", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
 @click.option("--group-len", default=0, show_default=True)
-@click.option("--line-len", default=0, show_default=True)
+@click.option("--line-len", default=80, show_default=True)
 @click.option("--padding", default=0, show_default=True)
+@click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def pubkey_cmd(
     private_key_file: Path,
     encoding: str,
@@ -81,27 +87,26 @@ def pubkey_cmd(
     group_len: int,
     line_len: int,
     padding: int,
+    verbose: bool,
 ) -> None:
     """Get Public Key.
 
     Encoding: base26 | base31 | base36 | base64 | base94 | binary
     """
     enc = ENCODERS[encoding]
-    is_bin = encoding == "binary"
 
-    priv = read_key_bytes(source=private_key_file, is_binary=is_bin, encoder=enc)
+    priv = read_key_bytes(source=private_key_file, encoder=enc)
     priv = PrivateKey(private_key=priv)
     pub = bytes(priv.public_key)
     pub = enc.encode(pub)
 
-    write_output(
-        target=output_file,
-        data=pub,
-        is_binary=is_bin,
-        group_len=group_len,
-        line_len=line_len,
-        padding=padding,
+    pub, groups = format_output(
+        data=pub, encoder=enc, group_len=group_len, line_len=line_len, padding=padding
     )
+    write_output(target=output_file, data=pub)
+
+    if verbose:
+        click.echo(f"Groups: {groups}", err=True)
 
 
 @cli.command()  # pyright: ignore[reportAny]
@@ -110,8 +115,9 @@ def pubkey_cmd(
 @click.option("--profile", "-p", default="sensitive", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
 @click.option("--group-len", default=0, show_default=True)
-@click.option("--line-len", default=0, show_default=True)
+@click.option("--line-len", default=80, show_default=True)
 @click.option("--padding", default=0, show_default=True)
+@click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def kdf_cmd(
     password_file: Path,
     encoding: str,
@@ -120,6 +126,7 @@ def kdf_cmd(
     group_len: int,
     line_len: int,
     padding: int,
+    verbose: bool,
 ) -> None:
     """Key Derivation Function.
 
@@ -129,20 +136,18 @@ def kdf_cmd(
     """
     enc = ENCODERS[encoding]
     prof = KDF_PROFILES[profile]
-    is_bin = encoding == "binary"
 
     pw = read_password_bytes(password_file)
     key = kdf(password=pw, profile=prof)
     key = enc.encode(key)
 
-    write_output(
-        target=output_file,
-        data=key,
-        is_binary=is_bin,
-        group_len=group_len,
-        line_len=line_len,
-        padding=padding,
+    key, groups = format_output(
+        data=key, encoder=enc, group_len=group_len, line_len=line_len, padding=padding
     )
+    write_output(target=output_file, data=key)
+
+    if verbose:
+        click.echo(f"Groups: {groups}", err=True)
 
 
 @cli.command(aliases=["e"])  # pyright: ignore[reportAny]
@@ -154,7 +159,7 @@ def kdf_cmd(
 @click.option("--compression", "-c", default="zstd", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
 @click.option("--group-len", default=0, show_default=True)
-@click.option("--line-len", default=0, show_default=True)
+@click.option("--line-len", default=80, show_default=True)
 @click.option("--padding", default=0, show_default=True)
 @click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def encrypt_public_cmd(
@@ -179,30 +184,28 @@ def encrypt_public_cmd(
     key_enc = ENCODERS[key_encoding]
     data_enc = ENCODERS[data_encoding]
     archiver = ARCHIVERS[compression]
-    is_bin_key = key_encoding == "binary"
-    is_bin_data = data_encoding == "binary"
 
-    priv = read_key_bytes(
-        source=private_key_file, is_binary=is_bin_key, encoder=key_enc
-    )
+    priv = read_key_bytes(source=private_key_file, encoder=key_enc)
     priv = PrivateKey(private_key=priv)
-    pub = read_key_bytes(source=public_key_file, is_binary=is_bin_key, encoder=key_enc)
+    pub = read_key_bytes(source=public_key_file, encoder=key_enc)
     pub = PublicKey(public_key=pub)
     data = stats = message_file.read_bytes()
     data = archiver(data)
     data = public.encrypt(private=priv, public=pub, data=data)
     data = data_enc.encode(data)
 
-    write_output(
-        target=output_file,
+    data, groups = format_output(
         data=data,
-        is_binary=is_bin_data,
+        encoder=data_enc,
         group_len=group_len,
         line_len=line_len,
         padding=padding,
     )
+    write_output(target=output_file, data=data)
+
     if verbose:
         print_stats(plaintext=stats, ciphertext=data)
+        click.echo(f"Groups: {groups}", err=True)
 
 
 @cli.command(aliases=["es"])  # pyright: ignore[reportAny]
@@ -213,7 +216,7 @@ def encrypt_public_cmd(
 @click.option("--compression", "-c", default="zstd", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
 @click.option("--group-len", default=0, show_default=True)
-@click.option("--line-len", default=0, show_default=True)
+@click.option("--line-len", default=80, show_default=True)
 @click.option("--padding", default=0, show_default=True)
 @click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def encrypt_secret_cmd(
@@ -237,25 +240,25 @@ def encrypt_secret_cmd(
     key_enc = ENCODERS[key_encoding]
     data_enc = ENCODERS[data_encoding]
     archiver = ARCHIVERS[compression]
-    is_bin_key = key_encoding == "binary"
-    is_bin_data = data_encoding == "binary"
 
-    key = read_key_bytes(source=key_file, is_binary=is_bin_key, encoder=key_enc)
+    key = read_key_bytes(source=key_file, encoder=key_enc)
     data = stats = message_file.read_bytes()
     data = archiver(data)
     data = secret.encrypt(key=key, data=data)
     data = data_enc.encode(data)
 
-    write_output(
-        target=output_file,
+    data, groups = format_output(
         data=data,
-        is_binary=is_bin_data,
+        encoder=data_enc,
         group_len=group_len,
         line_len=line_len,
         padding=padding,
     )
+    write_output(target=output_file, data=data)
+
     if verbose:
         print_stats(plaintext=stats, ciphertext=data)
+        click.echo(f"Groups: {groups}", err=True)
 
 
 @cli.command(aliases=["ep"])  # pyright: ignore[reportAny]
@@ -266,7 +269,7 @@ def encrypt_secret_cmd(
 @click.option("--compression", "-c", default="zstd", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
 @click.option("--group-len", default=0, show_default=True)
-@click.option("--line-len", default=0, show_default=True)
+@click.option("--line-len", default=80, show_default=True)
 @click.option("--padding", default=0, show_default=True)
 @click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def encrypt_password_cmd(
@@ -292,7 +295,6 @@ def encrypt_password_cmd(
     prof = KDF_PROFILES[kdf_profile]
     data_enc = ENCODERS[data_encoding]
     archiver = ARCHIVERS[compression]
-    is_bin_data = data_encoding == "binary"
 
     pw = read_password_bytes(password_file)
     key = kdf(password=pw, profile=prof)
@@ -301,16 +303,18 @@ def encrypt_password_cmd(
     data = secret.encrypt(key=key, data=data)
     data = data_enc.encode(data)
 
-    write_output(
-        target=output_file,
+    data, groups = format_output(
         data=data,
-        is_binary=is_bin_data,
+        encoder=data_enc,
         group_len=group_len,
         line_len=line_len,
         padding=padding,
     )
+    write_output(target=output_file, data=data)
+
     if verbose:
         print_stats(plaintext=stats, ciphertext=data)
+        click.echo(f"Groups: {groups}", err=True)
 
 
 @cli.command(aliases=["d"])  # pyright: ignore[reportAny]
@@ -321,7 +325,6 @@ def encrypt_password_cmd(
 @click.option("--data-encoding", "-e", default="base64", show_default=True)
 @click.option("--compression", "-c", default="zstd", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
-@click.option("--padding", default=0, show_default=True)
 @click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def decrypt_public_cmd(
     private_key_file: Path,
@@ -331,7 +334,6 @@ def decrypt_public_cmd(
     data_encoding: str,
     compression: str,
     output_file: Path | None,
-    padding: int,
     verbose: bool,
 ) -> None:
     """Decrypt Message (Public).
@@ -343,28 +345,18 @@ def decrypt_public_cmd(
     key_enc = ENCODERS[key_encoding]
     data_enc = ENCODERS[data_encoding]
     unarchiver = UNARCHIVERS[compression]
-    is_bin_key = key_encoding == "binary"
-    is_bin_data = data_encoding == "binary"
 
-    priv = read_key_bytes(
-        source=private_key_file, is_binary=is_bin_key, encoder=key_enc
-    )
+    priv = read_key_bytes(source=private_key_file, encoder=key_enc)
     priv = PrivateKey(private_key=priv)
-    pub = read_key_bytes(source=public_key_file, is_binary=is_bin_key, encoder=key_enc)
+    pub = read_key_bytes(source=public_key_file, encoder=key_enc)
     pub = PublicKey(public_key=pub)
-    data = stats = read_bytes(source=message_file, is_binary=is_bin_data)
+    data = stats = read_bytes(source=message_file, encoder=data_enc)
     data = data_enc.decode(data)
     data = public.decrypt(private=priv, public=pub, data=data)
     data = unarchiver(data)
 
-    write_output(
-        target=output_file,
-        data=data,
-        is_binary=True,
-        group_len=0,
-        line_len=0,
-        padding=padding,
-    )
+    write_output(target=output_file, data=data)
+
     if verbose:
         print_stats(plaintext=data, ciphertext=stats)
 
@@ -376,7 +368,6 @@ def decrypt_public_cmd(
 @click.option("--data-encoding", "-e", default="base64", show_default=True)
 @click.option("--compression", "-c", default="zstd", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
-@click.option("--padding", default=0, show_default=True)
 @click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def decrypt_secret_cmd(
     key_file: Path,
@@ -385,7 +376,6 @@ def decrypt_secret_cmd(
     data_encoding: str,
     compression: str,
     output_file: Path | None,
-    padding: int,
     verbose: bool,
 ) -> None:
     """Decrypt Message (Secret).
@@ -397,23 +387,15 @@ def decrypt_secret_cmd(
     key_enc = ENCODERS[key_encoding]
     data_enc = ENCODERS[data_encoding]
     unarchiver = UNARCHIVERS[compression]
-    is_bin_key = key_encoding == "binary"
-    is_bin_data = data_encoding == "binary"
 
-    key = read_key_bytes(source=key_file, is_binary=is_bin_key, encoder=key_enc)
-    data = stats = read_bytes(source=message_file, is_binary=is_bin_data)
+    key = read_key_bytes(source=key_file, encoder=key_enc)
+    data = stats = read_bytes(source=message_file, encoder=data_enc)
     data = data_enc.decode(data)
     data = secret.decrypt(key=key, data=data)
     data = unarchiver(data)
 
-    write_output(
-        target=output_file,
-        data=data,
-        is_binary=True,
-        group_len=0,
-        line_len=0,
-        padding=padding,
-    )
+    write_output(target=output_file, data=data)
+
     if verbose:
         print_stats(plaintext=data, ciphertext=stats)
 
@@ -425,7 +407,6 @@ def decrypt_secret_cmd(
 @click.option("--data-encoding", "-e", default="base64", show_default=True)
 @click.option("--compression", "-c", default="zstd", show_default=True)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
-@click.option("--padding", default=0, show_default=True)
 @click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def decrypt_password_cmd(
     password_file: Path,
@@ -434,7 +415,6 @@ def decrypt_password_cmd(
     data_encoding: str,
     compression: str,
     output_file: Path | None,
-    padding: int,
     verbose: bool,
 ) -> None:
     """Decrypt Message (Password).
@@ -448,23 +428,16 @@ def decrypt_password_cmd(
     prof = KDF_PROFILES[kdf_profile]
     data_enc = ENCODERS[data_encoding]
     unarchiver = UNARCHIVERS[compression]
-    is_bin_data = data_encoding == "binary"
 
     pw = read_password_bytes(password_file)
     key = kdf(password=pw, profile=prof)
-    data = stats = read_bytes(source=message_file, is_binary=is_bin_data)
+    data = stats = read_bytes(source=message_file, encoder=data_enc)
     data = data_enc.decode(data)
     data = secret.decrypt(key=key, data=data)
     data = unarchiver(data)
 
-    write_output(
-        target=output_file,
-        data=data,
-        is_binary=True,
-        group_len=0,
-        line_len=0,
-        padding=padding,
-    )
+    write_output(target=output_file, data=data)
+
     if verbose:
         print_stats(plaintext=data, ciphertext=stats)
 
@@ -475,8 +448,9 @@ def decrypt_password_cmd(
 @click.argument("file", type=in_path)
 @click.option("--output-file", "-o", type=out_path, help="Write output to file.")
 @click.option("--group-len", default=0, show_default=True)
-@click.option("--line-len", default=0, show_default=True)
+@click.option("--line-len", default=80, show_default=True)
 @click.option("--padding", default=0, show_default=True)
+@click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 def encode_cmd(
     in_encoding: str,
     out_encoding: str,
@@ -485,6 +459,7 @@ def encode_cmd(
     group_len: int,
     line_len: int,
     padding: int,
+    verbose: bool,
 ) -> None:
     """Encode File.
 
@@ -492,21 +467,22 @@ def encode_cmd(
     """
     in_enc = ENCODERS[in_encoding]
     out_enc = ENCODERS[out_encoding]
-    in_bin = in_encoding == "binary"
-    out_bin = out_encoding == "binary"
 
-    data = read_bytes(source=file, is_binary=in_bin)
+    data = read_bytes(source=file, encoder=in_enc)
     data = in_enc.decode(data)
     data = out_enc.encode(data)
 
-    write_output(
-        target=output_file,
+    data, groups = format_output(
         data=data,
-        is_binary=out_bin,
+        encoder=out_enc,
         group_len=group_len,
         line_len=line_len,
         padding=padding,
     )
+    write_output(target=output_file, data=data)
+
+    if verbose:
+        click.echo(f"Groups: {groups}", err=True)
 
 
 if __name__ == "__main__":

{rtty_soda-0.2.0 → rtty_soda-0.2.2}/src/rtty_soda/main.pyi

@@ -2,7 +2,12 @@ from pathlib import Path
 
 def cli() -> None: ...
 def genkey_cmd(
-    encoding: str, output_file: Path | None, group_len: int, line_len: int, padding: int
+    encoding: str,
+    output_file: Path | None,
+    group_len: int,
+    line_len: int,
+    padding: int,
+    verbose: bool,
 ) -> None: ...
 def pubkey_cmd(
     private_key_file: Path,
@@ -11,6 +16,7 @@ def pubkey_cmd(
     group_len: int,
     line_len: int,
     padding: int,
+    verbose: bool,
 ) -> None: ...
 def kdf_cmd(
     password_file: Path,
@@ -20,6 +26,7 @@ def kdf_cmd(
     group_len: int,
     line_len: int,
     padding: int,
+    verbose: bool,
 ) -> None: ...
 def encrypt_public_cmd(
     private_key_file: Path,
@@ -66,7 +73,6 @@ def decrypt_public_cmd(
     data_encoding: str,
     compression: str,
     output_file: Path | None,
-    padding: int,
     verbose: bool,
 ) -> None: ...
 def decrypt_secret_cmd(
@@ -76,7 +82,6 @@ def decrypt_secret_cmd(
     data_encoding: str,
     compression: str,
     output_file: Path | None,
-    padding: int,
     verbose: bool,
 ) -> None: ...
 def decrypt_password_cmd(
@@ -86,7 +91,6 @@ def decrypt_password_cmd(
     data_encoding: str,
     compression: str,
     output_file: Path | None,
-    padding: int,
     verbose: bool,
 ) -> None: ...
 def encode_cmd(
@@ -97,4 +101,5 @@ def encode_cmd(
     group_len: int,
     line_len: int,
     padding: int,
+    verbose: bool,
 ) -> None: ...