Fixed templates

Added JSON template for creating CLI inputs easier to manage

Author: Dtar380

.flake8

@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 80
-extend-ignore = E203,E501,E701,E266,F403,F405, B008
+extend-ignore = E203,E501,E701,E266,F403,F405,B008,F401
 exclude =
     .eggs,
     .git,

goals.txt

@@ -24,4 +24,4 @@ A project would look like this:
     \---server1
         +---.env
         +---Dockerfile
-        \---MINECRAFT FILES
+        \---MINECRAFT FILES

pyproject.toml

@@ -172,7 +172,7 @@ disallow_subclassing_any = true
 warn_return_any = true
 warn_unused_configs = true
 warn_redundant_casts = true
-warn_unused_ignores = true
+warn_unused_ignores = false
 warn_no_return = true
 warn_unreachable = true
 

src/assets/templates/.env.j2

@@ -3,15 +3,15 @@ SERVER_JAR={{ env.SERVER_JAR | default('server.jar') }}
 JAVA_ARGS="{{ env.JAVA_ARGS | default('') }}"
 MIN_HEAP_SIZE={{ env.MIN_HEAP_SIZE | default(512) }}
 MAX_HEAP_SIZE={{ env.MAX_HEAP_SIZE | default(2048) }}
-TYPE={{ env.TYPE | default('paper') }}
+TYPE={{ env.TYPE | default('server') }}
 
 {% if env.HOST_PORTS is defined %}
-{% for name, port in env.HOST_PORTS %}
+{% for name, port in env.HOST_PORTS.items() %}
 {{ name }}={{ port }}
 {% endfor %}
 {% endif %}
 
-CPU_LIMIT={{ env.CPU_LIMIT | default('1.0') }}
+CPUS_LIMIT={{ env.CPU_LIMIT | default('1.0') }}
 MEMORY_LIMIT={{ env.MEMORY_LIMIT | default('2g') }}
 CPU_RESERVATION={{ env.CPU_RESERVATION | default('0.5') }}
 MEMORY_RESERVATION={{ env.MEMORY_RESERVATION | default('1g') }}

src/assets/templates/docker-compose.yml.j2

@@ -1,12 +1,12 @@
 services:
-{% for name, svc in services.items() %}
-  {{ name }}:
+{% for svc in services %}
+  {{ svc.name }}:
     build:
       context: {{ svc.build.context }}
       dockerfile: Dockerfile
     env_file:
       - {{ svc.env_file }}
-    container_name: {{name}}
+    container_name: {{ svc.name }}
     environment:
       - CONTAINER_NAME=${CONTAINER_NAME}
       - SERVER_JAR=${SERVER_JAR}

src/assets/templates/template.json

@@ -0,0 +1,53 @@
+{
+  "compose": {
+    "services": [
+      {
+        "name": "server",
+        "build": {
+          "context": "./servers/server/"
+        },
+        "env_file": ".env.server",
+        "volume": "./servers/server:/server",
+        "ports": [
+          "${HOST_PORT}:25565"
+        ],
+        "expose": [
+          25565
+        ],
+        "networks": [
+          "mc-network"
+        ],
+        "resources": {
+          "limits": {
+            "cpus": 1,
+            "memory": 1
+          },
+          "reservations": {
+            "cpus": 1,
+            "memory": 1
+          }
+        }
+      }
+    ],
+    "networks": [
+      "mc-network" 
+    ]
+  },
+  "envs": [
+    {
+      "CONTAINER_NAME": "server",
+      "SERVER_JAR": "",
+      "JAVA_ARGS": "",
+      "MIN_HEAP_SIZE": "",
+      "MAX_HEAP_SIZE": "",
+      "TYPE": "",
+      "HOST_PORTS": {
+        "HOST_PORT": 25565
+      },
+      "CPU_LIMIT": 1,
+      "MEMORY_LIMIT": 1,
+      "CPU_RESERVATION": 1,
+      "MEMORY_RESERVATION": 1
+    }
+  ]
+}

src/cli/builder.py

@@ -2,12 +2,12 @@
 
 import inspect
 
-from InquirerPy import inquirer
-from InquirerPy.validator import EmptyInputValidator
+from InquirerPy import inquirer  # type: ignore
+from InquirerPy.validator import EmptyInputValidator  # type: ignore
 from click import Command, Option
 
+from ..utils.cli import clear  # type: ignore
 from .custom_group import CustomGroup
-from ..utils.cli import clear
 
 
 class Builder(CustomGroup):

src/cli/manager.py

@@ -2,12 +2,12 @@
 
 import inspect
 
-from InquirerPy import inquirer
-from InquirerPy.validator import EmptyInputValidator
+from InquirerPy import inquirer  # type: ignore
+from InquirerPy.validator import EmptyInputValidator  # type: ignore
 from click import Command, Option
 
+from ..utils.cli import clear  # type: ignore
 from .custom_group import CustomGroup
-from ..utils.cli import clear
 
 
 class Manager(CustomGroup):

src/utils/cli.py

@@ -1,4 +1,6 @@
-from os import system, name
+from __future__ import annotations
+
+from os import name, system
 from time import sleep