From ffdfb37f9d754b14dde32861065be7d24433038c Mon Sep 17 00:00:00 2001
From: hodasemi <superschneider@t-online.de>
Date: Sat, 17 Nov 2018 19:59:10 +0100
Subject: [PATCH] Fix outputs

---
 src/player/commands/list.rs | 8 +++++++-
 src/player/mediadata.rs     | 6 ++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/player/commands/list.rs b/src/player/commands/list.rs
index 4ca98bc..f092393 100644
--- a/src/player/commands/list.rs
+++ b/src/player/commands/list.rs
@@ -34,8 +34,14 @@ impl serenity::framework::standard::Command for List {
                 if playlist.len() == 1 { "song" } else { "songs" }
             );
 
+            let max_output = 15;
+
             for (i, song) in playlist.iter().enumerate() {
-                output += &format!("\t{}.\t{}\n", i + 1, song.name.clone());
+                if i < max_output {
+                    output += &format!("\t{}.\t{}\n", i + 1, song.name.clone());
+                } else {
+                    output += &format!("\t... and {} more", playlist.len() - max_output);
+                }
             }
         }
 
diff --git a/src/player/mediadata.rs b/src/player/mediadata.rs
index 1bb704f..c21c647 100644
--- a/src/player/mediadata.rs
+++ b/src/player/mediadata.rs
@@ -193,10 +193,10 @@ impl MediaData {
             if playlist.is_empty() {
                 return false;
             } else {
-                let first = playlist.remove(0);
-
                 handler.stop();
 
+                let first = playlist.remove(0);
+
                 let source = match ffmpeg(first.name.clone()) {
                     Ok(mpeg) => mpeg,
                     Err(_) => {
@@ -216,8 +216,6 @@ impl MediaData {
 
         return false;
     }
-
-    fn set_song() {}
 }
 
 impl Default for MediaData {