From a29592ef36a91931eadf505c88c66b3dea246a2c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 2 Feb 2022 13:24:31 +0100
Subject: [PATCH] Logs now show names of added packages

---
 src/main.v      |  4 ++--
 src/package.v   |  9 ++++++---
 src/repo/repo.v | 13 +++++++++++--
 src/routes.v    | 20 +++++++-------------
 src/web/web.v   | 12 ++++++------
 5 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/main.v b/src/main.v
index 59f6941..cddd9ae 100644
--- a/src/main.v
+++ b/src/main.v
@@ -88,8 +88,8 @@ fn main() {
 
 	// This also creates the directories if needed
 	repo := repo.new(repo_dir, pkg_dir) or {
-        logger.error(err.msg)
-        exit(1)
+		logger.error(err.msg)
+		exit(1)
 	}
 
 	os.mkdir_all(dl_dir) or { exit_with_message(1, 'Failed to create download directory.') }
diff --git a/src/package.v b/src/package.v
index 03103c9..34350ec 100644
--- a/src/package.v
+++ b/src/package.v
@@ -178,10 +178,13 @@ fn format_entry(key string, value string) string {
 	return '\n%$key%\n$value\n'
 }
 
+pub fn (pkg &Pkg) full_name() string {
+	p := pkg.info
+	return '$p.name-$p.version-$p.arch'
+}
+
 // filename returns the correct filename of the package file
 pub fn (pkg &Pkg) filename() string {
-	p := pkg.info
-
 	ext := match pkg.compression {
 		0 { '.tar' }
 		1 { '.tar.gz' }
@@ -189,7 +192,7 @@ pub fn (pkg &Pkg) filename() string {
 		else { panic("Another compression code shouldn't be possible. Faulty code: $pkg.compression") }
 	}
 
-	return '$p.name-$p.version-${p.arch}.pkg$ext'
+	return '${pkg.full_name()}.pkg$ext'
 }
 
 // to_desc returns a desc file valid string representation
diff --git a/src/repo/repo.v b/src/repo/repo.v
index 1fdcc60..554b744 100644
--- a/src/repo/repo.v
+++ b/src/repo/repo.v
@@ -20,6 +20,12 @@ pub:
 	pkg_dir string [required]
 }
 
+pub struct RepoAddResult {
+pub:
+	added bool         [required]
+	pkg   &package.Pkg [required]
+}
+
 // new creates a new Repo & creates the directories as needed
 pub fn new(repo_dir string, pkg_dir string) ?Repo {
 	if !os.is_dir(repo_dir) {
@@ -38,7 +44,7 @@ pub fn new(repo_dir string, pkg_dir string) ?Repo {
 
 // add_from_path adds a package from an arbitrary path & moves it into the pkgs
 // directory if necessary.
-pub fn (r &Repo) add_from_path(pkg_path string) ?bool {
+pub fn (r &Repo) add_from_path(pkg_path string) ?RepoAddResult {
 	pkg := package.read_pkg(pkg_path) or { return error('Failed to read package file: $err.msg') }
 
 	added := r.add(pkg) ?
@@ -53,7 +59,10 @@ pub fn (r &Repo) add_from_path(pkg_path string) ?bool {
 		}
 	}
 
-	return added
+	return RepoAddResult{
+		added: added
+		pkg: &pkg
+	}
 }
 
 // add adds a given Pkg to the repository
diff --git a/src/routes.v b/src/routes.v
index 45e7fa5..13cc8c7 100644
--- a/src/routes.v
+++ b/src/routes.v
@@ -62,7 +62,7 @@ fn (mut app App) put_package() web.Result {
 			pkg_path = os.join_path_single(app.dl_dir, rand.uuid_v4())
 		}
 
-		app.ldebug("Uploading $length (${pretty_bytes(length.int())}) bytes to '$pkg_path'.")
+		app.ldebug("Uploading $length bytes (${pretty_bytes(length.int())}) to '$pkg_path'.")
 
 		// This is used to time how long it takes to upload a file
 		mut sw := time.new_stopwatch(time.StopWatchOptions{ auto_start: true })
@@ -80,28 +80,22 @@ fn (mut app App) put_package() web.Result {
 		return app.text("Content-Type header isn't set.")
 	}
 
-	added := app.repo.add_from_path(pkg_path) or {
+	res := app.repo.add_from_path(pkg_path) or {
 		app.lerror('Error while adding package: $err.msg')
 
-		os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path'.") }
+		os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path': $err.msg") }
 
 		return app.text('Failed to add package.')
 	}
-	if !added {
-		os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path'.") }
+	if !res.added {
+		os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path': $err.msg") }
 
-		app.lwarn('Duplicate package.')
+		app.lwarn("Duplicate package '$res.pkg.full_name()'.")
 
 		return app.text('File already exists.')
 	}
 
-	app.linfo("Added '$pkg_path' to repository.")
+	app.linfo("Added '$res.pkg.full_name()' to repository.")
 
 	return app.text('Package added successfully.')
 }
-
-// add_package PUT a new package to the server
-['/add'; put]
-pub fn (mut app App) add_package() web.Result {
-	return app.text('')
-}
diff --git a/src/web/web.v b/src/web/web.v
index 9621a2d..b1e8b92 100644
--- a/src/web/web.v
+++ b/src/web/web.v
@@ -511,12 +511,12 @@ fn handle_conn<T>(mut conn net.TcpConn, mut app T, routes map[string]Route) {
 		return
 	}
 
-    // The healthcheck spams the logs, which isn't very useful
-    if head.url != '/health' {
-        lock app.logger {
-            app.logger.debug('$head.method $head.url $head.version')
-        }
-    }
+	// The healthcheck spams the logs, which isn't very useful
+	if head.url != '/health' {
+		lock app.logger {
+			app.logger.debug('$head.method $head.url $head.version')
+		}
+	}
 
 	// 	req := http.parse_request(mut reader) or {
 	// 		// Prevents errors from being thrown when BufferedReader is empty