Merge branch 'cleanup' into master

2 files changed, 17 insertions, 9 deletions

diff --git a/src/config/configuration.rs b/src/config/configuration.rs
index 162115b..10ee21a 100644
--- a/src/config/configuration.rs
+++ b/src/config/configuration.rs
@@ -1,10 +1,4 @@
-use std::collections::BTreeMap;
 use std::ops::Deref;
-use std::path::PathBuf;
-
-use anyhow::Context;
-use anyhow::Result;
-use handlebars::Handlebars;
 
 use crate::config::NotValidatedConfiguration;
 
diff --git a/src/config/not_validated.rs b/src/config/not_validated.rs
index c8fbb3f..b827be6 100644
--- a/src/config/not_validated.rs
+++ b/src/config/not_validated.rs
@@ -2,7 +2,6 @@ use std::path::PathBuf;
 use anyhow::anyhow;
 use anyhow::Result;
 use getset::Getters;
-use handlebars::Handlebars;
 use serde::Deserialize;
 
 use crate::config::Configuration;
@@ -41,7 +40,7 @@ pub struct NotValidatedConfiguration {
 
     #[serde(rename = "source_cache")]
     #[getset(get = "pub")]
-    source_cache_root: String,
+    source_cache_root: PathBuf,
 
     #[getset(get = "pub")]
     #[serde(rename = "database_host")]
@@ -75,7 +74,22 @@ pub struct NotValidatedConfiguration {
 
 impl NotValidatedConfiguration {
     pub fn validate(self) -> Result<Configuration> {
-        // TODO: Implement proper validation
+        if !self.staging_directory.is_dir() {
+            return Err(anyhow!("Not a directory: staging = {}", self.staging_directory.display()))
+        }
+
+        if !self.releases_directory.is_dir() {
+            return Err(anyhow!("Not a directory: releases = {}", self.releases_directory.display()))
+        }
+
+        if !self.source_cache_root.is_dir() {
+            return Err(anyhow!("Not a directory: releases = {}", self.source_cache_root.display()))
+        }
+
+        if self.available_phases.is_empty() {
+            return Err(anyhow!("No phases configured"))
+        }
+
         if let Some(configured_theme) = self.script_highlight_theme.as_ref() {
             let allowed_theme_present = [
                 "base16-ocean.dark",