fix missing spaces for original charset

Author: UmamiAppearance

cjs/base-ex.cjs

@@ -2055,13 +2055,14 @@ class Base64 extends BaseTemplate {
  * BaseEx UUencode Converter.
  * ------------------------
  * 
- * This is a base64 converter. Various input can be 
- * converted to a base64 string or a base64 string
+ * This is a UUencoder/UUdecoder. Various input can be 
+ * converted to a UUencoded string or a UUencoded string
  * can be decoded into various formats.
  * 
  * Available charsets are:
  *  - default
- *  - urlsafe
+ *  - original
+ *  - xx
  */
 class UUencode extends BaseTemplate {
 
@@ -2126,7 +2127,7 @@ class UUencode extends BaseTemplate {
 
             // repeatedly take 60 chars from the output until it is empty 
             for (;;) {
-                const lArray = outArray.splice(0, 60);
+                const lArray = outArray.splice(0, 60).split(/\r?\n/);
 
                 // if all chars are taken, remove eventually added pad zeros
                 if (!outArray.length) { 
@@ -2170,7 +2171,7 @@ class UUencode extends BaseTemplate {
         const format = ({ input, settings }) => {
 
             const charset = this.charsets[settings.version];
-            const lines = input.trim().split("\n");
+            const lines = input.trim().split(/\r?\n/);
             const inArray = [];
 
             if ((/^begin/i).test(lines.at(0))) {
@@ -2187,10 +2188,17 @@ class UUencode extends BaseTemplate {
 
                 inArray.push(...lArray);
 
-                if (byteCount !== 45) {
+                if (byteCount !== 45) { 
                     padChars = this.converter.padChars(lArray.length) - byteCount;
                     break;
                 }
+
+                // fix missing spaces for original charset
+                else if (lArray.length !== 60 && settings.version === "original") {
+                    while (inArray.length % 60) {
+                        inArray.push(" ");
+                    }
+                }
             }
 
             return inArray.join("");
@@ -3896,6 +3904,7 @@ class BaseEx {
         this.base64 = new Base64("default", outputType);
         this.base64_urlsafe = new Base64("urlsafe", outputType);
         this.uuencode = new UUencode("default", outputType);
+        this.uuencode_original = new UUencode("original", outputType);
         this.xxencode = new UUencode("xx", outputType);
         this.base85_adobe = new Base85("adobe", outputType);
         this.base85_ascii = new Base85("ascii85", outputType);

cjs/base-ex.cjs.map

@@ -12,13 +12,14 @@ import { BaseConverter, BaseTemplate } from "../core.js";
  * BaseEx UUencode Converter.
  * ------------------------
  * 
- * This is a base64 converter. Various input can be 
- * converted to a base64 string or a base64 string
+ * This is a UUencoder/UUdecoder. Various input can be 
+ * converted to a UUencoded string or a UUencoded string
  * can be decoded into various formats.
  * 
  * Available charsets are:
  *  - default
- *  - urlsafe
+ *  - original
+ *  - xx
  */
 export default class UUencode extends BaseTemplate {
 
@@ -83,7 +84,7 @@ export default class UUencode extends BaseTemplate {
 
             // repeatedly take 60 chars from the output until it is empty 
             for (;;) {
-                const lArray = outArray.splice(0, 60)
+                const lArray = outArray.splice(0, 60).split(/\r?\n/)
 
                 // if all chars are taken, remove eventually added pad zeros
                 if (!outArray.length) { 
@@ -127,7 +128,7 @@ export default class UUencode extends BaseTemplate {
         const format = ({ input, settings }) => {
 
             const charset = this.charsets[settings.version];
-            const lines = input.trim().split("\n");
+            const lines = input.trim().split(/\r?\n/);
             const inArray = [];
 
             if ((/^begin/i).test(lines.at(0))) {
@@ -144,10 +145,17 @@ export default class UUencode extends BaseTemplate {
 
                 inArray.push(...lArray);
 
-                if (byteCount !== 45) {
+                if (byteCount !== 45) { 
                     padChars = this.converter.padChars(lArray.length) - byteCount;
                     break;
                 }
+
+                // fix missing spaces for original charset
+                else if (lArray.length !== 60 && settings.version === "original") {
+                    while (inArray.length % 60) {
+                        inArray.push(" ");
+                    }
+                }
             }
 
             return inArray.join("");