Merge pull request #135 from wallabra/feat/cfg-parallel-download

feat(config): Add global configuration option to set a limit on parallel downloads

Author: ccgauche

crates/download-manager/src/lib.rs

@@ -22,16 +22,18 @@ pub enum DownloadManagerMessage {
 pub struct DownloadManager {
     database: &'static YTLocalDatabase,
     cache_dir: PathBuf,
+    parallel_downloads: u16,
     handles: Mutex<Vec<JoinHandle<()>>>,
     download_list: Mutex<VecDeque<YoutubeMusicVideoRef>>,
     in_download: Mutex<HashSet<String>>,
 }
 
 impl DownloadManager {
-    pub fn new(cache_dir: PathBuf, database: &'static YTLocalDatabase) -> Self {
+    pub fn new(cache_dir: PathBuf, database: &'static YTLocalDatabase, parallel_downloads: u16) -> Self {
         Self {
             database,
             cache_dir,
+            parallel_downloads,
             handles: Mutex::new(Vec::new()),
             download_list: Mutex::new(VecDeque::new()),
             in_download: Mutex::new(HashSet::new()),
@@ -78,7 +80,7 @@ impl DownloadManager {
         cancelation: impl Future<Output = ()> + Clone + Send + 'static,
         sender: MessageHandler,
     ) {
-        for _ in 0..DOWNLOADER_COUNT {
+        for _ in 0..self.parallel_downloads {
             self.run_service_stream(cancelation.clone(), sender.clone());
         }
     }
@@ -111,5 +113,3 @@ impl DownloadManager {
         list.extend(to_add);
     }
 }
-
-const DOWNLOADER_COUNT: usize = 4;

crates/ytermusic/src/config.rs

@@ -6,7 +6,14 @@ use crate::utils::get_project_dirs;
 
 #[derive(Debug, Default, Deserialize, Serialize)]
 #[non_exhaustive]
-pub struct GlobalConfig {}
+pub struct GlobalConfig {
+    /// Maximum number of parallel downloads.
+    /// If your downloads are failing, try lowering
+    /// this.
+    /// Default value is 4.
+    #[serde(default = "parallel_downloads")]
+    pub parallel_downloads: u16,
+}
 
 #[derive(Debug, Deserialize, Serialize)]
 #[non_exhaustive]
@@ -94,6 +101,10 @@ fn default_error_style() -> Style {
     Style::default().fg(Color::Red)
 }
 
+fn parallel_downloads() -> u16 {
+    4
+}
+
 fn default_false() -> bool {
     false
 }

crates/ytermusic/src/systems/mod.rs

@@ -1,10 +1,18 @@
 use download_manager::DownloadManager;
 use once_cell::sync::Lazy;
 
-use crate::{consts::CACHE_DIR, DATABASE};
+use crate::{
+    consts::{CACHE_DIR, CONFIG},
+    DATABASE,
+};
 
 pub mod logger;
 pub mod player;
 
-pub static DOWNLOAD_MANAGER: Lazy<DownloadManager> =
-    Lazy::new(|| DownloadManager::new(CACHE_DIR.to_path_buf(), &DATABASE));
+pub static DOWNLOAD_MANAGER: Lazy<DownloadManager> = Lazy::new(|| {
+    DownloadManager::new(
+        CACHE_DIR.to_path_buf(),
+        &DATABASE,
+        CONFIG.global.parallel_downloads,
+    )
+});