Last changes in Aloo TUI

Author: BhJaipal

scripts/src/CMakeLists.txt

@@ -9,12 +9,10 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GTK4 REQUIRED gtk4)
-pkg_check_modules(SQLITE REQUIRED sqlite3)
 
 include_directories(
 	"$include_dir"
 	${GTK4_INCLUDE_DIRS}
-	${SQLITE_INCLUDE_DIRS}
 	"/usr/include/tirpc"
 )
 
@@ -23,12 +21,10 @@ add_executable(test.exe "test/main.c")
 target_link_libraries(app.exe
 	"$libaloo"
 	${GTK4_LIBRARIES}
-	${SQLITE_LIBRARIES}
 )
 target_link_libraries(test.exe
 	"$libaloo"
 	${GTK4_LIBRARIES}
-	${SQLITE_LIBRARIES}
 )
 
 set(CMAKE_BUILD_TYPE "$ENV{Release}")

scripts/src/__init__.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import blessed
 import os
 from typing import Union, Optional, Callable
@@ -32,8 +33,7 @@ def takeInput() -> None:
         global isCommandEnabled
         global exitCommand
         global selectedCommand
-        os.system("clear")
-        term.fullscreen()
+        print("\x1b[%sH")
         print(term.royalblue_on_lightblue(lineSpace(1 / 6)))
         print(term.cornflowerblue_on_lightblue((logo[1:-1])))
         print(term.royalblue_on_lightblue(lineSpace(1 / 5, True)))
@@ -121,8 +121,8 @@ def takeInput() -> None:
             + term.royalblue_on_lightblue("└" + infoSpaceEnd + "┘")
             + term.bold_royalblue_on_lightblue(" " * ((term.width - infoLen - 4) // 2))
         )
-        for i in range(6):
-            emptyLine()
+
+        print(term.royalblue_on_lightblue(lineSpace(1 / 4)))
         if isCommandEnabled:
             commandSpace = ""
             for _ in range(int((term.width - exitCommand.__len__() - 11))):
@@ -137,55 +137,46 @@ def takeInput() -> None:
             emptyLine("")
         with term.cbreak(), term.hidden_cursor():
             inp = term.inkey()
-            if inp.name is not None and inp.name == "KEY_TAB":
-                selectedCommand = commands[activeSelection[0]]
-                activeSelection.append(0)
-                match selectedCommand:
-                    case "create-app":
-                        isCommandEnabled = False
-                        createApp()
-                    case "model":
-                        pass
-                    case "build":
-                        buildApp()
-                    case "run":
-                        runAnyOne()
-            else:
-                if inp.name is not None and inp.name == "KEY_ESCAPE":
-                    isCommandEnabled = True
-                elif inp.name is None and isCommandEnabled:
+            if isCommandEnabled:
+                if inp.name is None:
                     exitCommand += inp
-                elif (
-                    inp.name is not None
-                    and isCommandEnabled
-                    and inp.name == "KEY_BACKSPACE"
-                ):
+                elif inp.name == "KEY_BACKSPACE":
                     if exitCommand.__len__() > 0:
                         exitCommand = exitCommand[:-1]
                     else:
                         isCommandEnabled = False
-                if (
-                    inp.name is not None
-                    and inp.name == "KEY_ENTER"
-                    and isCommandEnabled
-                    and exitCommand == ":q"
-                ):
-                    os.system("clear")
+                if inp.name == "KEY_ENTER" and exitCommand == ":q":
+                    os.system("tput rmcup")
                     exit(0)
-                if inp.name is not None and inp.name == "KEY_DOWN":
-                    if activeSelection[0] == commands.__len__() - 1:
-                        activeSelection[0] = 0
-                    else:
-                        activeSelection[0] += 1
-                if inp.name is not None and inp.name == "KEY_UP":
-                    if activeSelection[0] == 0:
-                        activeSelection[0] = commands.__len__() - 1
-                    else:
-                        activeSelection[0] -= 1
+            else:
+                if inp.name is not None:
+                    if inp.name == "KEY_ENTER":
+                        selectedCommand = commands[activeSelection[0]]
+                        activeSelection.append(0)
+                        match selectedCommand:
+                            case "create-app":
+                                isCommandEnabled = False
+                                createApp()
+                            case "build":
+                                buildApp()
+                            case "run":
+                                runAnyOne()
+                    elif inp.name == "KEY_ESCAPE":
+                        isCommandEnabled = True
+                    elif inp.name == "KEY_DOWN":
+                        if activeSelection[0] == commands.__len__() - 1:
+                            activeSelection[0] = 0
+                        else:
+                            activeSelection[0] += 1
+                    elif inp.name == "KEY_UP":
+                        if activeSelection[0] == 0:
+                            activeSelection[0] = commands.__len__() - 1
+                        else:
+                            activeSelection[0] -= 1
                 takeInput()
     except KeyboardInterrupt:
-        print("Process exited")
         os.system("clear")
+        os.system("tput smcup")
         exit(1)
 
 
@@ -205,9 +196,6 @@ def __init__(self):
     self.Desc = ""
 
 
-appOptions = AppOptions()
-
-
 def createApp() -> None:
     try:
         global commandSpace
@@ -217,8 +205,7 @@ def createApp() -> None:
         global isCommandEnabled
         global exitCommand
         global selectedCommand
-        os.system("clear")
-        term.fullscreen()
+        print("\x1b[%sH")
         print(term.royalblue_on_lightblue(lineSpace(1 / 6)))
         print(term.cornflowerblue_on_lightblue((logo[1:-1])))
         print(term.royalblue_on_lightblue(lineSpace(1 / 12, True)))
@@ -579,6 +566,7 @@ def createApp() -> None:
                 elif inp.name is not None:
                     if inp.name == "KEY_ENTER" and exitCommand == ":q":
                         os.system("clear")
+                        print("\x1b[?1049l")
                         exit(0)
                     elif inp.name == "KEY_BACKSPACE":
                         if exitCommand.__len__() > 0:
@@ -712,7 +700,33 @@ def createApp() -> None:
                         ).replace("$libaloo", alooDir + "lib")
                         CMakeFile.write(CMakeSample)
 
+                        colorsCSS = open(
+                            currFilePath + "styles/colors.css",
+                            "r",
+                        ).read()
+                        materialCSS = open(
+                            currFilePath + "styles/material.css",
+                            "r",
+                        ).read()
+
+                        while colorsCSS.index("\t") != -1:
+                            colorsCSS = colorsCSS.replace("\t", "")
+                        while colorsCSS.index("\n") != -1:
+                            colorsCSS = colorsCSS.replace("\n", "")
+
+                        while materialCSS.index("\t") != -1:
+                            materialCSS = materialCSS.replace("\t", "")
+                        while materialCSS.index("\n") != -1:
+                            materialCSS = materialCSS.replace("\n", "")
+                        os.mkdir(appInfo["project-name"] + "styles")
+                        cssBundle = open(
+                            appInfo["project-name"] + "styles/material.bundle.min.css",
+                            "w+",
+                        )
+                        cssBundle.write(materialCSS + colorsCSS)
+
                         print("\t\033[1;32m󰄭 Aloo project created successfully\033[0m")
+                        os.system("tput smcup")
                         exit(0)
                 else:
                     match appOptions.InputNumber:
@@ -726,14 +740,10 @@ def createApp() -> None:
     except KeyboardInterrupt:
         print("Process exited")
         os.system("clear")
+        os.system("tput smcup")
         exit(1)
 
 
-commandRan = False
-
-threadStarted = False
-
-
 def cmake_thread() -> None:
     global threadStarted
     global commandRan
@@ -746,7 +756,6 @@ def cmake_thread() -> None:
     )
     threadStarted = False
     commandRan = True
-    exit(0)
 
 
 def loader(i: int):
@@ -830,8 +839,7 @@ def buildApp() -> None:
         global isCommandEnabled
         global exitCommand
         global selectedCommand
-        os.system("clear")
-        term.fullscreen()
+        print("\x1b[%sH")
         print(term.royalblue_on_lightblue(lineSpace(1 / 6)))
         print(term.cornflowerblue_on_lightblue((logo[1:-1])))
         emptyLine()
@@ -877,6 +885,8 @@ def buildApp() -> None:
                 elif inp.name is not None:
                     if inp.name == "KEY_ENTER" and exitCommand == ":q":
                         os.system("clear")
+                        os.system("tput rmcup")
+                        print("\x1b[?25h\x1b[?7h")
                         exit(0)
                     elif inp.name == "KEY_BACKSPACE":
                         if exitCommand.__len__() > 0:
@@ -892,12 +902,18 @@ def buildApp() -> None:
     except KeyboardInterrupt:
         print("Process exited")
         os.system("clear")
+        os.system("tput rmcup")
+        print("\x1b[?25h\x1b[?7h")
         exit(1)
 
 
-runAppSelection = "App"
-
-appRunStatus = False
+def runAppOrTest(runWhat: str) -> None:
+    subprocess.run(
+        f"./bin/{runWhat}.exe",
+        shell=True,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
 
 
 def runAnyOne() -> None:
@@ -911,8 +927,7 @@ def runAnyOne() -> None:
         global exitCommand
         global appRunStatus
         global selectedCommand
-        os.system("clear")
-        term.fullscreen()
+        print("\x1b[%sH")
         print(term.royalblue_on_lightblue(lineSpace(1 / 6)))
         print(term.cornflowerblue_on_lightblue((logo[1:-1])))
         print(term.royalblue_on_lightblue(lineSpace(1 / 12, True)))
@@ -998,6 +1013,9 @@ def runAnyOne() -> None:
                     " " * ((term.width - len("Running Test")) // 2)
                 ),
             )
+            t1 = threading.Thread(target=runAppOrTest, args=(runAppSelection.lower(),))
+            t1.start()
+            t1.join()
         else:
             emptyLine()
         print(term.royalblue_on_lightblue(lineSpace(1 / 2)))
@@ -1023,6 +1041,7 @@ def runAnyOne() -> None:
                 elif inp.name is not None:
                     if inp.name == "KEY_ENTER" and exitCommand == ":q":
                         os.system("clear")
+                        os.system("tput smcup")
                         exit(0)
                     elif inp.name == "KEY_BACKSPACE":
                         if exitCommand.__len__() > 0:
@@ -1044,20 +1063,27 @@ def runAnyOne() -> None:
     except KeyboardInterrupt:
         print("Process exited")
         os.system("clear")
+        os.system("tput smcup")
         exit(1)
 
 
 if __name__ == "__main__":
     term = blessed.Terminal()
     spaces: str = " "
+    commandRan = False
+    appOptions = AppOptions()
+    threadStarted = False
+    runAppSelection = "App"
+    appRunStatus = False
+
     for i in range(
         int((term.width - len("████████║  ██║      ██║      ██║  ██║      ██║")) / 2)
         - 1
     ):
         spaces += " "
 
     alooTypes = Union["str", "int", "float", "bool", "object"]
-    commands: list[str] = ["create-app", "model", "build", "run", "connect-db"]
+    commands: list[str] = ["create-app", "build", "run"]
     commandsInfo = {
         "create-app": {
             "info": "Create a new C aloo app",
@@ -1081,41 +1107,18 @@ def runAnyOne() -> None:
                 },
             },
         },
-        "model": {
-            "info": "Create a new model",
-            "hasSubCommands": False,
-            "fields": {"name": str, "field": dict[str, alooTypes]},
-        },
         "build": {
             "info": "Build the aloo project",
             "hasSubCommands": False,
         },
         "run": {
-            "info": "Runs the project app/ tests",
+            "info": "Runs the project app/ tests (Recommended to use in Terminal to see output)",
             "hasSubCommands": True,
             "subCommands": {
                 "app": {"fields": "Runs the aloo app"},
                 "test": {"fields": "Runs the aloo project tests"},
             },
         },
-        "connect-db": {
-            "info": "Works with connection with databases",
-            "hasSubCommands": True,
-            "subCommands": {
-                "new": {
-                    "info": "Create a new connection with database",
-                    "field": {"modelName": str},
-                },
-                "restart": {
-                    "info": "Deletes all data from sqlite",
-                    "field": {"modelName": str},
-                },
-                "add": {
-                    "info": "Add database model",
-                    "field": {"modelName": str},
-                },
-            },
-        },
     }
 
     activeSelection = [0]
@@ -1129,11 +1132,10 @@ def runAnyOne() -> None:
 {spaces}██║   ██║  ██████║     █████╝        █████╝    {spaces}
 """
 
-    os.system("clear")
-    term.fullscreen()
-
     exitCommand = ""
     isCommandEnabled = False
     selectedCommand = ""
     commandSpace: str = ""
+    os.system("tput smcup")
     takeInput()
+    os.system("tput rmcup")