Simplify semaphore

Author: theRookieCoder

src/cli.rs

@@ -1,6 +1,6 @@
 #![deny(missing_docs)]
 
-use crate::DEFAULT_PARALLEL_NETWORK;
+use crate::DEFAULT_PARALLEL_TASKS;
 use clap::{Args, Parser, Subcommand, ValueEnum, ValueHint};
 use clap_complete::Shell;
 use libium::config::{
@@ -18,9 +18,9 @@ pub struct Ferium {
     /// You can also use the environment variable `TOKIO_WORKER_THREADS`.
     #[clap(long, short)]
     pub threads: Option<usize>,
-    /// Specify the maximum number of parallel network requests to perform.
-    #[clap(long, short = 'p', default_value_t = DEFAULT_PARALLEL_NETWORK)]
-    pub parallel_network: usize,
+    /// Specify the maximum number of simultaneous parallel tasks.
+    #[clap(long, short = 'p', default_value_t = DEFAULT_PARALLEL_TASKS)]
+    pub parallel_tasks: usize,
     /// Set a GitHub personal access token for increasing the GitHub API rate limit.
     #[clap(long, visible_alias = "gh", env = "GITHUB_TOKEN")]
     pub github_token: Option<String>,

src/download.rs

@@ -1,4 +1,4 @@
-use crate::{DEFAULT_PARALLEL_NETWORK, SEMAPHORE, STYLE_BYTE, TICK};
+use crate::{default_semaphore, SEMAPHORE, STYLE_BYTE, TICK};
 use anyhow::{anyhow, bail, Error, Result};
 use colored::Colorize as _;
 use fs_extra::{
@@ -15,7 +15,7 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-use tokio::{sync::Semaphore, task::JoinSet};
+use tokio::task::JoinSet;
 
 /// Check the given `directory`
 ///
@@ -118,10 +118,7 @@ pub async fn download(
         let output_dir = output_dir.clone();
 
         tasks.spawn(async move {
-            let _permit = SEMAPHORE
-                .get_or_init(|| Semaphore::new(DEFAULT_PARALLEL_NETWORK))
-                .acquire()
-                .await?;
+            let _permit = SEMAPHORE.get_or_init(default_semaphore).acquire().await?;
 
             let (length, filename) = downloadable
                 .download(client, &output_dir, |additional| {

src/main.rs

@@ -44,12 +44,17 @@ use std::{
     process::ExitCode,
     sync::{LazyLock, OnceLock},
 };
+use tokio::sync::Semaphore;
 
 const CROSS: &str = "×";
 static TICK: LazyLock<ColoredString> = LazyLock::new(|| "✓".green());
 
-pub static SEMAPHORE: OnceLock<tokio::sync::Semaphore> = OnceLock::new();
-pub const DEFAULT_PARALLEL_NETWORK: usize = 50;
+pub const DEFAULT_PARALLEL_TASKS: usize = 50;
+pub static SEMAPHORE: OnceLock<Semaphore> = OnceLock::new();
+#[must_use]
+pub const fn default_semaphore() -> Semaphore {
+    Semaphore::const_new(DEFAULT_PARALLEL_TASKS)
+}
 
 /// Indicatif themes
 #[expect(clippy::expect_used)]
@@ -149,7 +154,8 @@ async fn actual_main(mut cli_app: Ferium) -> Result<()> {
             set_var("CURSEFORGE_API_KEY", key);
         }
     }
-    let _ = SEMAPHORE.set(tokio::sync::Semaphore::new(cli_app.parallel_network));
+
+    let _ = SEMAPHORE.set(Semaphore::new(cli_app.parallel_tasks));
 
     let config_path = &cli_app
         .config_file

src/subcommands/upgrade.rs

@@ -1,6 +1,7 @@
 use crate::{
+    default_semaphore,
     download::{clean, download},
-    CROSS, DEFAULT_PARALLEL_NETWORK, SEMAPHORE, STYLE_NO, TICK,
+    CROSS, SEMAPHORE, STYLE_NO, TICK,
 };
 use anyhow::{anyhow, bail, Result};
 use colored::Colorize as _;
@@ -19,7 +20,7 @@ use std::{
     sync::{mpsc, Arc},
     time::Duration,
 };
-use tokio::{sync::Semaphore, task::JoinSet};
+use tokio::task::JoinSet;
 
 /// Get the latest compatible downloadable for the mods in `profile`
 ///
@@ -76,10 +77,7 @@ pub async fn get_platform_downloadables(profile: &Profile) -> Result<(Vec<Downlo
             let progress_bar = Arc::clone(&progress_bar);
 
             tasks.spawn(async move {
-                let permit = SEMAPHORE
-                    .get_or_init(|| Semaphore::new(DEFAULT_PARALLEL_NETWORK))
-                    .acquire()
-                    .await?;
+            let permit = SEMAPHORE.get_or_init(default_semaphore).acquire().await?;
 
                 let result = mod_.fetch_download_file(filters).await;
 

src/tests.rs

@@ -15,7 +15,7 @@ use std::{
 const DEFAULT: Ferium = Ferium {
     subcommand: SubCommands::Profile { subcommand: None },
     threads: None,
-    parallel_network: 10,
+    parallel_tasks: 10,
     github_token: None,
     curseforge_api_key: None,
     config_file: None,