src/main.rs

@@ -109,27 +109,24 @@ async fn download_multiple(args: CLIArgs, raw_urls: Vec<String>) -> Result<()> {
 }
 
 async fn download_job(urls: SyncQueue, reporter: UnboundedSender<DlReport>, cli_args: CLIArgs) {
-    // The mutex access must be in its own scope to ensure that the lock is dropped
+    while let Some(dlreq) = urls.lock().await.pop_front() {
-    while let Some(dlreq) = {
-        let mut urls = urls.lock().await;
-        urls.pop_front().take()
-    } {
-        println!("Downloading {}", dlreq.url);
         let reporter = DlReporter::new(dlreq.id as u32, reporter.clone());
 
         // Resolve the zippy url to the direct download url if necessary
         let url = match is_integrated_url(&dlreq.url) {
-            Some(service) => match resolve_integrated_url(&dlreq.url, service).await {
+            Some(service) => {
-                Ok(url) => url,
+                match resolve_integrated_url(&dlreq.url, service).await {
-                Err(_e) => {
+                    Ok(url) => url,
-                    report_msg!(
+                    Err(_e) => {
-                        reporter,
+                        report_msg!(
-                        "Zippyshare link could not be resolved, skipping: {}",
+                            reporter,
-                        dlreq.url
+                            "Zippyshare link could not be resolved, skipping: {}",
-                    );
+                            dlreq.url
-                    continue;
+                        );
+                        continue;
+                    }
                 }
-            },
+            }
             None => dlreq.url,
         };