Fixed expansion factor for base encodings

dhondta · dhondta · commit 7dc86b2e3dbc · 2022-01-12T14:14:45.000+01:00
diff --git a/codext/base/ascii85.py b/codext/base/ascii85.py
@@ -24,5 +24,5 @@ def ascii85_encode(input, errors='strict'):
     def ascii85_decode(input, errors='strict'):
         return base64.a85decode(b(input)), len(input)
 
-    add("ascii85", ascii85_encode, ascii85_decode, r"^ascii[-_]?85$", entropy=6.36)
+    add("ascii85", ascii85_encode, ascii85_decode, r"^ascii[-_]?85$", entropy=6.36, expansion_factor=1.25)
 
diff --git a/codext/base/base100.py b/codext/base/base100.py
@@ -51,6 +51,6 @@ def base100_decode(input, errors="strict"):
         return bytes(r), len(input)
     
     
-add("base100", base100_encode, base100_decode, r"^(?:base[-_]?100|emoji)$")
+add("base100", base100_encode, base100_decode, r"^(?:base[-_]?100|emoji)$", expansion_factor=1.)
 main = main(100, "<https://github.com/AdamNiederer/base100>")
 
diff --git a/codext/base/base122.py b/codext/base/base122.py
@@ -101,6 +101,6 @@ def _get_7bits(currB, bob, B, decoded):
         return "".join(map(chr, r)), len(input)
 
 
-add("base122", base122_encode, base122_decode, r"^base[-_]?122$")
+add("base122", base122_encode, base122_decode, r"^base[-_]?122$", expansion_factor=1.085)
 main = main(122, "<http://blog.kevinalbs.com/base122>")
 
diff --git a/codext/base/base45.py b/codext/base/base45.py
@@ -83,6 +83,6 @@ def decode(text, errors="strict"):
     return decode
 
 
-add("base45", base45_encode, base45_decode, r"^base[-_]?45(|[-_]inv(?:erted)?)$")
+add("base45", base45_encode, base45_decode, r"^base[-_]?45(|[-_]inv(?:erted)?)$", expansion_factor=1.5)
 main = main(45, "<https://datatracker.ietf.org/doc/html/draft-faltstrom-base45-04.txt>")
 
diff --git a/codext/base/base85.py b/codext/base/base85.py
@@ -45,6 +45,6 @@ def base85_decode(input, errors='strict'):
         return base64.b85decode(b(input)), len(input)
 
 
-add("base85", base85_encode, base85_decode, r"^base[-_]?85$", entropy=7.05)
+add("base85", base85_encode, base85_decode, r"^base[-_]?85$", entropy=7.05, expansion_factor=1.25)
 main = main(85, "RFC 1924")
 
diff --git a/codext/base/base91.py b/codext/base/base91.py
@@ -114,6 +114,6 @@ def decode(text, errors="strict"):
 
 
 add("base91", base91_encode, base91_decode, r"^base[-_]?91((?:|[-_]alt(?:ernate)?)(?:|[-_]inv(?:erted)?)?)$",
-    entropy=6.5)
+    entropy=6.5, expansion_factor=1.231)
 main = main(91, "<http://base91.sourceforge.net/>")
 
diff --git a/codext/base/baseN.py b/codext/base/baseN.py
@@ -13,17 +13,17 @@
 
 
 B2 = {r'': "01", r'[-_]inv(erted)?': "10"}
-base2n(B2, r"^(?:base[-_]?2|bin)(|[-_]inv(?:erted)?|[-_](?!.*(.).*\2)[a-zA-Z0-9]{2})$")
+base2n(B2, r"^(?:base[-_]?2|bin)(|[-_]inv(?:erted)?|[-_](?!.*(.).*\2)[a-zA-Z0-9]{2})$", expansion_factor=8.)
 main2 = main(2)
 
 
 B3 = {r'': "123", r'[-_]inv(erted)?': "321"}
-base(B3, r"^base[-_]?3(|[-_]inv(?:erted)?|[-_](?!.*(.).*\2)[a-zA-Z0-9]{3})$")
+base(B3, r"^base[-_]?3(|[-_]inv(?:erted)?|[-_](?!.*(.).*\2)[a-zA-Z0-9]{3})$", expansion_factor=5.)
 main3 = main(3)
 
 
 B4 = {r'': "1234", r'[-_]inv(erted)?': "4321"}
-base2n(B4, r"^base[-_]?4(|[-_]inv(?:erted)?|[-_](?!.*(.).*\2)[a-zA-Z0-9]{4})$")
+base2n(B4, r"^base[-_]?4(|[-_]inv(?:erted)?|[-_](?!.*(.).*\2)[a-zA-Z0-9]{4})$", expansion_factor=4.)
 main4 = main(4)
 
 
@@ -33,12 +33,12 @@
 
 
 B16 = {'': digits + "ABCDEF", 'inv': "ABCDEF" + digits}
-base2n(B16, r"^(?:base[-_]?16|hex)(|[-_]inv(?:erted)?)$")
+base2n(B16, r"^(?:base[-_]?16|hex)(|[-_]inv(?:erted)?)$", expansion_factor=2.)
 main16 = main(16, "RFC 4648")
 
 
 B26 = {'': upper, 'inv': lower}
-base(B26, r"^(?:base[-_]?26|hex)(|[-_]inv(?:erted)?)$")
+base(B26, r"^base[-_]?26(|[-_]inv(?:erted)?)$")
 main26 = main(26)
 
 
