From d02cf98c607eeb83855c8b9213e71712864410dd Mon Sep 17 00:00:00 2001
From: jb-alvarado <jb@pixelcrusher.de>
Date: Tue, 17 May 2022 21:45:35 +0200
Subject: [PATCH] lock only ones

---
 src/input/folder.rs | 15 ++++++++-------
 src/main.rs         |  6 ++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/input/folder.rs b/src/input/folder.rs
index 3172922a..00ee60a4 100644
--- a/src/input/folder.rs
+++ b/src/input/folder.rs
@@ -93,20 +93,21 @@ impl FolderSource {
 
     fn shuffle(&mut self) {
         let mut rng = thread_rng();
-        self.nodes.lock().unwrap().shuffle(&mut rng);
+        let mut nodes = self.nodes.lock().unwrap();
 
-        for (index, item) in self.nodes.lock().unwrap().iter_mut().enumerate() {
+        nodes.shuffle(&mut rng);
+
+        for (index, item) in nodes.iter_mut().enumerate() {
             item.index = Some(index);
         }
     }
 
     fn sort(&mut self) {
-        self.nodes
-            .lock()
-            .unwrap()
-            .sort_by(|d1, d2| d1.source.cmp(&d2.source));
+        let mut nodes = self.nodes.lock().unwrap();
 
-        for (index, item) in self.nodes.lock().unwrap().iter_mut().enumerate() {
+        nodes.sort_by(|d1, d2| d1.source.cmp(&d2.source));
+
+        for (index, item) in nodes.iter_mut().enumerate() {
             item.index = Some(index);
         }
     }
diff --git a/src/main.rs b/src/main.rs
index 13f3ea5f..1b4450ef 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -103,8 +103,10 @@ fn main() {
         player(&config, play_control, playout_stat, proc_control);
     }
 
-    if messages.lock().unwrap().len() > 0 {
-        send_mail(&config, messages.lock().unwrap().join("\n"));
+    let msg = messages.lock().unwrap();
+
+    if msg.len() > 0 {
+        send_mail(&config, msg.join("\n"));
     }
 
     info!("Playout done...");