refact!: port to Jule v0.1.4

includes some other improvements aswell

Author: koibtw

Makefile

@@ -13,18 +13,18 @@ all: build
 
 build:
 	mkdir -p build
-	$(JULEC) $(JULECFLAGS) .
+	$(JULEC) $(JULECFLAGS) src
 
 run: build
 	./build/$(BINARY)
 
 test:
-	$(JULEC) test .
+	$(JULEC) test src
 
 format:
-	julefmt -w .
+	julefmt -w src
 
 clean:
-	rm -rf bin dist
+	rm -rf build bin dist
 
 .PHONY: all build run test format clean

README.md

@@ -5,10 +5,8 @@ jpu is written in [Jule], a low-level, compiled, memory-safe fast programming la
 The tool's main goal is to provide a **faster** [ProtonUp] implementation. The original project is written in Python, which is quite slow.
 
 Supported Jule versions:
-- `0.1.2` \*
-- `0.1.3@master`
-
-<sub>\* Some commands may not work or give unexpected results.</sub>
+- `0.1.4`
+- `0.1.5@master`
 
 ## Installation
 
@@ -32,8 +30,8 @@ jpu
 ```
 
 Available arguments:
-- `--dir`: Set the target installation directory (default: `~/.steam/root/compatibilitytools.d/`)
-- `--help`: Display CLI information
+- `--dir` (`-d`): Set the target installation directory (default: `~/.steam/root/compatibilitytools.d/`)
+- `--help` (`-h`): Display CLI information
 
 ## Building from source
 To build jpu from source, you need to have the JuleC compiler (and [make]) installed. Please refer to [Jule's Manual][julec_installation].<br>

cliq

@@ -33,7 +33,7 @@ struct Proton {
 
 impl Proton {
 	fn Download(self)! {
-		os::Dir.Create(tempDir) else {}
+		os::Mkdir(tempDir) else {}
 
 		tempProtonFile := tempDir + "/" + self.tagName + ".tar.gz"
 		tempChecksumFile := tempDir + "/" + self.tagName + ".sha512sum"
@@ -49,10 +49,10 @@ impl Proton {
 		}
 
 		println("  Validating checksums...")
-		tempProtonContent := os::File.Read(tempProtonFile) else {
+		tempProtonContent := os::ReadFile(tempProtonFile) else {
 			error("Failed to read `" + tempProtonFile + "`")
 		}
-		tempChecksumContent := os::File.Read(tempChecksumFile) else {
+		tempChecksumContent := os::ReadFile(tempChecksumFile) else {
 			error("Failed to read `" + tempChecksumFile + "`")
 		}
 
@@ -137,7 +137,7 @@ fn GetProton(tagRaw: str, urlRaw: str, mut installDir: str)!: Proton {
 		error("Aborted")
 	}
 
-	os::Dir.Read(protonDir) else {
+	os::ReadDir(protonDir) else {
 		ret Proton{tagName, downloadURLs, protonDir}
 	}
 
@@ -168,17 +168,14 @@ fn getJSONValueN(data: str, key: str, n: int)!: []str {
 }
 
 fn extractTarGz(file: str, dir: str)! {
-	os::Dir.Create(dir) else {
+	os::Mkdir(dir) else {
 		error(error)
 	}
 
 	mut cmd := os::Cmd.New("tar")
 	cmd.Args = ["-xzf", file, "-C", dir]
 
-	cmd.Spawn() else {
-		error(error)
-	}
-	cmd.Wait() else {
+	cmd.Run() else {
 		error(error)
 	}
 }
@@ -187,8 +184,8 @@ fn cleanup(additional: []str) {
 	println("  Cleaning up...")
 
 	for _, f in additional {
-		os::File.Remove(f) else {}
+		os::Remove(f) else {}
 	}
 
-	os::Dir.Remove(tempDir) else {}
+	os::Rmdir(tempDir) else {}
 }

snapbox

@@ -3,9 +3,10 @@
 // Use of this source code is governed by the BSD 3-Clause License.
 // See the LICENSE file for details.
 
-use cq "cliq"
 use cy "colorify"
-use "jpu"
+use "std/flag"
+use "std/os"
+use ss "std/strings"
 use "std/sys"
 
 const protonGeURL = "https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases"
@@ -26,24 +27,31 @@ static errorMessage = cy::Colorify("!", cy::Style{
 })
 
 fn main() {
-	mut cq := cq::Builder{
-		Args: {
-			"dir": defaultInstallDir,
-		},
-	}.Help().Build()
+	mut fs := flag::FlagSet.New()
 
-	cq.GetCLI()
-	cq.Parse()
+	let mut dir: str
+	let mut help: bool
 
-	mut dir := str(cq.Get("dir"))
+	fs.AddVar[str](unsafe { (&str)(&dir) }, "dir", 'd', "Set target installation directory")
+	fs.AddVar[bool](unsafe { (&bool)(&help) }, "help", 'h', "Show this help message")
 
-	println(infoMessage + " No arguments provided. Assuming you want to update.")
+	fs.Parse(os::Args()[1:]) else {
+		handleErr("Failed to parse flags")
+		ret
+	}
+
+	if help {
+		println(autoHelp(fs))
+		ret
+	}
+
+	println(infoMessage + " No arguments provided. Assuming an update.")
 	update(dir)
 }
 
 fn update(mut installDir: str) {
 	println(infoMessage + " Getting the latest Proton-GE release...")
-	proton := jpu::GetProton("", protonGeURL, installDir) else {
+	proton := GetProton("", protonGeURL, installDir) else {
 		handleErr(error)
 		ret
 	}
@@ -62,4 +70,20 @@ fn handleErr(err: any) {
 	print(errorMessage + " ")
 	println(err)
 	sys::Exit(1)
+}
+
+fn autoHelp(mut flags: &flag::FlagSet): (res: str) {
+	mut maxWidth := 0
+	for _, f in flags.Flags() {
+		if len(f.Name()) > maxWidth {
+			maxWidth = len(f.Name())
+		}
+	}
+
+	res = "Usage: jpu [flags]\n\nFlags:\n"
+	for _, f in flags.Flags() {
+		res += "   --" + f.Name() + ss::Repeat(" ", maxWidth-len(f.Name())) + "   " + f.What() + "\n"
+	}
+
+	ret res
 }