1.2.0 - Added a basic API, minor refactoring

API frontend is available on PlugM

Author: CodyMarkix

make

@@ -80,6 +80,10 @@ build () {
             ../../src/pyziniter/__init__.py
             ../../src/pyziniter/pyzinit.py
             ../../src/pyziniter/verJSONcreate.py
+            ../../src/api/__init__.py
+            ../../src/api/connection.py
+            ../../src/api/pyzprompt.py
+            ../../src/api/pyzshell.py
         )
 
         pyinstaller --onefile "${pythonfiles[@]}"
@@ -215,6 +219,7 @@ installdeps () {
         sudo apt install python3-pip pandoc || sudo pacman -S python-pip pandoc || sudo dnf install python3-pip pandoc
         pip install termcolor
         pip install pyinstaller
+        pip install pynput
 
     elif [[ "$1" == "dev" ]]; then
         sudo apt install python3-pip pandoc || sudo pacman -S python-pip pandoc || sudo dnf install python3-pip pandoc
@@ -223,6 +228,7 @@ installdeps () {
     elif [[ "$1" == "runtime" ]]; then
         sudo apt install python3-pip || sudo pacman -S python-pip || sudo dnf install python3-pip
         pip install termcolor
+        pip install pynput
     fi
 }
 

make.ps1

@@ -44,7 +44,7 @@ function build () {
     mkdir -p bin\Windows
     Set-Location bin\Windows
 
-    pyinstaller --onefile ..\..\src\main.py ..\..\src\shell\shell.py ..\..\src\shell\rccreator.py ..\..\src\pluginmgr\manager.py ..\..\src\shell\pluginimport.py ..\..\src\pluginmgr\installer.py ..\..\src\pluginmgr\mgrinit.py ..\..\src\pluginmgr\remover.py ..\..\src\pluginmgr\searcher.py ..\..\src\pluginmgr\updater.py ..\..\src\pyziniter\__init__.py ..\..\src\pyziniter\pyzinit.py ..\..\src\pyziniter\verJSONcreate.py
+    pyinstaller --onefile ..\..\src\main.py ..\..\src\shell\shell.py ..\..\src\shell\rccreator.py ..\..\src\pluginmgr\manager.py ..\..\src\shell\pluginimport.py ..\..\src\pluginmgr\installer.py ..\..\src\pluginmgr\mgrinit.py ..\..\src\pluginmgr\remover.py ..\..\src\pluginmgr\searcher.py ..\..\src\pluginmgr\updater.py ..\..\src\pyziniter\__init__.py ..\..\src\pyziniter\pyzinit.py ..\..\src\pyziniter\verJSONcreate.py ..\..\src\api\__init__.py ..\..\src\api\pyzprompt.py ..\..\src\api\pyzshell.py
     Set-Location -Path dist
     Rename-Item -Path main.exe pyz.exe
     Move-Item -Path .\pyz.exe -Destination ..\pyz.exe
@@ -94,6 +94,7 @@ function installdeps () {
     } elseif ($args[0] -eq "runtime") {
         installPython
         pip install termcolor
+        pip install pynput
     }
 }
 

pyz-workspace.code-workspace

@@ -1,22 +1,26 @@
 {
 	"folders": [
+		/*
+		You might want to edit these paths, depending on what you have and what you don't
+		For some dumb-ass reason, VS Code workspaces only support paths relative to the workspace file. (Either that, or I can't set it up properly)
+		*/
 		{
 			"path": ".",
-			"name": "PyZ Shell"
+			"name": "PyZ Shell" // The actuall program
 		},
 		{
 			"path": "../pyz-plugm-repo",
-			"name": "Main repo"
+			"name": "Main repo" // The plugin repository
 		},
 		{
 			"path": "../pyz-repo-template",
-			"name": "Repo Template"
+			"name": "Repo Template" // Repo template
+		},
+		{
+			"path": "../pyz-extensions",
+			"name": "Plugins (dev)" // Not available anywhere, it's just a folder where I have plugins that are W.I.P
 		},
 		{
-			/*
-			You might want to edit paths for Plugins (*nix) and Plugins (Windows), depending on where you placed the workspace file.
-			For some dumb-ass reason, VS Code workspaces only support paths relative to the workspace file. (Either that, or I can't set it up properly)
-			*/
 			"path": "../../../.local/share/pyz/plugins",
 			"name": "Plugins (*nix)"
 		},

rmpycache.sh

@@ -7,6 +7,7 @@ if [[ "$(pwd)" == *"pyz-shell"* ]]; then
         src/shell/__pycache__
         src/updatemgr/__pycache__
         src/pyziniter/__pycache__
+        src/api/__pycache__
     )
     rm -r ${pycachedirs[*]}
 else

src/api/__init__.py

@@ -0,0 +1,3 @@
+import api.connection as connection
+import api.pyzprompt as pyzprompt
+import api.pyzshell as pyzshell

src/api/connection.py

@@ -0,0 +1,51 @@
+import socket
+import threading
+import api
+import shell.shell as shell
+
+HEADER = 64
+PORT = 23465
+SERVER = socket.gethostbyname(socket.gethostname())
+ADDR = (SERVER, PORT)
+FORMAT = 'utf-8'
+DISCONNECT_MSG = "!DISCONNECT"
+
+
+connected = None
+
+def handle_client(conn, addr):
+
+    connected = True
+    while connected:
+        msg_length = conn.recv(HEADER).decode(FORMAT)
+        if msg_length:
+            msg_length = int(msg_length)
+            
+            msg = conn.recv(msg_length).decode(FORMAT)
+            if msg == DISCONNECT_MSG:
+                connected = False # could also be "break", both are possible
+            
+            if msg.__contains__("pyzchprompt"):
+                msgarr = msg.split()
+                msgarr.pop(0)
+                api.pyzprompt.chPrompt(" ".join(msgarr))
+
+            if msg.__contains__("gtprompt"):
+                api.pyzprompt.getPrompt()
+
+            if msg.__contains__("setalias"):
+                api.pyzshell.setAlias(msg.split(" ")[1], msg.split(" ")[2])
+
+
+
+def stop():
+    connected = False
+
+def start():
+    server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    server.bind(ADDR)
+    server.listen()
+    while True:
+        conn, addr = server.accept()
+        handlethread = threading.Thread(target=handle_client, args=(conn, addr))
+        handlethread.start()

src/api/pyzprompt.py

@@ -0,0 +1,8 @@
+import shell.shell as shell
+
+def chPrompt(newprompt):
+    shell.prompt = newprompt
+    return None
+
+def getPrompt():
+    return shell.prompt

src/api/pyzshell.py

@@ -0,0 +1,8 @@
+def setAlias(alias, cmd):
+    try:
+        if alias == None or cmd == None or alias == None and cmd == None:
+            raise ValueError
+        else:
+            alias = cmd
+    except ValueError:
+        print("Setting alias failed! No alias/cmd found")

src/main.py

@@ -3,18 +3,21 @@
 # Importing modules
 import os
 import sys
-import platform
-from pyziniter import pyzinit # Basically only for returning the host's arch
+import platform # Basically only for returning the host's arch
+import threading
 
 # Importing other files
 import shell
 import pluginmgr
 import updatemgr
 import pyziniter
+import api
 
 homedir = os.path.expanduser('~')
 pyver = sys.version.split(" ")
 
+apithread = threading.Thread(target=api.connection.start, daemon=True)
+
 # Putting "everything" together and running.
 def main():
     sys.argv.extend(" ")
@@ -51,6 +54,7 @@ def main():
             sys.exit(0)
 
     elif sys.argv[1] == " ":
+        apithread.start()
         if os.path.isdir(pyziniter.PYZFOLDER):
             updatemgr.checker.checkForUpdates()
         else:
@@ -72,4 +76,5 @@ def main():
 
     return 0
 
-main()
+pyzthread = threading.Thread(target=main)
+pyzthread.start()

src/pluginmgr/installer.py

@@ -19,8 +19,7 @@ def getRepo():
 def install(package):
     try:
         if package != " ":                      
-            validrepobrokey = getRepo() # Contains a 0A byte (\n) at the end, that's doo doo
-            validrepo = validrepobrokey[:-1] # and we need to remove it
+            validrepo = getRepo()
 
             with open(manager.PLUGINFOLDER+"/MANIFEST/mainrepo.json") as manifestfile:
                 parsedmanifest = json.load(manifestfile)
@@ -50,7 +49,7 @@ def install(package):
 
                 os.remove(os.path.join(manager.PLUGINFOLDER, validzip))
             else:
-                print("Error! Repository returned code "+ str(zipurl.status_code) +".") # Else, throw a hissy fit about the repository not returning 200
+                print(f"Error! Repository returned code {str(zipurl.status_code)}.") # Else, throw a hissy fit about the repository not returning 200
                 sys.exit(0)
 
         else: