feat: update command

Author: megatank58

.version

@@ -0,0 +1 @@
+2.5.0

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "oxup"
-version = "2.2.3"
+version = "2.5.0"
 edition = "2021"
 
 [profile.release]

Cargo.toml

@@ -17,19 +17,29 @@ pub struct ReleaseData {
     assets: Vec<Release>,
 }
 
-pub async fn install(os: OS) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn install(os: OS, oxup: bool) -> Result<(), Box<dyn std::error::Error>> {
     let mut headers = HeaderMap::new();
     headers.insert(USER_AGENT, "megatank58".parse().unwrap());
 
-    let target = "https://api.github.com/repositories/500013933/releases/latest";
+    let target = if oxup {
+        "https://api.github.com/repos/oxidic/oxup/releases/latest"
+    } else {
+        "https://api.github.com/repositories/500013933/releases/latest"
+    };
     let client = Client::new();
     let response = client.get(target).headers(headers.clone()).send().await?;
     let result: ReleaseData = response.json().await?;
 
-    let filter = match os {
-        OS::Mac => "oxido-darwin",
-        OS::Linux => "oxido",
-        OS::Windows => "oxido.exe",
+    let bin = if oxup {
+        "oxup"
+    } else {
+        "oxido"
+    };
+
+    let filter = &match os {
+        OS::Mac => bin.to_owned() + "darwin",
+        OS::Linux => bin.to_owned(),
+        OS::Windows => bin.to_owned() + ".exe",
     };
 
     let url: String = result
@@ -39,7 +49,7 @@ pub async fn install(os: OS) -> Result<(), Box<dyn std::error::Error>> {
         .map(|f| f.browser_download_url.clone())
         .collect();
 
-    info!["Downloading oxido"];
+    info![format!("Downloading {bin}")];
 
     let response = client.get(&url).headers(headers.clone()).send().await?;
     let bytes = response.bytes().await?;
@@ -48,15 +58,15 @@ pub async fn install(os: OS) -> Result<(), Box<dyn std::error::Error>> {
 
     std::fs::write(
         match os {
-            OS::Windows => String::from(r"C:\bin"),
+            OS::Windows => format!(r"C:\bin\{bin}.exe"),
             _ => {
-                format!("{}/.oxido/bin", std::env::var("HOME").unwrap())
+                format!("{}/.oxido/bin/{bin}", std::env::var("HOME").unwrap())
             }
         },
         bytes,
     )?;
 
-    success!["Oxido has been installed!"];
+    success![format!("{bin} has been installed!")];
 
     Ok(())
 }

src/install.rs

@@ -3,9 +3,10 @@ mod install;
 mod os;
 mod setup;
 mod uninstall;
+mod update;
 
 use crate::os::OS;
-use clap::{command, Parser, Subcommand};
+use clap::{command, Parser, Subcommand, ValueEnum};
 
 /// Oxup is a tool for managing installations and packages of oxido.
 #[derive(Parser, Debug)]
@@ -25,6 +26,10 @@ struct Oxup {
     /// Force run as Linux
     #[clap(short, long, value_parser)]
     linux: bool,
+
+    /// Do not check for updates
+    #[clap(short, long, value_parser)]
+    no_update: bool,
 }
 
 #[derive(Debug, Subcommand)]
@@ -46,8 +51,14 @@ enum Commands {
     Uninstall,
 
     /// Update oxido to latest version avaliable
-    #[command()]
-    Update,
+    #[command(arg_required_else_help = true)]
+    Update { update: Updateable },
+}
+
+#[derive(Debug, Clone, ValueEnum)]
+pub enum Updateable {
+    Oxido,
+    Oxup,
 }
 
 #[tokio::main]
@@ -64,14 +75,26 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
 
     match args.command {
-        Commands::Install | Commands::Update => {
-            install::install(os).await?;
+        Commands::Install => {
+            install::install(os, false).await?;
         }
         Commands::Init { file } => init::init(file),
         Commands::Uninstall => {
             uninstall::uninstall(os);
         }
         Commands::Setup => setup::setup(os),
+        Commands::Update { update } => update::update(update, os).await?,
+    }
+
+    let current_version = env!("CARGO_PKG_VERSION");
+
+    let new_version = reqwest::get("https://raw.githubusercontent.com/oxidic/oxup/main/.version")
+        .await?
+        .text()
+        .await?;
+
+    if !args.no_update && current_version != new_version {
+        info![format!("Oxup v{new_version} is avaliable for download.")];
     }
 
     Ok(())
@@ -82,14 +105,14 @@ mod macros {
     #[macro_export]
     macro_rules! info {
         ($message:expr) => {
-            println!("{} {}", "\x1b[1minfo:\x1b[0m", $message);
+            println!("{} {}", "\x1b[1minfo:\x1b[0m", $message)
         };
     }
 
     #[macro_export]
     macro_rules! error {
         ($message:expr) => {
-            println!("{} {}", "\x1b[1m\x1b[31merror:\x1b[0m", $message);
+            println!("{} {}", "\x1b[1m\x1b[31merror:\x1b[0m", $message)
         };
     }
 

src/main.rs

@@ -0,0 +1,19 @@
+use crate::{install::install, Updateable, OS};
+
+pub async fn update(update: Updateable, os: OS) -> Result<(), Box<dyn std::error::Error>> {
+    let (bin, oxup) = match update {
+        Updateable::Oxido => ("oxido", false),
+        Updateable::Oxup => ("oxup", true),
+    };
+
+    std::fs::remove_file(match os {
+        OS::Windows => format!(r"C:\bin\{bin}.exe"),
+        _ => {
+            format!("{}/.oxido/bin/{bin}", std::env::var("HOME").unwrap())
+        }
+    })?;
+
+    install(os, oxup).await?;
+
+    Ok(())
+}