From e2d609961abc5e309da4f40b1ae57de6616bd0e3 Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Fri, 20 Dec 2024 18:29:44 +0000
Subject: [PATCH 1/9] feat: :sparkles: Use cached template if it is up-to-date

---
 Cargo.toml                          |   2 +-
 src/commands/new.rs                 | 115 ++++++++++++++++++++--------
 src/commands/vexide-template.tar.gz | Bin 8693 -> 8933 bytes
 src/errors.rs                       |   5 ++
 src/main.rs                         |  20 +++--
 5 files changed, 104 insertions(+), 38 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9809e41..6555681 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ chrono = "0.4.38"
 directories = "5.0.1"
 
 [features]
-default = ["clap", "fetch-template"]
+default = ["clap"]
 clap = ["dep:clap"]
 
 field-control = ["dep:ratatui", "dep:crossterm", "dep:tui-term"]
diff --git a/src/commands/new.rs b/src/commands/new.rs
index a668842..3aefe90 100644
--- a/src/commands/new.rs
+++ b/src/commands/new.rs
@@ -1,6 +1,7 @@
 use cargo_metadata::camino::Utf8PathBuf;
 use directories::ProjectDirs;
-use log::info;
+use log::{debug, info, warn};
+use serde_json::Value;
 
 use crate::errors::CliError;
 use std::{
@@ -8,29 +9,69 @@ use std::{
     path::{Path, PathBuf},
 };
 
+#[derive(Debug, Clone)]
+struct Template {
+    pub data: Vec<u8>,
+    pub sha: Option<String>,
+}
+
 #[cfg(feature = "fetch-template")]
-async fn fetch_template() -> reqwest::Result<Vec<u8>> {
+async fn get_current_sha() -> Result<String, CliError> {
+    let response =
+        reqwest::get("https://api.github.com/repos/vexide/vexide-template/commits/main?per-page=1")
+            .await;
+    let response = match response {
+        Ok(response) => response,
+        Err(err) => return Err(CliError::BadResponse(err)),
+    };
+    let response_text = response.text().await.ok().unwrap_or("{}".to_string());
+    match &serde_json::from_str::<Value>(&response_text).unwrap_or_default()["sha"] {
+        Value::String(str) => Ok(str.clone()),
+        _ => unreachable!("Internal error: GitHub API broken"),
+    }
+}
+
+#[cfg(feature = "fetch-template")]
+async fn fetch_template() -> Result<Template, CliError> {
     info!("Fetching template...");
     let response =
         reqwest::get("https://github.com/vexide/vexide-template/archive/refs/heads/main.tar.gz")
-            .await?;
+            .await;
+    let response = match response {
+        Ok(response) => response,
+        Err(err) => return Err(CliError::BadResponse(err)),
+    };
     let bytes = response.bytes().await?;
+
     info!("Successfully fetched template.");
-    Ok(bytes.to_vec())
+    let template = Template {
+        data: bytes.to_vec(),
+        sha: get_current_sha().await.ok(),
+    };
+    Ok(template)
 }
 
 #[cfg(feature = "fetch-template")]
-fn cached_template_path() -> Option<PathBuf> {
-    ProjectDirs::from("", "vexide", "cargo-v5").and_then(|dirs| {
-        dirs.cache_dir()
-            .canonicalize()
-            .ok()
-            .map(|path| path.with_file_name("vexide-template.tar.gz"))
-    })
+fn cached_template() -> Option<Template> {
+    let sha = cached_template_dir()
+        .and_then(|path| fs::read_to_string(path.with_file_name("cache-id.txt")).ok());
+    cached_template_dir()
+        .map(|path| path.with_file_name("vexide-template.tar.gz"))
+        .and_then(|cache_file| fs::read(cache_file).ok())
+        .map(|data: Vec<u8>| Template { data, sha })
 }
 
-fn baked_in_template() -> Vec<u8> {
-    include_bytes!("./vexide-template.tar.gz").to_vec()
+#[cfg(feature = "fetch-template")]
+fn cached_template_dir() -> Option<PathBuf> {
+    ProjectDirs::from("", "vexide", "cargo-v5")
+        .and_then(|dirs| dirs.cache_dir().canonicalize().ok())
+}
+
+fn baked_in_template() -> Template {
+    Template {
+        data: include_bytes!("./vexide-template.tar.gz").to_vec(),
+        sha: None,
+    }
 }
 
 fn unpack_template(template: Vec<u8>, dir: &Utf8PathBuf) -> io::Result<()> {
@@ -55,7 +96,7 @@ fn unpack_template(template: Vec<u8>, dir: &Utf8PathBuf) -> io::Result<()> {
     Ok(())
 }
 
-pub async fn new(path: Utf8PathBuf, name: Option<String>) -> Result<(), CliError> {
+pub async fn new(path: Utf8PathBuf, name: Option<String>, use_internet: bool) -> Result<(), CliError> {
     let dir = if let Some(name) = &name {
         let dir = path.join(name);
         std::fs::create_dir_all(&path).unwrap();
@@ -72,31 +113,41 @@ pub async fn new(path: Utf8PathBuf, name: Option<String>) -> Result<(), CliError
     info!("Creating new project at {:?}", dir);
 
     #[cfg(feature = "fetch-template")]
-    let template: Vec<u8> = match fetch_template().await {
-        Ok(bytes) => {
-            if let Some(cache_file) = cached_template_path() {
-                info!("Storing fetched template in cache.");
-                fs::write(cache_file, &bytes).unwrap_or_else(|_| {
-                    info!("Could not cache template.");
-                });
-            }
-            bytes
+    let template = cached_template();
+
+    #[cfg(feature = "fetch-template")]
+    let template = match (
+        template.clone().and_then(|t| t.sha),
+        get_current_sha().await,
+    ) {
+        (Some(cached_sha), Ok(current_sha)) if cached_sha == current_sha => {
+            info!("Cached template is current, skipping download.");
+            template
         }
-        Err(_) => {
-            info!("Failed to fetch template, checking cached template.");
-            cached_template_path()
-                .and_then(|cache_file| fs::read(cache_file).ok())
-                .unwrap_or_else(|| {
-                    info!("Failed to find cached template, using baked-in template.");
-                    baked_in_template()
-                })
+        _ => {
+            if use_internet {
+            let fetched_template = fetch_template().await.ok();
+            fetched_template.or_else(|| {
+                warn!("Could not fetch template:, falling back to cache.");
+                template
+            })
+            } else {
+                template
+            }
         }
     };
+
+    #[cfg(feature = "fetch-template")]
+    let template = template.unwrap_or_else(|| {
+        warn!("No emplate found in cache, using builtin template.");
+        baked_in_template()
+    });
+
     #[cfg(not(feature = "fetch-template"))]
     let template = baked_in_template();
 
     info!("Unpacking template...");
-    unpack_template(template, &dir)?;
+    unpack_template(template.data, &dir)?;
     info!("Successfully unpacked vexide-template!");
 
     info!("Renaming project to {}...", &name);
diff --git a/src/commands/vexide-template.tar.gz b/src/commands/vexide-template.tar.gz
index 46a562302fdd5070a666be6626c9dffae0e99469..20e5433d8925950ecf2623c9636a7922f6355751 100644
GIT binary patch
literal 8933
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

literal 8693
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
TU9QV@*;M`q-N5T90H^=}8@DLS

diff --git a/src/errors.rs b/src/errors.rs
index 9b4ce64..647b455 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -16,6 +16,11 @@ pub enum CliError {
     #[diagnostic(code(cargo_v5::cdc2_nack))]
     Nack(#[from] Cdc2Ack),
 
+    #[cfg(feature = "fetch-template")]
+    #[error(transparent)]
+    #[diagnostic(code(cargo_v5::bad_response))]
+    BadResponse(#[from] reqwest::Error),
+
     // TODO: Add source spans.
     #[error("Incorrect type for field `{field}` (expected {expected}, found {found}).")]
     #[diagnostic(
diff --git a/src/main.rs b/src/main.rs
index 64619ae..32eb303 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -99,9 +99,19 @@ enum Command {
     New {
         /// The name of the project.
         name: String,
+
+        /// Whether or not to fetch the latest template online.
+        #[cfg_attr(feature = "fetch-template", arg(long, default_value = "true"))]
+        #[cfg_attr(not(feature = "fetch-template"), arg(skip = true))]
+        use_internet: bool,
     },
     /// Creates a new vexide project in the current directory
-    Init,
+    Init {
+        /// Whether or not to fetch the latest template online.
+        #[cfg_attr(feature = "fetch-template", arg(long, default_value = "true"))]
+        #[cfg_attr(not(feature = "fetch-template"), arg(skip = true))]
+        use_internet: bool,
+    },
 }
 
 #[tokio::main]
@@ -234,11 +244,11 @@ async fn app(command: Command, path: Utf8PathBuf, logger: &mut LoggerHandle) ->
 
             run_field_control_tui(&mut connection).await?;
         }
-        Command::New { name } => {
-            new(path, Some(name)).await?;
+        Command::New { name , use_internet} => {
+            new(path, Some(name), use_internet).await?;
         }
-        Command::Init => {
-            new(path, None).await?;
+        Command::Init { use_internet } => {
+            new(path, None, use_internet).await?;
         }
     }
 

From 51d6d83044b280d70d60695908317fc1eda160b6 Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Sun, 22 Dec 2024 09:35:15 -0800
Subject: [PATCH 2/9] refactor: :recycle: Address code review comments

---
 Cargo.toml          |  2 +-
 src/commands/new.rs | 13 +++++--------
 src/errors.rs       |  2 +-
 src/main.rs         | 30 +++++++++++++++++-------------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f9db180..0bcb80f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,7 +56,7 @@ humansize = "2.1.3"
 image = { version = "0.25.1", default-features = false, features = ["png"] }
 
 [features]
-default = ["clap"]
+default = ["clap", "fetch-template"]
 clap = ["dep:clap"]
 
 field-control = ["dep:ratatui", "dep:crossterm", "dep:tui-term"]
diff --git a/src/commands/new.rs b/src/commands/new.rs
index 10eb71d..91f7140 100644
--- a/src/commands/new.rs
+++ b/src/commands/new.rs
@@ -23,7 +23,7 @@ async fn get_current_sha() -> Result<String, CliError> {
             .await;
     let response = match response {
         Ok(response) => response,
-        Err(err) => return Err(CliError::BadResponse(err)),
+        Err(err) => return Err(CliError::ReqwestError(err)),
     };
     let response_text = response.text().await.ok().unwrap_or("{}".to_string());
     match &serde_json::from_str::<Value>(&response_text).unwrap_or_default()["sha"] {
@@ -40,7 +40,7 @@ async fn fetch_template() -> Result<Template, CliError> {
             .await;
     let response = match response {
         Ok(response) => response,
-        Err(err) => return Err(CliError::BadResponse(err)),
+        Err(err) => return Err(CliError::ReqwestError(err)),
     };
     let bytes = response.bytes().await?;
 
@@ -97,7 +97,7 @@ fn unpack_template(template: Vec<u8>, dir: &Utf8PathBuf) -> io::Result<()> {
     Ok(())
 }
 
-pub async fn new(path: Utf8PathBuf, name: Option<String>, use_internet: bool) -> Result<(), CliError> {
+pub async fn new(path: Utf8PathBuf, name: Option<String>, download_template: bool) -> Result<(), CliError> {
     let dir = if let Some(name) = &name {
         let dir = path.join(name);
         std::fs::create_dir_all(&path).unwrap();
@@ -121,26 +121,23 @@ pub async fn new(path: Utf8PathBuf, name: Option<String>, use_internet: bool) ->
         template.clone().and_then(|t| t.sha),
         get_current_sha().await,
     ) {
+        _ if !download_template => template,
         (Some(cached_sha), Ok(current_sha)) if cached_sha == current_sha => {
             debug!("Cached template is current, skipping download.");
             template
         }
         _ => {
-            if use_internet {
             let fetched_template = fetch_template().await.ok();
             fetched_template.or_else(|| {
                 warn!("Could not fetch template, falling back to cache.");
                 template
             })
-            } else {
-                template
-            }
         }
     };
 
     #[cfg(feature = "fetch-template")]
     let template = template.unwrap_or_else(|| {
-        warn!("No emplate found in cache, using builtin template.");
+        debug!("No template found in cache, using builtin template.");
         baked_in_template()
     });
 
diff --git a/src/errors.rs b/src/errors.rs
index 7becbd5..acf264b 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -20,7 +20,7 @@ pub enum CliError {
     #[cfg(feature = "fetch-template")]
     #[error(transparent)]
     #[diagnostic(code(cargo_v5::bad_response))]
-    BadResponse(#[from] reqwest::Error),
+    ReqwestError(#[from] reqwest::Error),
 
     #[error(transparent)]
     #[diagnostic(code(cargo_v5::image_error))]
diff --git a/src/main.rs b/src/main.rs
index ee5d57b..87c1621 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,7 +20,7 @@ use cargo_v5::{
     connection::{open_connection, switch_radio_channel},
 };
 use chrono::Utc;
-use clap::{Parser, Subcommand};
+use clap::{Args, Parser, Subcommand};
 use flexi_logger::{AdaptiveFormat, FileSpec, LogfileSelector, LoggerHandle};
 use tokio::{runtime::Handle, select, task::block_in_place};
 #[cfg(feature = "field-control")]
@@ -92,17 +92,13 @@ enum Command {
         /// The name of the project.
         name: String,
 
-        /// Whether or not to fetch the latest template online.
-        #[cfg_attr(feature = "fetch-template", arg(long, default_value = "true"))]
-        #[cfg_attr(not(feature = "fetch-template"), arg(skip = true))]
-        use_internet: bool,
+        #[clap(flatten)]
+        download_opts: DownloadOpts,
     },
     /// Creates a new vexide project in the current directory
     Init {
-        /// Whether or not to fetch the latest template online.
-        #[cfg_attr(feature = "fetch-template", arg(long, default_value = "true"))]
-        #[cfg_attr(not(feature = "fetch-template"), arg(skip = true))]
-        use_internet: bool,
+        #[clap(flatten)]
+        download_opts: DownloadOpts,
     },    
     /// List files on flash.
     #[clap(visible_alias = "ls")]
@@ -128,6 +124,14 @@ enum Command {
     FieldControl,
 }
 
+#[derive(Args, Debug)]
+struct DownloadOpts {
+    /// Whether or not to download the latest template online.
+    #[cfg_attr(feature = "fetch-template", arg(long, default_value = "true"))]
+    #[cfg_attr(not(feature = "fetch-template"), arg(skip = true))]
+    download_template: bool,
+}
+
 #[tokio::main]
 async fn main() -> miette::Result<()> {
     // Parse CLI arguments
@@ -260,11 +264,11 @@ async fn app(command: Command, path: Utf8PathBuf, logger: &mut LoggerHandle) ->
 
             run_field_control_tui(&mut connection).await?;
         }
-        Command::New { name , use_internet} => {
-            new(path, Some(name), use_internet).await?;
+        Command::New { name , download_opts} => {
+            new(path, Some(name), download_opts.download_template).await?;
         }
-        Command::Init { use_internet } => {
-            new(path, None, use_internet).await?;
+        Command::Init { download_opts } => {
+            new(path, None, download_opts.download_template).await?;
         }
     }
 

From 6d574104875c588f882cd8c08b717f981e6e840f Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Mon, 23 Dec 2024 11:25:11 -0800
Subject: [PATCH 3/9] fix: :bug: Actually store template in cache

---
 src/commands/new.rs | 37 +++++++++++++++++++++++++++++++------
 src/main.rs         | 12 ++++++------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/commands/new.rs b/src/commands/new.rs
index 91f7140..295df94 100644
--- a/src/commands/new.rs
+++ b/src/commands/new.rs
@@ -18,9 +18,12 @@ struct Template {
 
 #[cfg(feature = "fetch-template")]
 async fn get_current_sha() -> Result<String, CliError> {
-    let response =
-        reqwest::get("https://api.github.com/repos/vexide/vexide-template/commits/main?per-page=1")
-            .await;
+    let client = reqwest::Client::new();
+    let response = client
+        .get("https://api.github.com/repos/vexide/vexide-template/commits/main?per-page=1")
+        .header("User-Agent", "vexide/cargo-v5")
+        .send()
+        .await;
     let response = match response {
         Ok(response) => response,
         Err(err) => return Err(CliError::ReqwestError(err)),
@@ -49,19 +52,36 @@ async fn fetch_template() -> Result<Template, CliError> {
         data: bytes.to_vec(),
         sha: get_current_sha().await.ok(),
     };
+    store_cached_template(template.clone());
     Ok(template)
 }
 
 #[cfg(feature = "fetch-template")]
-fn cached_template() -> Option<Template> {
+fn get_cached_template() -> Option<Template> {
     let sha = cached_template_dir()
         .and_then(|path| fs::read_to_string(path.with_file_name("cache-id.txt")).ok());
     cached_template_dir()
         .map(|path| path.with_file_name("vexide-template.tar.gz"))
         .and_then(|cache_file| fs::read(cache_file).ok())
         .map(|data: Vec<u8>| Template { data, sha })
+        .inspect(|template| {log::debug!("Found cached template with sha: {:?}", template.sha)})
 }
 
+#[cfg(feature = "fetch-template")]
+fn store_cached_template(template: Template) -> () {
+    cached_template_dir()
+        .map(|path| path.with_file_name("vexide-template.tar.gz"))
+        .map(|cache_file| fs::write(cache_file, &template.data));
+    cached_template_dir()
+        .map(|path| path.with_file_name("cache-id.txt"))
+        .map(|sha_file| {
+            if let Some(sha) = template.sha {
+                fs::write(sha_file, sha);
+            }
+        });
+    
+    }
+
 #[cfg(feature = "fetch-template")]
 fn cached_template_dir() -> Option<PathBuf> {
     ProjectDirs::from("", "vexide", "cargo-v5")
@@ -97,7 +117,11 @@ fn unpack_template(template: Vec<u8>, dir: &Utf8PathBuf) -> io::Result<()> {
     Ok(())
 }
 
-pub async fn new(path: Utf8PathBuf, name: Option<String>, download_template: bool) -> Result<(), CliError> {
+pub async fn new(
+    path: Utf8PathBuf,
+    name: Option<String>,
+    download_template: bool,
+) -> Result<(), CliError> {
     let dir = if let Some(name) = &name {
         let dir = path.join(name);
         std::fs::create_dir_all(&path).unwrap();
@@ -114,7 +138,7 @@ pub async fn new(path: Utf8PathBuf, name: Option<String>, download_template: boo
     info!("Creating new project at {:?}", dir);
 
     #[cfg(feature = "fetch-template")]
-    let template = cached_template();
+    let template = get_cached_template();
 
     #[cfg(feature = "fetch-template")]
     let template = match (
@@ -127,6 +151,7 @@ pub async fn new(path: Utf8PathBuf, name: Option<String>, download_template: boo
             template
         }
         _ => {
+            debug!("Cached template is out of date.");
             let fetched_template = fetch_template().await.ok();
             fetched_template.or_else(|| {
                 warn!("Could not fetch template, falling back to cache.");
diff --git a/src/main.rs b/src/main.rs
index 87c1621..8bd3b29 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -126,10 +126,10 @@ enum Command {
 
 #[derive(Args, Debug)]
 struct DownloadOpts {
-    /// Whether or not to download the latest template online.
-    #[cfg_attr(feature = "fetch-template", arg(long, default_value = "true"))]
-    #[cfg_attr(not(feature = "fetch-template"), arg(skip = true))]
-    download_template: bool,
+    /// Do not download the latest template online.
+    #[cfg_attr(feature = "fetch-template", arg(long, default_value = "false"))]
+    #[cfg_attr(not(feature = "fetch-template"), arg(skip = false))]
+    no_download_template: bool,
 }
 
 #[tokio::main]
@@ -265,10 +265,10 @@ async fn app(command: Command, path: Utf8PathBuf, logger: &mut LoggerHandle) ->
             run_field_control_tui(&mut connection).await?;
         }
         Command::New { name , download_opts} => {
-            new(path, Some(name), download_opts.download_template).await?;
+            new(path, Some(name), !download_opts.no_download_template).await?;
         }
         Command::Init { download_opts } => {
-            new(path, None, download_opts.download_template).await?;
+            new(path, None, !download_opts.no_download_template).await?;
         }
     }
 

From 22715b7596cadbcac2833e07e61401d82d8a7467 Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Tue, 24 Dec 2024 11:21:49 -0800
Subject: [PATCH 4/9] refactor: :rotating_light: Fix ignored Result warning

---
 src/commands/new.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/new.rs b/src/commands/new.rs
index 295df94..66ebfb8 100644
--- a/src/commands/new.rs
+++ b/src/commands/new.rs
@@ -76,7 +76,7 @@ fn store_cached_template(template: Template) -> () {
         .map(|path| path.with_file_name("cache-id.txt"))
         .map(|sha_file| {
             if let Some(sha) = template.sha {
-                fs::write(sha_file, sha);
+                let _ = fs::write(sha_file, sha);
             }
         });
     

From 87679570668eece0f481e7b8c293a380ab2ed164 Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:22:02 +0000
Subject: [PATCH 5/9] refactor: :recycle: Use async fs functions, remove
 unreachable

---
 src/commands/new.rs | 52 +++++++++++++++++++++++----------------------
 src/errors.rs       |  5 +++++
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/commands/new.rs b/src/commands/new.rs
index 66ebfb8..b02c733 100644
--- a/src/commands/new.rs
+++ b/src/commands/new.rs
@@ -31,7 +31,7 @@ async fn get_current_sha() -> Result<String, CliError> {
     let response_text = response.text().await.ok().unwrap_or("{}".to_string());
     match &serde_json::from_str::<Value>(&response_text).unwrap_or_default()["sha"] {
         Value::String(str) => Ok(str.clone()),
-        _ => unreachable!("Internal error: GitHub API broken"),
+        _ => Err(CliError::MalformedResponse),
     }
 }
 
@@ -52,34 +52,36 @@ async fn fetch_template() -> Result<Template, CliError> {
         data: bytes.to_vec(),
         sha: get_current_sha().await.ok(),
     };
-    store_cached_template(template.clone());
+    store_cached_template(template.clone()).await;
     Ok(template)
 }
 
 #[cfg(feature = "fetch-template")]
-fn get_cached_template() -> Option<Template> {
-    let sha = cached_template_dir()
-        .and_then(|path| fs::read_to_string(path.with_file_name("cache-id.txt")).ok());
-    cached_template_dir()
-        .map(|path| path.with_file_name("vexide-template.tar.gz"))
-        .and_then(|cache_file| fs::read(cache_file).ok())
-        .map(|data: Vec<u8>| Template { data, sha })
-        .inspect(|template| {log::debug!("Found cached template with sha: {:?}", template.sha)})
+async fn get_cached_template() -> Option<Template> {
+    match cached_template_dir() {
+        Some(dir) => {
+            let cache_file = dir.with_file_name("vexide-template.tar.gz");
+            let sha_file = dir.with_file_name("cache-id.txt");
+            let sha = tokio::fs::read_to_string(sha_file).await.ok();
+            let data = tokio::fs::read(cache_file).await.ok();
+            data.map(|data| Template {data, sha})
+        }
+        None => {
+            None
+        }
+    }
 }
 
 #[cfg(feature = "fetch-template")]
-fn store_cached_template(template: Template) -> () {
-    cached_template_dir()
-        .map(|path| path.with_file_name("vexide-template.tar.gz"))
-        .map(|cache_file| fs::write(cache_file, &template.data));
-    cached_template_dir()
-        .map(|path| path.with_file_name("cache-id.txt"))
-        .map(|sha_file| {
-            if let Some(sha) = template.sha {
-                let _ = fs::write(sha_file, sha);
-            }
-        });
-    
+async fn store_cached_template(template: Template) -> () {
+    if let Some(dir) = cached_template_dir() {
+        let cache_file = dir.with_file_name("vexide-template.tar.gz");
+        let sha_file = dir.with_file_name("cache-id.txt");
+        let _ = tokio::fs::write(cache_file, &template.data).await;
+        if let Some(sha) = template.sha {
+            let _ = tokio::fs::write(sha_file, sha).await;
+        }  
+    }
     }
 
 #[cfg(feature = "fetch-template")]
@@ -138,7 +140,7 @@ pub async fn new(
     info!("Creating new project at {:?}", dir);
 
     #[cfg(feature = "fetch-template")]
-    let template = get_cached_template();
+    let template = get_cached_template().await;
 
     #[cfg(feature = "fetch-template")]
     let template = match (
@@ -175,9 +177,9 @@ pub async fn new(
 
     debug!("Renaming project to {}...", &name);
     let manifest_path = dir.join("Cargo.toml");
-    let manifest = std::fs::read_to_string(&manifest_path)?;
+    let manifest = tokio::fs::read_to_string(&manifest_path).await?;
     let manifest = manifest.replace("vexide-template", &name);
-    std::fs::write(manifest_path, manifest)?;
+    tokio::fs::write(manifest_path, manifest).await?;
 
     info!("Successfully created new project at {:?}", dir);
     Ok(())
diff --git a/src/errors.rs b/src/errors.rs
index acf264b..d39a12e 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -22,6 +22,11 @@ pub enum CliError {
     #[diagnostic(code(cargo_v5::bad_response))]
     ReqwestError(#[from] reqwest::Error),
 
+    #[cfg(feature = "fetch-template")]
+    #[error("Recieved a malformed HTTP response")]
+    #[diagnostic(code(cargo_v5::malformed_response))]
+    MalformedResponse,
+
     #[error(transparent)]
     #[diagnostic(code(cargo_v5::image_error))]
     ImageError(#[from] ImageError),

From 16e474d5f6e796bc01f61c8e0975a30e37658783 Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Wed, 22 Jan 2025 15:31:00 -0800
Subject: [PATCH 6/9] refactor: :children_crossing: Shorten cli option name

---
 src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 8bd3b29..83aad09 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -129,7 +129,7 @@ struct DownloadOpts {
     /// Do not download the latest template online.
     #[cfg_attr(feature = "fetch-template", arg(long, default_value = "false"))]
     #[cfg_attr(not(feature = "fetch-template"), arg(skip = false))]
-    no_download_template: bool,
+    offline: bool,
 }
 
 #[tokio::main]
@@ -265,10 +265,10 @@ async fn app(command: Command, path: Utf8PathBuf, logger: &mut LoggerHandle) ->
             run_field_control_tui(&mut connection).await?;
         }
         Command::New { name , download_opts} => {
-            new(path, Some(name), !download_opts.no_download_template).await?;
+            new(path, Some(name), !download_opts.offline).await?;
         }
         Command::Init { download_opts } => {
-            new(path, None, !download_opts.no_download_template).await?;
+            new(path, None, !download_opts.offline).await?;
         }
     }
 

From 50afb6564702a03d8c02e19253355a1cba35bc88 Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Thu, 23 Jan 2025 17:19:06 +0000
Subject: [PATCH 7/9] refactor: :recycle: Shorten error handling, remove
 duplicated cfg

---
 src/commands/new.rs | 50 +++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/commands/new.rs b/src/commands/new.rs
index b02c733..748f1ce 100644
--- a/src/commands/new.rs
+++ b/src/commands/new.rs
@@ -6,7 +6,7 @@ use serde_json::Value;
 
 use crate::errors::CliError;
 use std::{
-    fs, io,
+    io,
     path::{Path, PathBuf},
 };
 
@@ -23,12 +23,12 @@ async fn get_current_sha() -> Result<String, CliError> {
         .get("https://api.github.com/repos/vexide/vexide-template/commits/main?per-page=1")
         .header("User-Agent", "vexide/cargo-v5")
         .send()
-        .await;
-    let response = match response {
-        Ok(response) => response,
-        Err(err) => return Err(CliError::ReqwestError(err)),
-    };
-    let response_text = response.text().await.ok().unwrap_or("{}".to_string());
+        .await
+        .map_err(|err| CliError::ReqwestError(err))?;
+    let response_text = response
+        .text()
+        .await
+        .map_err(|err| CliError::ReqwestError(err))?;
     match &serde_json::from_str::<Value>(&response_text).unwrap_or_default()["sha"] {
         Value::String(str) => Ok(str.clone()),
         _ => Err(CliError::MalformedResponse),
@@ -64,11 +64,9 @@ async fn get_cached_template() -> Option<Template> {
             let sha_file = dir.with_file_name("cache-id.txt");
             let sha = tokio::fs::read_to_string(sha_file).await.ok();
             let data = tokio::fs::read(cache_file).await.ok();
-            data.map(|data| Template {data, sha})
-        }
-        None => {
-            None
+            data.map(|data| Template { data, sha })
         }
+        None => None,
     }
 }
 
@@ -80,9 +78,9 @@ async fn store_cached_template(template: Template) -> () {
         let _ = tokio::fs::write(cache_file, &template.data).await;
         if let Some(sha) = template.sha {
             let _ = tokio::fs::write(sha_file, sha).await;
-        }  
-    }
+        }
     }
+}
 
 #[cfg(feature = "fetch-template")]
 fn cached_template_dir() -> Option<PathBuf> {
@@ -140,30 +138,24 @@ pub async fn new(
     info!("Creating new project at {:?}", dir);
 
     #[cfg(feature = "fetch-template")]
-    let template = get_cached_template().await;
-
-    #[cfg(feature = "fetch-template")]
-    let template = match (
-        template.clone().and_then(|t| t.sha),
-        get_current_sha().await,
-    ) {
-        _ if !download_template => template,
-        (Some(cached_sha), Ok(current_sha)) if cached_sha == current_sha => {
+    let template = match (get_cached_template().await, get_current_sha().await) {
+        (cached_template, ..) if !download_template => cached_template,
+        (Some(cached_template), Ok(current_sha))
+            if cached_template.sha == Some(current_sha.clone()) =>
+        {
             debug!("Cached template is current, skipping download.");
-            template
+            Some(cached_template)
         }
-        _ => {
+        (cached_template, ..) => {
             debug!("Cached template is out of date.");
             let fetched_template = fetch_template().await.ok();
             fetched_template.or_else(|| {
                 warn!("Could not fetch template, falling back to cache.");
-                template
+                cached_template
             })
         }
-    };
-
-    #[cfg(feature = "fetch-template")]
-    let template = template.unwrap_or_else(|| {
+    }
+    .unwrap_or_else(|| {
         debug!("No template found in cache, using builtin template.");
         baked_in_template()
     });

From 0654203b3cbdae33d087a971b7d0682d203b6881 Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Thu, 23 Jan 2025 17:20:11 +0000
Subject: [PATCH 8/9] refactor: :label: Make error enum non_exhaustive

---
 src/errors.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/errors.rs b/src/errors.rs
index d39a12e..fddbfaa 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -3,6 +3,7 @@ use miette::Diagnostic;
 use thiserror::Error;
 use vex_v5_serial::packets::cdc2::Cdc2Ack;
 
+#[non_exhaustive]
 #[derive(Error, Diagnostic, Debug)]
 pub enum CliError {
     #[error(transparent)]

From 0e4b051dfca89da9a4268ab50555a985de32fb9a Mon Sep 17 00:00:00 2001
From: ion098 <146852218+ion098@users.noreply.github.com>
Date: Thu, 23 Jan 2025 17:33:46 +0000
Subject: [PATCH 9/9] refactor: :recycle: Move repeated filenames into
 constants

---
 src/commands/new.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/commands/new.rs b/src/commands/new.rs
index 748f1ce..54391c1 100644
--- a/src/commands/new.rs
+++ b/src/commands/new.rs
@@ -16,6 +16,9 @@ struct Template {
     pub sha: Option<String>,
 }
 
+const TEMPLATE_FILE_NAME: &str = "vexide-template.tar.gz";
+const SHA_FILE_NAME: &str = "cache-id.txt";
+
 #[cfg(feature = "fetch-template")]
 async fn get_current_sha() -> Result<String, CliError> {
     let client = reqwest::Client::new();
@@ -60,8 +63,8 @@ async fn fetch_template() -> Result<Template, CliError> {
 async fn get_cached_template() -> Option<Template> {
     match cached_template_dir() {
         Some(dir) => {
-            let cache_file = dir.with_file_name("vexide-template.tar.gz");
-            let sha_file = dir.with_file_name("cache-id.txt");
+            let cache_file = dir.with_file_name(TEMPLATE_FILE_NAME);
+            let sha_file = dir.with_file_name(SHA_FILE_NAME);
             let sha = tokio::fs::read_to_string(sha_file).await.ok();
             let data = tokio::fs::read(cache_file).await.ok();
             data.map(|data| Template { data, sha })
@@ -73,8 +76,8 @@ async fn get_cached_template() -> Option<Template> {
 #[cfg(feature = "fetch-template")]
 async fn store_cached_template(template: Template) -> () {
     if let Some(dir) = cached_template_dir() {
-        let cache_file = dir.with_file_name("vexide-template.tar.gz");
-        let sha_file = dir.with_file_name("cache-id.txt");
+        let cache_file = dir.with_file_name(TEMPLATE_FILE_NAME);
+        let sha_file = dir.with_file_name(SHA_FILE_NAME);
         let _ = tokio::fs::write(cache_file, &template.data).await;
         if let Some(sha) = template.sha {
             let _ = tokio::fs::write(sha_file, sha).await;