Merge pull request #2 from Tracks12/dev

Tracks12 · web-flow · commit ef905fb9282c · 2025-06-10T14:54:03.000+02:00
Dev
diff --git a/README.md b/README.md
@@ -44,10 +44,43 @@ L'installation de **[Python 3](https://www.python.org/downloads/)** est recomman
 
 ## Utilisations
 
+Exécution du script: `$ python main.py <arg>`
+
+| Arguments                    | Valeur                  | Descriptions                       |
+| ---------------------------- | ----------------------- | ---------------------------------- |
+| `-l`, `--list`               | -                       | Affiche la liste des outils python |
+| `-t <tool>`, `--tool <tool>` | `<tool>` nom de l'outil | Lance un outil                     |
+| `-h`, `--help`               | -                       | Affiche le menu d'aide             |
+| `-D`, `--debug`              | -                       | Exécution en mode debuger          |
+| `-v`, `--version`            | -                       | Affiche la version du programme    |
+
+[Sommaire](#sommaire)
+
 ### Gestion des outils
 
 [Sommaire](#sommaire)
 
 ### Gestion WSL avec WSLBuilder
 
-[Sommaire](#sommaire)
+[Sommaire](#sommaire)
+
+## Options & Configurations
+
+La configuration du programme se fait depuis le fichier **[config.json](config.json)** au format **json**, dans ce fichier vous pouvez l'**encodage des caractères** ainsi que l'affichage du splash screen.
+
+```json
+{
+  "encoding": "utf-8",
+  "splash": true
+}
+```
+
+Vous pouvez le modifier directement (ce qui est peu conseiller) ou bien passer par le programme de configuration avec **tous les choix des paramètres possible à l'option "Paramètres" du menu principal**.
+
+[Sommaire](#sommaire)
+
+## Licence
+
+Code sous license [GPL v3](LICENSE)
+
+[Sommaire](#sommaire)
diff --git a/core/__init__.py b/core/__init__.py
@@ -18,13 +18,13 @@
 UNITS		= tuple[str](("o", "ko", "Mo", "Go", "To"))
 
 def helper(commands: tuple) -> None:
-	colors = tuple[str]((Colors.cyan, Colors.yellow, Colors.red))
-	screen = list[str]([ " List of commands:\n" ])
+	colors	= tuple[str]((Colors.cyan, Colors.yellow, Colors.red))
+	screen	= list[str]([ " List of commands:\n" ])
 
 	for i, command in enumerate(commands):
-		c = int(1 if(i in range((len(commands)-4), (len(commands)-1))) else 0)
-		c = int(2 if(i in range((len(commands)-1), (len(commands)))) else c)
-		sep = str('\n' if(i in (len(commands)-5, len(commands)-2)) else '')
+		c	= int(1 if(i in range((len(commands)-4), (len(commands)-1))) else 0)
+		c	= int(2 if(i in range((len(commands)-1), (len(commands)))) else c)
+		sep	= str('\n' if(i in (len(commands)-5, len(commands)-2)) else '')
 
 		command = str(f" {colors[c]}{command[1]}{Colors.end}{sep}")
 
@@ -45,9 +45,9 @@ def launch(tool: Tool, args: list[str]) -> bool:
 		return(True)
 
 def sortTools(tools: list[Tool]) -> list[Tool]:
-	print(f"\n {' '*1}*  Name{' '*(12-len('Name'))}Path")
+	print(f"\n {' '*1}*  Name{' '*(12-len('Name'))}Command{' '*(16-len('Command'))}Path")
 	for i, tool in enumerate(tools, start=1):
-		print(f" {' '*(2-len(str(i)))}{i}. {tool.name}{' '*(12-len(tool.name))}{tool.path}", end="\n"*(2 if(i == len(tools)) else 1))
+		print(f" {' '*(2-len(str(i)))}{i}. {tool.name}{' '*(12-len(tool.name))}{tool.command[1]}{' '*(16-len(tool.command[1]))}{tool.path}", end="\n"*(2 if(i == len(tools)) else 1))
 
 	return(tools)
 
diff --git a/main.py b/main.py
@@ -22,7 +22,7 @@ def arg() -> bool:
 	args = dict({
 		"prefix": tuple[tuple[tuple[str], str]]((
 			(("-l", "--list"), ""),
-			(("-t", "--tool"), "<toolName>"),
+			(("-t", "--tool"), "<tool>"),
 			(("-h", "--help"), ""),
 			(("-D", "--debug"), ""),
 			(("-v", "--version"), "")
@@ -133,19 +133,13 @@ def config(cfg: Config) -> bool:
 	return(True)
 
 def main(cfg: Config) -> bool:
-	commands = list[tuple]([
+	commands = list[tuple]([ tool.command for tool in TOOLS ] + [
 		(("settings", "set"), "(set)tings"),
 		(("version", "ver"), "(ver)sion"),
 		(("help", "h"), "(h)elp"),
 		(("quit", "q"), "(q)uit")
 	])
 
-	TOOLS.reverse()
-	for tool in TOOLS:
-		commands = [tool.command] + commands[:]
-
-	TOOLS.reverse()
-
 	if(cfg.getSplash()):
 		splash()
 
@@ -168,23 +162,24 @@ def main(cfg: Config) -> bool:
 				except:
 					print(f'{Icons.warn}"{command[0][0]}" not implemented !')
 
-		if(args[0] in commands[-4][0]):
-			config(cfg)
+		if(not f):
+			if(args[0] in commands[-4][0]):
+				config(cfg)
 
-		elif(args[0] in commands[-3][0]):
-			version()
+			elif(args[0] in commands[-3][0]):
+				version()
 
-		elif(args[0] in commands[-2][0]):
-			helper(commands)
+			elif(args[0] in commands[-2][0]):
+				helper(commands)
 
-		elif(args[0] in commands[-1][0]):
-			break
+			elif(args[0] in commands[-1][0]):
+				break
 
-		elif((not args[0]) or f):
-			pass
+			elif((not args[0]) or f):
+				pass
 
-		else:
-			print(f"{Icons.warn}Uknown command !")
+			else:
+				print(f"{Icons.warn}Uknown command !")
 
 	return(True)
 
diff --git a/tools/matrix.py b/tools/matrix.py
@@ -12,16 +12,16 @@
 class Matrix(Tool):
 	command	= (("matrix", "mat"), "(mat)rix")
 	name	= "Matrix"
-	path = __file__
+	path	= __file__
 	version	= "0.1a"
 
-	_args	= [
-		(("-n", "--new", "<x> <y>"), "Create a matrix with custom dimensions"),
-		(("-r", "--random", "<x> <y> <i>"), "Create a matrix with placed random point")
-	] + Tool._args[:]
-
 	def __init__(self, args: list[str]):
-		Tool.__init__(self)
+		super().__init__()
+
+		self._args	= [
+			(("-n", "--new", "<x> <y>"), "Create a matrix with custom dimensions"),
+			(("-r", "--random", "<x> <y> <i>"), "Create a matrix with placed random point")
+		] + self._args[:]
 
 		self._execs = [
 			lambda x:self._new(x),
diff --git a/tools/shell.py b/tools/shell.py
@@ -10,15 +10,15 @@
 class Shell(Tool):
 	command	= (("shell", "sh"), "(sh)ell")
 	name	= "Shell"
-	path = __file__
+	path	= __file__
 	version	= "0.1a"
 
-	_args	= [
-		(("-c", "--command", ""), "Run a bash command")
-	] + Tool._args[:]
-
 	def __init__(self, args: list[str]):
-		Tool.__init__(self)
+		super().__init__()
+
+		self._args = [
+			(("-c", "--command", ""), "Run a bash command")
+		] + self._args[:]
 
 		self._execs = [
 			lambda x:self._exec(x)
diff --git a/tools/wslBuilder.py b/tools/wslBuilder.py
@@ -4,45 +4,37 @@
 from os import listdir, mkdir, remove, rmdir, system as shell
 from os.path import abspath, dirname, getsize
 
+import re
+
 from core import UNITS
 from core.icons import Icons
 from core.tool import Tool
 
+DISTRONAME_REGEX = str("(\\s)|([/:])")
+
 class WslBuilder(Tool):
 	command	= (("wslbuilder", "wb"), "(wb)wslbuilder")
 	name	= "WSLBuilder"
-	path = __file__
-	version	= "0.1a"
-
-	_args	= [
-		(("-c", "--create", "<name>"), "Create a wsl distribution"),
-		(("-d", "--delete", "<name>"), "Remove a wsl distribution image and disk"),
-		(("-D", "--full-delete", "<name>"), "Remove a wsl distribution image and disk with docker traces"),
-		(("-e", "--export", "<name>"), "Remove a wsl distribution into a tar image"),
-		(("-I", "--init", ""), "Init a wsl builder instance with docker"),
-		(("-l", "--list", ""), "List all wsl distributions"),
-		(("-s", "--start", "<name>"), "Launch a wsl instance"),
-	] + Tool._args[:]
-
-	__path = str(abspath(f"{dirname(abspath(__file__))}/../{name}"))
+	path	= __file__
+	version	= "1.0"
 
 	def __init__(self, args: list[str]):
-		Tool.__init__(self)
-
-		try:
-			mkdir(self.__path)
-			print(f"{Icons.info}Create path workspace for {self.name} tool at {self.__path}")
-
-		except FileExistsError:
-			print(f"{Icons.info}Using {self.__path} for {self.name} workspace already exist")
-
-		except PermissionError:
-			print(f"{Icons.warn}Permission denied: Unable to create '{self.__path}'.")
-
-		except Exception as e:
-			print(f"{Icons.warn}An error occurred: {e}")
-
-		self._execs = [
+		super().__init__()
+
+		self.__path = str(abspath(f"{dirname(abspath(__file__))}/../{self.name}"))
+		self.__setup()
+
+		self._args = [
+			(("-c", "--create", "<name>"), "Create a wsl distribution"),
+			(("-d", "--delete", "<name>"), "Remove a wsl distribution image and disk"),
+			(("-D", "--full-delete", "<name>"), "Remove a wsl distribution image and disk with docker traces"),
+			(("-e", "--export", "<name>"), "Export a wsl distribution into a tar image"),
+			(("-I", "--init", ""), "Init a wsl builder instance with docker"),
+			(("-l", "--list", ""), "List all wsl distributions"),
+			(("-s", "--start", "<name>"), "Launch a wsl instance"),
+		] + self._args[:]
+
+		self._execs= [
 			lambda x:self._create(x),
 			lambda x:self._delete(x),
 			lambda x:self._fullDelete(x),
@@ -56,9 +48,23 @@ def __init__(self, args: list[str]):
 
 	def __checkDockerStatus(self) -> bool:
 		return bool(shell(f"wsl service docker status"))
+	
+	def __setup(self) -> None:
+		try:
+			mkdir(self.__path)
+			print(f"{Icons.info}Create path workspace for {self.name} tool at {self.__path}")
+
+		except FileExistsError:
+			print(f"{Icons.info}Using {self.__path} for {self.name} workspace already exist")
+
+		except PermissionError:
+			print(f"{Icons.warn}Permission denied: Unable to create '{self.__path}'.")
+
+		except Exception as e:
+			print(f"{Icons.warn}An error occurred: {e}")
 
 	def _create(self, args: list[str]) -> None:
-		__distroName = args[0].replace(':', '-')
+		__distroName = re.sub(DISTRONAME_REGEX, "-", args[0])
 		__distroPath = abspath(f"{self.__path}/{__distroName}")
 
 		try:
@@ -85,7 +91,7 @@ def _create(self, args: list[str]) -> None:
 
 	def _delete(self, args: list[str]) -> None:
 		__distros = listdir(self.__path)
-		__distroName = args[0].replace(':', '-')
+		__distroName = re.sub(DISTRONAME_REGEX, "-", args[0])
 		__distroPath = abspath(f"{self.__path}/{__distroName}")
 
 		try:
@@ -101,7 +107,7 @@ def _delete(self, args: list[str]) -> None:
 			print(f"{Icons.warn}Wsl distribution doesn't exist on workspace")
 
 	def _fullDelete(self, args: list[str]) -> None:
-		__distroName = args[0].replace(':', '-')
+		__distroName = re.sub(DISTRONAME_REGEX, "-", args[0])
 
 		shell(f"wsl docker rm {__distroName}")
 		shell(f"wsl docker rmi {args[0]}")
@@ -110,7 +116,7 @@ def _fullDelete(self, args: list[str]) -> None:
 
 	def _export(self, args: list[str]) -> None:
 		__distros = listdir(self.__path)
-		__distroName = args[0].replace(':', '-')
+		__distroName = re.sub(DISTRONAME_REGEX, "-", args[0])
 		__distroPath = abspath(f"{self.__path}/{__distroName}")
 
 		if(__distroName in __distros):
@@ -151,7 +157,7 @@ def _list(self) -> None:
 
 	def _start(self, args: list[str]) -> None:
 		__distros = listdir(self.__path)
-		__distroName = args[0].replace(':', '-')
+		__distroName = re.sub(DISTRONAME_REGEX, "-", args[0])
 
 		if(__distroName in __distros):
 			shell(f"wsl -d {__distroName}")
