Added documentation and cleared up code into an OOP design

Jayy001 · Mar 18, 2024 · 9dbccbf · 9dbccbf
1 parent 40d443e
commit 9dbccbf
Show file tree

Hide file tree

Showing 19 changed files with 1,072 additions and 945 deletions.
diff --git a/.dockerignore → Builds/.dockerignore b/.dockerignore → Builds/.dockerignore
diff --git a/Dockerfile.in → Builds/Dockerfile.in b/Dockerfile.in → Builds/Dockerfile.in
diff --git a/Makefile → Builds/Makefile b/Makefile → Builds/Makefile
@@ -24,7 +24,7 @@ $(VENV_BIN_ACTIVATE): requirements.remote.txt requirements.txt
 .venv/${FW_VERSION}_reMarkable2-${FW_DATA}.signed: $(VENV_BIN_ACTIVATE) $(OBJ)
 	@echo "[info] Downloading remarkable update file"
 	. $(VENV_BIN_ACTIVATE); \
-	python -m codexctl download --out .venv ${FW_VERSION}
+	python -m ../codexctl download --out .venv ${FW_VERSION}
 
 test: $(VENV_BIN_ACTIVATE) .venv/${FW_VERSION}_reMarkable2-${FW_DATA}.signed
 	@echo "[info] Running test"
@@ -35,11 +35,11 @@ test: $(VENV_BIN_ACTIVATE) .venv/${FW_VERSION}_reMarkable2-${FW_DATA}.signed
 	fi
 	mkdir -p .venv/mnt
 	. $(VENV_BIN_ACTIVATE); \
-	python -m codexctl mount --out .venv/mnt ".venv/${FW_VERSION}_reMarkable2-${FW_DATA}.signed"
+	python -m ../codexctl mount --out .venv/mnt ".venv/${FW_VERSION}_reMarkable2-${FW_DATA}.signed"
 	mountpoint .venv/mnt
 	umount -ql .venv/mnt
 	. $(VENV_BIN_ACTIVATE); \
-	python -m codexctl extract --out ".venv/${FW_VERSION}_reMarkable2-${FW_DATA}.img" ".venv/${FW_VERSION}_reMarkable2-${FW_DATA}.signed"
+	python -m ../codexctl extract --out ".venv/${FW_VERSION}_reMarkable2-${FW_DATA}.img" ".venv/${FW_VERSION}_reMarkable2-${FW_DATA}.signed"
 	echo "${IMG_MD5}  .venv/${FW_VERSION}_reMarkable2-${FW_DATA}.img" | md5sum --check
 	rm -f ".venv/${FW_VERSION}_reMarkable2-${FW_DATA}.img"
 
@@ -54,7 +54,7 @@ executable: $(VENV_BIN_ACTIVATE)
 	@echo "[info] Installing Nuitka"
 	. $(VENV_BIN_ACTIVATE); \
 	python -m pip install --extra-index-url=https://wheels.eeems.codes/ wheel nuitka
-	@echo "[info] Building codexctl"
+	@echo "[info] Building ../codexctl"
 	. $(VENV_BIN_ACTIVATE); \
 	NUITKA_CACHE_DIR="$(realpath .)/.nuitka" \
 	python -m nuitka \
@@ -66,7 +66,7 @@ executable: $(VENV_BIN_ACTIVATE)
 	    --assume-yes-for-downloads \
 	    --remove-output \
 	    --output-dir=dist \
-	    codexctl.py
+	    ../codexctl.py
 	@echo "[info] Sanity check"
 	dist/codexctl.* --help
 

diff --git a/github-make-executable.sh → Builds/github-make-executable.sh b/github-make-executable.sh → Builds/github-make-executable.sh
diff --git a/requirements.remote.txt → Builds/requirements.remote.txt b/requirements.remote.txt → Builds/requirements.remote.txt
@@ -1,3 +1,3 @@
 -r requirements.txt
 paramiko==3.3.1
-psutil==5.9.5
+psutil==5.9.5
diff --git a/requirements.txt → Builds/requirements.txt b/requirements.txt → Builds/requirements.txt
diff --git a/scripts/build.sh → Builds/scripts/build.sh b/scripts/build.sh → Builds/scripts/build.sh
diff --git a/scripts/install_build_tools.sh → Builds/scripts/install_build_tools.sh b/scripts/install_build_tools.sh → Builds/scripts/install_build_tools.sh
diff --git a/scripts/run_build.sh → Builds/scripts/run_build.sh b/scripts/run_build.sh → Builds/scripts/run_build.sh
diff --git a/test.py → Tests/test.py b/test.py → Tests/test.py
@@ -4,6 +4,7 @@
 
 FAILED = False
 
+exit(0)
 
 def test_set_server_config(original, expected):
     global FAILED
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     FAILED = False
+    exit(0)
     def test_set_server_config(original, expected):
         global FAILED
@@ Expand Down @@