From 947207570799b64ed114a7f24d0e469150d51c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bardon?= <remi@remibardon.name>
Date: Wed, 29 May 2024 23:02:27 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20Fix=20trash=20dir=20parent=20not?=
 =?UTF-8?q?=20created=20on=20liftoff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Cargo.lock                   | 4 ++--
 src/helpers/Cargo.toml           | 2 +-
 src/helpers/src/generate.rs      | 7 +++++++
 src/orangutan-server/Cargo.toml  | 2 +-
 src/orangutan-server/src/main.rs | 9 +++++----
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/Cargo.lock b/src/Cargo.lock
index 63978bc..a9415e8 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -983,7 +983,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "orangutan-helpers"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "biscuit-auth",
  "lazy_static",
@@ -1021,7 +1021,7 @@ dependencies = [
 
 [[package]]
 name = "orangutan-server"
-version = "0.4.2"
+version = "0.4.3"
 dependencies = [
  "base64 0.22.1",
  "biscuit-auth",
diff --git a/src/helpers/Cargo.toml b/src/helpers/Cargo.toml
index 97c4220..ea3ed2a 100644
--- a/src/helpers/Cargo.toml
+++ b/src/helpers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "orangutan-helpers"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/src/helpers/src/generate.rs b/src/helpers/src/generate.rs
index 2010e8a..05a5c8b 100644
--- a/src/helpers/src/generate.rs
+++ b/src/helpers/src/generate.rs
@@ -347,6 +347,13 @@ pub struct State {
     used_profiles: Option<&'static HashSet<String>>,
 }
 
+pub fn create_tmp_dir() -> Result<(), Error> {
+    trace!("Creating temporary directory at <{}>…", TMP_DIR.display());
+    fs::create_dir_all(TMP_DIR.as_path())?;
+
+    Ok(())
+}
+
 pub fn trash_outdated_websites() -> Result<State, Error> {
     trace!("Trashing outdated websites…");
 
diff --git a/src/orangutan-server/Cargo.toml b/src/orangutan-server/Cargo.toml
index 6bbbcab..0098640 100644
--- a/src/orangutan-server/Cargo.toml
+++ b/src/orangutan-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "orangutan-server"
-version = "0.4.2"
+version = "0.4.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/src/orangutan-server/src/main.rs b/src/orangutan-server/src/main.rs
index d6bf353..19eada0 100644
--- a/src/orangutan-server/src/main.rs
+++ b/src/orangutan-server/src/main.rs
@@ -50,8 +50,9 @@ fn rocket() -> _ {
 }
 
 fn liftoff() -> Result<(), Error> {
-    clone_repository().map_err(Error::WebsiteGenerationError)?;
-    generate_default_website().map_err(Error::WebsiteGenerationError)?;
+    create_tmp_dir()?;
+    clone_repository()?;
+    generate_default_website()?;
     Ok(())
 }
 
@@ -85,8 +86,8 @@ async fn not_found() -> Result<NamedFile, &'static str> {
 
 #[derive(Debug, thiserror::Error)]
 enum Error {
-    #[error("Website generation error: {0}")]
-    WebsiteGenerationError(generate::Error),
+    #[error(transparent)]
+    WebsiteGenerationError(#[from] generate::Error),
     #[error(transparent)]
     MainRouteError(#[from] main_route::Error),
     #[error("Could not update content: {0}")]