Update screenshot

Size the window with respect to the window's frame size

.github/FUNDING.yml

@@ -0,0 +1 @@
+liberapay: barbapapa

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up npm project
         run: npm install
 
-      - name: build project
+      - name: Build project
         run: npm run buildall
 
       - name: Move x64 exe
@@ -42,4 +42,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: SteamDepotDownloaderGUI-${{ github.run_number }}
-          path: SteamDepotDownloaderGUI-${{ github.run_number }}*.*
+          path: SteamDepotDownloaderGUI-${{ github.run_number }}*.*

CODE_OF_CONDUCT.md

@@ -0,0 +1,194 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+
+community a harassment-free experience for everyone, regardless of age, body
+
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+
+identity and expression, level of experience, education, socio-economic status,
+
+nationality, personal appearance, race, religion, or sexual identity
+
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+
+community include:
+
+* Demonstrating empathy and kindness toward other people
+
+* Being respectful of differing opinions, viewpoints, and experiences
+
+* Giving and gracefully accepting constructive feedback
+
+* Accepting responsibility and apologizing to those affected by our mistakes,
+
+  and learning from the experience
+
+* Focusing on what is best not just for us as individuals, but for the
+
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+
+  advances of any kind
+
+* Trolling, insulting or derogatory comments, and personal or political attacks
+
+* Public or private harassment
+
+* Publishing others' private information, such as a physical or email
+
+  address, without their explicit permission
+
+* Other conduct which could reasonably be considered inappropriate in a
+
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+
+acceptable behavior and will take appropriate and fair corrective action in
+
+response to any behavior that they deem inappropriate, threatening, offensive,
+
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+
+comments, commits, code, wiki edits, issues, and other contributions that are
+
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+
+an individual is officially representing the community in public spaces.
+
+Examples of representing our community include using an official e-mail address,
+
+posting via an official social media account, or acting as an appointed
+
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+
+reported to the community leaders responsible for enforcement at
+
+.
+
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+
+clarity around the nature of the violation and an explanation of why the
+
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+
+interaction with the people involved, including unsolicited interaction with
+
+those enforcing the Code of Conduct, for a specified period of time. This
+
+includes avoiding interactions in community spaces as well as external channels
+
+like social media. Violating these terms may lead to a temporary or
+
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+
+communication with the community for a specified period of time. No public or
+
+private interaction with the people involved, including unsolicited interaction
+
+with those enforcing the Code of Conduct, is allowed during this period.
+
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+
+standards, including sustained inappropriate behavior,  harassment of an
+
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+
+version 2.1, available at
+
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+
+[Mozilla's code of conduct enforcement ladder][mozilla coc].
+
+For answers to common questions about this code of conduct, see the FAQ at
+
+[https://www.contributor-covenant.org/faq][faq]. Translations are available at
+
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+
+[mozilla coc]: https://github.com/mozilla/diversity
+
+[faq]: https://www.contributor-covenant.org/faq
+
+[translations]: https://www.contributor-covenant.org/translations
+

README.md

@@ -19,6 +19,11 @@
 Download the latest release for your operating system
 from [GitHub](https://github.com/mmvanheusden/SteamDepotDownloaderGUI/releases/latest).
 
+## Support
+If you need help, please open an issue.
+
+**⚠️ No support will be provided for binaries downloaded from unofficial mirrors like softpedia. ⚠️**
+
 ## Usage
 
 Enter everything you normally would in the DepotDownloader console.

downloader.js

@@ -1,5 +1,5 @@
 const {
-	checkDotnet,
+	preDownloadCheck,
 	download,
 	createCommand,
 	runCommand,
@@ -9,28 +9,35 @@ const {
 } = require("./utils")
 
 function submitForm() {
-	checkDotnet().then(async function (result) {
-		if (!result) {
-			console.error("dotnet not found in PATH")
+	// Check if the form is filled in and if dotnet is installed
+	preDownloadCheck().then(async function () {
+		document.getElementById("dotnetwarning").hidden = true
+		document.getElementById("emptywarning").hidden = true
+		console.info("dotnet found in PATH")
+
+		// Remove the old depotdownloader directory
+		await removeDir("depotdownloader")
+
+		// Download the DepotDownloader binary, so it doesn't have to be included in the source code
+		await download("https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.4.7/depotdownloader-2.4.7.zip")
+
+		// Unzip the DepotDownloader binary
+		await unzip("depotdownloader-2.4.7.zip", "depotdownloader")
+
+		// Clean up the old files
+		await removeFile("depotdownloader-2.4.7.zip")
+
+		// Run the final command
+		await runCommand(createCommand())
+	}).catch(function (error) {
+		if (error === "noDotnet") {
+			console.error("Dotnet not found in PATH")
+			document.getElementById("emptywarning").hidden = true
 			document.getElementById("dotnetwarning").hidden = false
-		} else {
-
-			console.info("dotnet found in PATH")
-
-			// Remove the old depotdownloader directory
-			await removeDir("depotdownloader")
-
-			// Download the DepotDownloader binary, so it doesn't have to be included in the source code
-			await download("https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.4.7/depotdownloader-2.4.7.zip")
-
-			// Unzip the DepotDownloader binary
-			await unzip("depotdownloader-2.4.7.zip", "depotdownloader")
-
-			// Clean up the old files
-			await removeFile("depotdownloader-2.4.7.zip")
-
-			// Run the final command
-			await runCommand(createCommand().toString())
+		} else if (error === "emptyField") {
+			console.error("Fill in all required fields")
+			document.getElementById("dotnetwarning").hidden = true
+			document.getElementById("emptywarning").hidden = false
 		}
 	})
 }
@@ -66,8 +73,11 @@ function openSteamDB() {
 	void electron.shell.openExternal("https://steamdb.info/instantsearch/")
 }
 
+/* Everything below this line runs when the page is loaded */
+
+// Add event listeners to the buttons
 window.addEventListener("DOMContentLoaded", () => {
-	document.getElementById("alertbtn").addEventListener("click", submitDotnet)
+	document.getElementById("dotnetalertbtn").addEventListener("click", submitDotnet)
 	document.getElementById("downloadbtn").addEventListener("click", submitForm)
 	document.getElementById("smbtn1").addEventListener("click", openGitHubIssues)
 	document.getElementById("smbtn2").addEventListener("click", openSteamDB)

index.html

@@ -4,20 +4,20 @@
 <head>
 	<meta charset="UTF-8">
 	<meta content="width=device-width, initial-scale=1" name="viewport"/>
-	<link href="https://unpkg.com/@primer/css@20.4.5/dist/primer.css" rel="stylesheet"/>
+	<link href="https://unpkg.com/@primer/css@20.4.7/dist/primer.css" rel="stylesheet"/>
 	<title>SteamDepotDownloaderGUI</title>
 </head>
 <body>
 <script src="downloader.js"></script>
 <div class="mx-auto">
 	<div hidden id="dotnetwarning">
-		<div class="flash flash-error mx-2 mt-2 color-shadow-medium" id="alert">
+		<div class="flash flash-error mx-2 mt-2 color-shadow-medium" id="dotnetalert">
 			<svg class="octicon" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
 				<path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm6.5-.25A.75.75 0 017.25 7h1a.75.75 0 01.75.75v2.75h.25a.75.75 0 010 1.5h-2a.75.75 0 010-1.5h.25v-2h-.25a.75.75 0 01-.75-.75zM8 6a1 1 0 100-2 1 1 0 000 2z"
 					  fill-rule="evenodd"></path>
 			</svg>
 			<code><span class="text-italic">dotnet</span></code> was not found.
-			<button class="btn btn-sm flash-action" id="alertbtn">
+			<button class="btn btn-sm flash-action" id="dotnetalertbtn">
 				<svg class="octicon" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
 					<path d="M7.47 10.78a.75.75 0 001.06 0l3.75-3.75a.75.75 0 00-1.06-1.06L8.75 8.44V1.75a.75.75 0 00-1.5
          0v6.69L4.78 5.97a.75.75 0 00-1.06 1.06l3.75 3.75zM3.75 13a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5z"
@@ -27,6 +27,15 @@
 			</button>
 		</div>
 	</div>
+
+	<div hidden id="emptywarning">
+		<div class="flash flash-warn mx-2 mt-2 color-shadow-medium" id="emptyalert">
+			<svg class="octicon" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
+				<path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm6.5-.25A.75.75 0 017.25 7h1a.75.75 0 01.75.75v2.75h.25a.75.75 0 010 1.5h-2a.75.75 0 010-1.5h.25v-2h-.25a.75.75 0 01-.75-.75zM8 6a1 1 0 100-2 1 1 0 000 2z"
+					  fill-rule="evenodd"></path>
+			</svg>Please fill in all required fields.
+		</div>
+	</div>
 	<div class="f0-light text-center">Steam Depot Downloader</div>
 
 	<form id="theform">
@@ -34,48 +43,38 @@
 			<div class="form-group-header">
 				<label for="username">Username</label>
 			</div>
-			<div aria-label="Enter your username here." class="form-group-body tooltipped tooltipped-n">
-				<input class="form-control input-block" id="username" type="text"/>
-			</div>
+			<input class="form-control input-block" id="username" type="text" placeholder="Leave empty for anonymous login"/>
 		</div>
 
 		<div class="form-group mx-3 mt-1">
 			<div class="form-group-header">
 				<label for="password">Password</label>
 			</div>
-			<div aria-label="Enter your password here." class="form-group-body tooltipped tooltipped-n">
-				<input class="form-control input-block" id="password" type="password"/>
-			</div>
+			<input class="form-control input-block" id="password" type="password" placeholder="Leave empty for anonymous login"/>
 		</div>
 
-		<div class="form-group mx-3 mt-1">
+		<div class="form-group mx-3 mt-1 required">
 			<div class="form-group-header">
 				<label for="appid">App ID</label>
 			</div>
-			<div aria-label="Enter the App ID here." class="form-group-body tooltipped tooltipped-n">
-				<input class="form-control input-block" id="appid" type="number"/>
-			</div>
+			<input class="form-control input-block" id="appid" type="number"/>
 		</div>
 
-		<div class="form-group mx-3 mt-1">
+		<div class="form-group mx-3 mt-1 required">
 			<div class="form-group-header">
 				<label for="depotid">Depot ID</label>
 			</div>
-			<div aria-label="Enter the Depot ID here." class="form-group-body tooltipped tooltipped-n">
-				<input class="form-control input-block" id="depotid" type="number"/>
-			</div>
+			<input class="form-control input-block" id="depotid" type="number"/>
 		</div>
 
-		<div class="form-group mx-3 mt-1">
+		<div class="form-group mx-3 mt-1 required">
 			<div class="form-group-header">
 				<label for="manifestid">Manifest ID</label>
 			</div>
-			<div aria-label="Enter the Manifest ID here." class="form-group-body tooltipped tooltipped-n">
-				<input class="form-control input-block" id="manifestid" type="number"/>
-			</div>
+			<input class="form-control input-block" id="manifestid" type="number"/>
 		</div>
 
-		<div class="form-group mx-3 mt-1">
+		<div class="form-group mx-3 mt-1 required">
 			<div class="form-group-header ">
 				<label for="osdropdown">Operating system</label>
 			</div>
@@ -97,7 +96,7 @@
 		</div>
 	</form>
 
-	<div aria-label="Start the download process." class="form-group mt-3 ml-3 mr-3 tooltipped tooltipped-n">
+	<div class="form-group mt-3 ml-3 mr-3">
 		<button class="btn btn-block btn-primary" id="downloadbtn">
 			<svg class="octicon" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
 				<path d="M7.47 10.78a.75.75 0 001.06 0l3.75-3.75a.75.75 0 00-1.06-1.06L8.75 8.44V1.75a.75.75 0 00-1.5 0v6.69L4.78 5.97a.75.75 0 00-1.06 1.06l3.75 3.75zM3.75 13a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5z"

main.js

@@ -7,6 +7,7 @@ const createWindow = () => {
 		resizable: false,
 		width: 430,
 		height: 590,
+		useContentSize: true,
 		maximizable: false,
 		webPreferences: {
 			nodeIntegration: true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamdepotdownloadergui",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "description": "DepotDownloader Electron frontend",
   "main": "main.js",
   "scripts": {
@@ -30,9 +30,9 @@
   },
   "homepage": "https://github.com/mmvanheusden/SteamDepotDownloaderGUI#readme",
   "devDependencies": {
-    "electron": "^20.2.0",
-    "electron-builder": "^23.1.0",
-    "eslint": "^8.18.0"
+    "electron": "^21.2.0",
+    "electron-builder": "^23.6.0",
+    "eslint": "^8.25.0"
   },
   "dependencies": {
     "elecron": "^0.0.1-security",

utils.js

@@ -2,30 +2,46 @@
  * Checks if dotnet is installed in the system path
  * @returns {Promise<unknown>} A promise that resolves to true if dotnet is installed, false otherwise
  */
-function checkDotnet() {
-	return new Promise((resolve) => {
+function preDownloadCheck() {
+	return new Promise((resolve, reject) => {
+		// Check if all fields are filled
+		const formInputs = document.forms["theform"]
+
+		let unfilledFields = 0
+		for (const input of formInputs) {
+			const isInvalid = input.value === "" && input.parentElement.classList.contains("required")
+			input.parentElement.classList.toggle("errored", isInvalid) // toggle the 'errored' class depending on if isInvalid is true or false.
+			if (isInvalid) unfilledFields++
+		}
+		if (unfilledFields > 0) {
+			reject("emptyField")
+			return
+		}
+
+		// Check if dotnet is installed, depending on the platform
 		if (process.platform.toString().includes("win")) {
+			// Windows
 			const {exec} = require("child_process")
 			const command = "dotnet.exe --version"
 			exec(command, function (error) {
 				if (error) {
-					resolve(false)
+					reject("noDotnet")
 				} else {
 					resolve(true)
 				}
 			})
 		} else {
+			// Linux
 			const {exec} = require("child_process")
 			const command = "dotnet --version"
 			exec(command, function (error) {
 				if (error) {
-					resolve(false)
+					reject("noDotnet")
 				} else {
 					resolve(true)
 				}
 			})
 		}
-
 	})
 }
 
@@ -137,23 +153,29 @@ const createCommand = () => {
 	let manifestid = document.forms["theform"]["manifestid"].value
 	let osdropdown = document.getElementById("osdropdown")
 
+	// if either the username or password fields are empty, anonymous login is used
+	let anonymous = username === "" || password === ""
+
+	// build the username and password flags into one string, allowing for anonymous login
+	let userpass = anonymous ? "" : `-username ${username} -password ${password}`
+
 	const finalPath = platformpath() + path.sep + "games" + path.sep + appid
 
 	// The final command to run, returned by this function
 	if (osdropdown.options[osdropdown.selectedIndex].text.includes("Gnome")) {
-		return `gnome-terminal -e 'bash -c "dotnet ./depotdownloader/DepotDownloader.dll -username ${username} -password ${password} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16";bash'`
+		return `gnome-terminal -e 'bash -c "dotnet ./depotdownloader/DepotDownloader.dll ${userpass} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16";bash'`
 	} else if (osdropdown.options[osdropdown.selectedIndex].text.includes("Windows")) {
-		return `start cmd.exe /k dotnet ${platformpath()}${path.sep}depotdownloader${path.sep}DepotDownloader.dll -username ${username} -password ${password} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16`
+		return `start cmd.exe /k dotnet ${platformpath()}${path.sep}depotdownloader${path.sep}DepotDownloader.dll ${userpass} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16`
 	} else if (osdropdown.options[osdropdown.selectedIndex].text.includes("macOS")) {
-		return `osascript -c 'tell application "Terminal" to do script 'dotnet ./depotdownloader/DepotDownloader.dll -username ${username} -password ${password} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16'`
+		return `osascript -c 'tell application "Terminal" to do script 'dotnet ./depotdownloader/DepotDownloader.dll ${userpass} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16'`
 	} else if (osdropdown.options[osdropdown.selectedIndex].text.includes("Konsole")) {
-		return `konsole --hold -e "dotnet ./depotdownloader/DepotDownloader.dll -username ${username} -password ${password} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16"`
+		return `konsole --hold -e "dotnet ./depotdownloader/DepotDownloader.dll ${userpass} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16"`
 	} else if (osdropdown.options[osdropdown.selectedIndex].text.includes("Xfce")) {
-		return `xfce4-terminal -H -e "dotnet ./depotdownloader/DepotDownloader.dll -username ${username} -password ${password} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16"`
+		return `xfce4-terminal -H -e "dotnet ./depotdownloader/DepotDownloader.dll ${userpass} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16"`
 	} else if (osdropdown.options[osdropdown.selectedIndex].text.includes("Terminator")) {
-		return `terminator -e 'bash -c "dotnet ./depotdownloader/DepotDownloader.dll -username ${username} -password ${password} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16";bash'`
+		return `terminator -e 'bash -c "dotnet ./depotdownloader/DepotDownloader.dll ${userpass} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath}/ -max-servers 50 -max-downloads 16";bash'`
 	} else if (osdropdown.options[osdropdown.selectedIndex].text.includes("Print command")) {
-		console.log(`COPY-PASTE THE FOLLOWING INTO YOUR TERMINAL OF CHOICE:\n\ndotnet ${platformpath()}/depotdownloader/DepotDownloader.dll -username ${username} -password ${password} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath} -max-servers 50 -max-downloads 16`)
+		console.log(`COPY-PASTE THE FOLLOWING INTO YOUR TERMINAL OF CHOICE:\n\ndotnet ${platformpath()}/depotdownloader/DepotDownloader.dll ${userpass} -app ${appid} -depot ${depotid} -manifest ${manifestid} -dir ${finalPath} -max-servers 50 -max-downloads 16`)
 		return "echo hello"
 	}
 }
@@ -193,4 +215,4 @@ const platformpath = () => {
 	}
 }
 
-module.exports = {checkDotnet, download, createCommand, runCommand, removeDir, removeFile, unzip, platformpath}
+module.exports = {preDownloadCheck, download, createCommand, runCommand, removeDir, removeFile, unzip, platformpath}