Only check for direct download versions when necessary

Author: christiangnrd

src/bin/juliaup.rs

@@ -95,7 +95,7 @@ fn main() -> Result<()> {
         Juliaup::Add { channel } => run_command_add(&channel, &paths),
         Juliaup::Remove { channel } => run_command_remove(&channel, &paths),
         Juliaup::Status {} => run_command_status(&paths),
-        Juliaup::Update { channel } => run_command_update(channel, &paths),
+        Juliaup::Update { channel } => run_command_update(&channel, &paths),
         Juliaup::Gc { prune_linked } => run_command_gc(prune_linked, &paths),
         Juliaup::Link {
             channel,

src/command_add.rs

@@ -18,7 +18,8 @@ pub fn run_command_add(channel: &str, paths: &GlobalPaths) -> Result<()> {
         return add_non_db(channel, paths);
     }
 
-    update_version_db(paths).with_context(|| "Failed to update versions db.")?;
+    update_version_db(&Some(channel.to_string()), paths)
+        .with_context(|| "Failed to update versions db.")?;
     let version_db =
         load_versions_db(paths).with_context(|| "`add` command failed to load versions db.")?;
 

src/command_selfupdate.rs

@@ -10,7 +10,7 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> {
     use crate::{get_juliaup_target, get_own_version};
     use anyhow::{anyhow, bail};
 
-    update_version_db(paths).with_context(|| "Failed to update versions db.")?;
+    update_version_db(&None, paths).with_context(|| "Failed to update versions db.")?;
 
     let mut config_file = load_mut_config_db(paths)
         .with_context(|| "`selfupdate` command failed to load configuration db.")?;
@@ -97,7 +97,7 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> {
         Win32::{System::Console::GetConsoleWindow, UI::Shell::IInitializeWithWindow},
     };
 
-    update_version_db(paths).with_context(|| "Failed to update versions db.")?;
+    update_version_db(&None, paths).with_context(|| "Failed to update versions db.")?;
 
     let update_manager = windows::Services::Store::StoreContext::GetDefault()
         .with_context(|| "Failed to get the store context.")?;
@@ -146,6 +146,6 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> {
 
 #[cfg(not(any(feature = "windowsstore", feature = "selfupdate")))]
 pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> {
-    update_version_db(paths).with_context(|| "Failed to update versions db.")?;
+    update_version_db(&None, paths).with_context(|| "Failed to update versions db.")?;
     Ok(())
 }

src/command_update.rs

@@ -120,8 +120,8 @@ fn update_channel(
     Ok(())
 }
 
-pub fn run_command_update(channel: Option<String>, paths: &GlobalPaths) -> Result<()> {
-    update_version_db(paths).with_context(|| "Failed to update versions db.")?;
+pub fn run_command_update(channel: &Option<String>, paths: &GlobalPaths) -> Result<()> {
+    update_version_db(channel, paths).with_context(|| "Failed to update versions db.")?;
 
     let version_db =
         load_versions_db(paths).with_context(|| "`update` command failed to load versions db.")?;
@@ -136,7 +136,7 @@ pub fn run_command_update(channel: Option<String>, paths: &GlobalPaths) -> Resul
             }
         }
         Some(channel) => {
-            if !config_file.data.installed_channels.contains_key(&channel) {
+            if !config_file.data.installed_channels.contains_key(channel) {
                 bail!(
                     "'{}' cannot be updated because it is currently not installed.",
                     channel

src/command_update_version_db.rs

@@ -2,7 +2,7 @@ use crate::{global_paths::GlobalPaths, operations::update_version_db};
 use anyhow::{Context, Result};
 
 pub fn run_command_update_version_db(paths: &GlobalPaths) -> Result<()> {
-    update_version_db(paths).with_context(|| "Failed to update version db.")?;
+    update_version_db(&None, paths).with_context(|| "Failed to update version db.")?;
 
     Ok(())
 }

src/operations.rs

@@ -1413,7 +1413,7 @@ mod tests {
     }
 }
 
-pub fn update_version_db(paths: &GlobalPaths) -> Result<()> {
+pub fn update_version_db(channel: &Option<String>, paths: &GlobalPaths) -> Result<()> {
     eprintln!(
         "{} for new Julia versions",
         style("Checking").green().bold()
@@ -1462,7 +1462,7 @@ pub fn update_version_db(paths: &GlobalPaths) -> Result<()> {
         None => "release".to_string(),
     };
 
-    // TODO Figure out how we can learn about the correctn Juliaup channel here
+    // TODO Figure out how we can learn about the correct Juliaup channel here
     #[cfg(not(feature = "selfupdate"))]
     let juliaup_channel = "release".to_string();
 
@@ -1522,7 +1522,7 @@ pub fn update_version_db(paths: &GlobalPaths) -> Result<()> {
         delete_old_version_db = true;
     }
 
-    let direct_download_etags = download_direct_download_etags(&old_config_file.data)?;
+    let direct_download_etags = download_direct_download_etags(&channel, &old_config_file.data)?;
 
     let mut new_config_file = load_mut_config_db(paths).with_context(|| {
         "`run_command_update_version_db` command failed to load configuration db."
@@ -1624,6 +1624,7 @@ where
 
 #[cfg(windows)]
 fn download_direct_download_etags(
+    channel: &Option<String>,
     config_data: &JuliaupConfig,
 ) -> Result<Vec<(String, Option<String>)>> {
     use windows::core::HSTRING;
@@ -1636,8 +1637,15 @@ fn download_direct_download_etags(
 
     let mut requests = Vec::new();
 
-    for (channel_name, channel) in &config_data.installed_channels {
-        if let JuliaupConfigChannel::DirectDownloadChannel { url, .. } = channel {
+    for (channel_name, installed_channel) in &config_data.installed_channels {
+        if let Some(chan) = channel{
+            // TODO: convert to an if-let chain once stabilized https://github.com/rust-lang/rust/pull/132833
+            if chan != channel_name {
+                continue;
+            }
+        }
+
+        if let JuliaupConfigChannel::DirectDownloadChannel { url, .. } = installed_channel {
             let http_client = http_client.clone();
             let url_clone = url.clone();
             let channel_name_clone = channel_name.clone();
@@ -1691,6 +1699,7 @@ fn download_direct_download_etags(
 
 #[cfg(not(windows))]
 fn download_direct_download_etags(
+    channel: &Option<String>,
     config_data: &JuliaupConfig,
 ) -> Result<Vec<(String, Option<String>)>> {
     use std::sync::Arc;
@@ -1699,8 +1708,15 @@ fn download_direct_download_etags(
 
     let mut requests = Vec::new();
 
-    for (channel_name, channel) in &config_data.installed_channels {
-        if let JuliaupConfigChannel::DirectDownloadChannel { url, .. } = channel {
+    for (channel_name, installed_channel) in &config_data.installed_channels {
+        if let Some(chan) = channel{
+            // TODO: convert to an if-let chain once stabilized https://github.com/rust-lang/rust/pull/132833
+            if chan != channel_name {
+                continue;
+            }
+        }
+
+        if let JuliaupConfigChannel::DirectDownloadChannel { url, .. } = installed_channel {
             let client = Arc::clone(&client);
             let url_clone = url.clone();
             let channel_name_clone = channel_name.clone();