Main commit

Added build function to build files in case create fails

Added copy_files.py, incharge of copying the files from assets to their respective places

Author: Dtar380

src/assets/docker/Dockerfile

@@ -8,7 +8,7 @@ ENV MAX_HEAP_SIZE=""
 
 WORKDIR $SERVER_DIR
 
-COPY scripts/run.sh /usr/local/bin/run.sh
+COPY run.sh /usr/local/bin/run.sh
 RUN chmod +x /usr/local/bin/run.sh
 
 ENTRYPOINT ["/usr/local/bin/run.sh"]

src/cli/builder.py

@@ -9,7 +9,8 @@
 from click import Command, Option
 from yaspin import yaspin  # type: ignore
 
-from ..core.manage_json import read_json, write_json  # type: ignore
+from ..core.copy_files import *
+from ..core.manage_json import read_json, write_json
 from ..core.manage_templates import template_to_file
 from ..utils.cli import clear, confirm
 from .custom_group import CustomGroup
@@ -22,16 +23,18 @@ def __init__(self) -> None:
         super().__init__()
 
     def create(self) -> Command:
-        help = ""
+        help = (
+            "Create all files for the containerization of the server/network."
+        )
         options = [Option(["--network"], is_flag=True, default=False)]
 
         def callback(network: bool = False) -> None:
+            clear(0)
+
             services: set[dict[str, Any]] = set([])
             networks: set[str] = set([])
             envs: set[dict[str, Any]] = set([])
 
-            clear(0)
-
             if not network:
                 menu = Menus()
                 service, env = self.__get_data(menu)
@@ -53,13 +56,14 @@ def callback(network: bool = False) -> None:
                     services.add(service)
                     envs.add(env)
 
-                    clear(1)
+                    clear(0.5)
 
                     if not confirm(
                         msg=f"Want to continue adding services? (Count: {len(services)})",
                     ):
                         break
 
+            clear(0)
             self.__save_files(
                 data={
                     "compose": {
@@ -69,6 +73,8 @@ def callback(network: bool = False) -> None:
                     "envs": envs,
                 }
             )
+            clear(0)
+            print("Files saved!")
 
         return Command(
             name=inspect.currentframe().f_code.co_name,  # type: ignore
@@ -78,11 +84,71 @@ def callback(network: bool = False) -> None:
         )
 
     def update(self) -> Command:
-        help = ""
-        options = [Option()]
+        help = "Update the contents of the containers."
+        options = [
+            Option(["--service"], default=None),
+            Option(["--add"], is_flag=True, default=False),
+            Option(["--remove"], is_flag=True, default=False),
+        ]
+
+        def callback(
+            service: str | None = None, add: bool = False, remove: bool = False
+        ) -> None:
+            clear(0)
+
+            path: Path = Path()
+
+            if not path.exists():
+                print("Missing JSON file for services. Use 'create' first.")
+                return
+
+            data: dict[str, Any] = read_json(Path()) or {}
+            compose: dict[str, Any] = data.get("compose", {}) or {}
+
+            services: set[dict[str, Any]] = set(compose.get("services", []))
+            networks: set[str] = set(compose.get("networks", []))
+            envs: set[dict[str, Any]] = set(data.get("envs", []))
+
+            if networks:
+                pass
+            if envs:
+                pass
+
+            if not services:
+                print("No services found. Use 'create' first.")
+                return
+
+        return Command(
+            name=inspect.currentframe().f_code.co_name,  # type: ignore
+            help=help,
+            callback=callback,
+            params=options,  # type: ignore
+        )
 
-        def callback() -> None:
-            pass
+    def build(self) -> Command:
+        help = "Build the files for the containerization in case create failed."
+        options: list[Option] = []
+
+        def callback(
+            service: str | None = None, add: bool = False, remove: bool = False
+        ) -> None:
+            clear(0)
+
+            path: Path = Path()
+
+            if not path.exists():
+                print("Missing JSON file for services. Use 'create' first.")
+                return
+
+            data: dict[str, Any] = read_json(Path()) or {}
+
+            if not data:
+                print("JSON file is empty. Use 'create' first.")
+
+            clear(0)
+            self.__save_files(data, build=True)
+            clear(0)
+            print("Files saved!")
 
         return Command(
             name=inspect.currentframe().f_code.co_name,  # type: ignore
@@ -94,7 +160,7 @@ def callback() -> None:
     def __get_data(
         self, menu: Menus, get_service: bool = True, get_env: bool = True
     ) -> tuple[dict[str, Any], dict[str, Any]]:
-        clear(1)
+        clear(0.5)
 
         name = self.__get_name(message="Enter the name of the service: ")
 
@@ -110,6 +176,7 @@ def __get_data(
 
     def __get_name(self, message: str) -> str:
         while True:
+            clear(0.5)
             name: str = inquirer.text(  # type: ignore
                 message=message, validate=EmptyInputValidator()
             ).execute()
@@ -119,8 +186,10 @@ def __get_name(self, message: str) -> str:
 
         return name
 
-    def __save_files(self, data: dict[str, Any]) -> None:
-        write_json(Path(), data)
+    @yaspin(text="Creating files...", color="cyan")
+    def __save_files(self, data: dict[str, Any], build: bool = False) -> None:
+        if not build:
+            write_json(Path(), data)
 
         composer: dict[str, Any] = data.get("composer") or {}
         template_to_file(Path(), composer, Path())

src/cli/manager.py

@@ -6,7 +6,7 @@
 from InquirerPy.validator import EmptyInputValidator  # type: ignore
 from click import Command, Option
 
-from ..utils.cli import clear  # type: ignore
+from ..utils.cli import clear, confirm  # type: ignore
 from .custom_group import CustomGroup
 
 
@@ -15,9 +15,9 @@ class Manager(CustomGroup):
     def __init__(self) -> None:
         super().__init__()
 
-    def bakcup(self) -> Command:
+    def backup(self) -> Command:
 
-        help = ""
+        help = "Create a backup of the files inside the containers to their respective build directories."
         options = [Option()]
 
         def callback() -> None:
@@ -32,7 +32,7 @@ def callback() -> None:
 
     def delete(self) -> Command:
 
-        help = ""
+        help = "Delete entirely the files related with the containerization of the server/network."
         options = [Option()]
 
         def callback() -> None:
@@ -47,7 +47,7 @@ def callback() -> None:
 
     def start(self) -> Command:
 
-        help = ""
+        help = "Start the services."
         options = [Option()]
 
         def callback() -> None:
@@ -62,7 +62,7 @@ def callback() -> None:
 
     def stop(self) -> Command:
 
-        help = ""
+        help = "Stop the services."
         options = [Option()]
 
         def callback() -> None:

src/cli/menu.py

@@ -65,7 +65,7 @@ def service(self, name: str) -> dict[str, Any]:
 
     def __get_ports(self) -> None:
         while True:
-            clear(1)
+            clear(0.5)
 
             port_name = inquirer.text(  # type: ignore
                 message="Add a name for the port: ",
@@ -92,7 +92,7 @@ def __expose(self) -> set[str]:
         expose: set[str] = set()
 
         for name, port in self.ports.items():
-            clear(1)
+            clear(0.5)
 
             if confirm(msg=f"Want to expose {name} assigned to {port}? "):
                 expose.add(f"${{{name}}}")
@@ -101,6 +101,8 @@ def __expose(self) -> set[str]:
 
     def __resources(self) -> None:
         while True:
+            clear(0.5)
+
             cpus_limit: float = inquirer.number(  # type: ignore
                 message="Select a limit of CPUs for this service: ",
                 min_allowed=0,
@@ -162,6 +164,8 @@ def env(self, name: str) -> dict[str, Any]:
 
     def __get_jar(self) -> str:
         while True:
+            clear(0.5)
+
             jar: str = inquirer.text(  # type: ignore
                 message="Enter your .jar file name: ",
                 validate=EmptyInputValidator(),
@@ -173,6 +177,8 @@ def __get_jar(self) -> str:
         return jar
 
     def __use_args(self) -> str:
+        clear(0.5)
+
         if confirm(msg="Want to use recommended args for the server? "):
             with open("", "r+") as f:
                 data = " ".join(f.readlines())
@@ -181,6 +187,8 @@ def __use_args(self) -> str:
 
     def __get_heaps(self) -> list[str]:
         while True:
+            clear(0.5)
+
             min_heap_size: int = int(
                 inquirer.number(  # type: ignore
                     message="Select the minimum heap size: ",

src/core/copy_files.py

@@ -0,0 +1,3 @@
+from __future__ import annotations
+
+from pathlib import Path  # type: ignore