Upgrade to v0.1.1

Fixing CLI bugs:
- Printing bitmasks
- Parsing bitmasks as name

Author: iFA88

feClient/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 __doc__ = """
 Python client for Fusion Explorer API v{}
 Copyright (C) 2021 Fusion Solutions KFT <contact@fusionsolutions.io>

feClient/__main__.py

@@ -21,9 +21,9 @@
 
 Use optional environment keys {PUB_ENV_NAME} for public key and {SEC_ENV_NAME} for secret. If you use you need set both.
   For set:
-	export {PUB_ENV_NAME}="YOUR_PUBLIC_KEY" {SEC_ENV_NAME}="YOUR_SECRET_KEY"
+    export {PUB_ENV_NAME}="YOUR_PUBLIC_KEY" {SEC_ENV_NAME}="YOUR_SECRET_KEY"
   For unset:
-	unset {PUB_ENV_NAME} {SEC_ENV_NAME}
+    unset {PUB_ENV_NAME} {SEC_ENV_NAME}
 
 All numbers will be converted into decimal string, but you can use {CONVERTHEX_ENV_NAME} enviroment if you want in hexadecimal:
   export {CONVERTHEX_ENV_NAME}="1"
@@ -60,7 +60,7 @@ class LevelBitmask:
 	def parseByName(cls, data:str) -> int:
 		r = 0
 		for name in data.split(","):
-			r |= cls.data[name][0]
+			r |= toInt(cls.data[name][0])
 		return r
 
 class Parameters:
@@ -106,7 +106,7 @@ def parseType(cls, name:str, typ:str) -> Any:
 		return {
 			"str":str,
 			"bytes":cls._bytes,
-			"int":int,
+			"int":toInt,
 			"bool":cls._bool,
 			"dict":cls._dict,
 			"list":cls._dict,
@@ -139,6 +139,15 @@ def printResult(r:Any) -> None:
 	else:
 		print(r)
 
+def toInt(input:Any) -> int:
+	if type(input) is int:
+		return input
+	elif type(input) is str:
+		if input[:2].lower() == "0x":
+			return int(input, 16)
+		return int(input)
+	raise RuntimeError
+
 def main() -> None:
 	inputs:List[str] = []
 	_inputs = sys.argv[:]
@@ -203,6 +212,13 @@ def main() -> None:
 					pass
 		#
 		if method in ["", "help"] and not args and not kwargs:
+			bitmaskLines:List[Tuple[str, str]] = [
+				(
+					"{0:>{stack}}{name}".format("", name=bid, stack=toInt(bdet[1])*2),
+					bdet[2],
+				) for bid, bdet in LevelBitmask.data.items()
+			]
+			optimalBitmaskIDColumnLength = max([ len(x[0]) for x in bitmaskLines]) if bitmaskLines else 0
 			ret = [__doc__.format(
 				version=__version__,
 				PUB_ENV_NAME=PUB_ENV_NAME,
@@ -212,12 +228,7 @@ def main() -> None:
 				CACHEPATH_ENV_NAME=CACHEPATH_ENV_NAME,
 				CONVERTHEX_ENV_NAME=CONVERTHEX_ENV_NAME,
 				selfName=selfName,
-				bitmasks="\n".join(
-					map(
-						lambda x: "{:<32}{}".format("  {0:>{stack}}{name}".format("", name=x[0], stack=x[1][1]*4), x[1][2]),
-						LevelBitmask.data.items(),
-					)
-				),
+				bitmasks="\n".join(["  {0:<{pad}}    {1}".format(*x, pad=optimalBitmaskIDColumnLength) for x in bitmaskLines]),
 			)]
 			for name in sorted(methods.keys()):
 				m = methods[name]

setup.py

@@ -9,7 +9,7 @@
 
 setup(
 	name                          = "python-feclient",
-	version                       = "0.1.0",
+	version                       = "0.1.1",
 	description                   = "Client for Fusion Explorer",
 	keywords                      = "explorer client fusion solutions fusionsolutions fusionexplorer",
 	author                        = "Andor `iFA` Rajci - Fusions Solutions KFT",