From b79192328dac5b06aed2e7802ff76963c4fe465d Mon Sep 17 00:00:00 2001
From: MrDulfin <dulfinaminator@gmail.com>
Date: Sun, 2 Jun 2024 17:30:16 -0400
Subject: [PATCH 01/10] First Commit

---
 .gitignore    |   1 +
 Cargo.lock    |  72 +++++++++
 Cargo.toml    |  10 ++
 src/error.rs  |  13 ++
 src/lib.rs    | 415 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/traits.rs |   3 +
 6 files changed, 514 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 Cargo.lock
 create mode 100644 Cargo.toml
 create mode 100644 src/error.rs
 create mode 100644 src/lib.rs
 create mode 100644 src/traits.rs

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..dd4b522
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,72 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "kushi"
+version = "0.1.0"
+dependencies = [
+ "thiserror",
+ "uuid",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "uuid"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..6907d9f
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "kushi"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+thiserror = "1.0.61"
+uuid = "1.8.0"
diff --git a/src/error.rs b/src/error.rs
new file mode 100644
index 0000000..b81f78f
--- /dev/null
+++ b/src/error.rs
@@ -0,0 +1,13 @@
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum QueueError {
+    #[error("Index out of bounds! Index {index} is over len {len}")]
+    OutOfBounds { index: usize, len: usize },
+    #[error("The Queue is empty!")]
+    EmptyQueue,
+    #[error("There are no past played songs!")]
+    EmptyPlayed,
+    #[error("There is no item after this in the Queue")]
+    NoNext,
+}
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..23c25f9
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,415 @@
+use std::fmt::Debug;
+
+use error::QueueError;
+use traits::{Location, TrackGroup};
+
+pub mod error;
+pub mod traits;
+
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub enum QueueState {
+    Played,
+    First,
+    AddHere,
+    NoState,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+#[non_exhaustive]
+pub struct QueueItem<
+    T: Debug + Clone + PartialEq, // T: The Singular Item Type
+    U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
+    L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful
+> {
+    pub(crate) item: QueueItemType<T, U>,
+    pub(crate) state: QueueState,
+    pub(crate) source: Option<L>,
+    pub(crate) by_human: bool,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+#[non_exhaustive]
+pub enum QueueItemType<
+    T: Debug + Clone + PartialEq, // T: The Singular Item Type
+    U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
+> {
+    Single(T),
+    Multi(U)
+}
+
+impl<
+    T: Debug + Clone + PartialEq,
+    U: Debug + PartialEq + Clone + TrackGroup,
+    L: Debug + PartialEq + Clone + Copy + Location
+>
+QueueItem<T, U, L> {
+    pub fn from_item_type(item: QueueItemType<T, U>, source: Option<L>) -> Self {
+        QueueItem {
+            item: item,
+            state: QueueState::NoState,
+            source,
+            by_human: false,
+        }
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct Queue<
+    T: Debug + Clone + PartialEq, // T: The Singular Item Type
+    U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
+    L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful
+> {
+    pub items: Vec<QueueItem<T, U, L>>,
+    pub played: Vec<QueueItem<T, U, L>>,
+    pub loop_: bool,
+    pub shuffle: Option<Vec<usize>>,
+}
+
+// TODO: HAndle the First QueueState[looping] and shuffle
+impl<
+    T: Debug + Clone + PartialEq,
+    U: Debug + PartialEq + Clone + TrackGroup,
+    L: Debug + PartialEq + Clone + Copy + Location
+> Queue<T, U, L> {
+    fn has_addhere(&self) -> bool {
+        for item in &self.items {
+            if item.state == QueueState::AddHere {
+                return true;
+            }
+        }
+        false
+    }
+
+    #[allow(unused)]
+    pub(crate) fn dbg_items(&self) {
+        dbg!(
+            self.items
+                .iter()
+                .map(|item| (&item.item, item.state))
+                .collect::<Vec<(&QueueItemType<T, U>, QueueState)>>(),
+            self.items.len()
+        );
+    }
+
+    pub fn set_items(&mut self, tracks: Vec<QueueItem<T, U, L>>) {
+        let mut tracks = tracks;
+        self.items.clear();
+        self.items.append(&mut tracks);
+    }
+
+    /// Inserts an item after the AddHere item
+    pub fn add_item(&mut self, item: QueueItemType<T, U>, source: Option<L>, by_human: bool) {
+        let mut i: usize = 0;
+
+        self.items = self
+            .items
+            .iter()
+            .enumerate()
+            .map(|(j, item_)| {
+                let mut item_ = item_.to_owned();
+                // get the index of the current AddHere item and give it to i
+                if item_.state == QueueState::AddHere {
+                    i = j;
+                    item_.state = QueueState::NoState;
+                }
+                item_
+            })
+            .collect::<Vec<QueueItem<T, U, L>>>();
+
+        self.items.insert(
+            i + if self.items.is_empty() { 0 } else { 1 },
+            QueueItem {
+                item,
+                state: QueueState::AddHere,
+                source,
+                by_human,
+            },
+        );
+    }
+
+    /// Inserts an item after the currently playing item
+    pub fn add_item_next(&mut self, item: QueueItemType<T, U>, source: Option<L>) {
+        use QueueState::*;
+        let empty = self.items.is_empty();
+
+        self.items.insert(
+            if empty { 0 } else { 1 },
+            QueueItem {
+                item,
+                state: if (self.items.get(1).is_none()
+                    || !self.has_addhere() && self.items.get(1).is_some())
+                    || empty
+                {
+                    AddHere
+                } else {
+                    NoState
+                },
+                source,
+                by_human: true,
+            },
+        )
+    }
+
+    pub fn add_multi(&mut self, items: Vec<QueueItemType<T, U>>, source: Option<L>, by_human: bool) {
+        let mut i: usize = 0;
+
+        self.items = self
+            .items
+            .iter()
+            .enumerate()
+            .map(|(j, item_)| {
+                let mut item_ = item_.to_owned();
+                // get the index of the current AddHere item and give it to i
+                if item_.state == QueueState::AddHere {
+                    i = j;
+                    item_.state = QueueState::NoState;
+                }
+                item_
+            })
+            .collect::<Vec<QueueItem<T, U, L>>>();
+
+        let empty = self.items.is_empty();
+
+        let len = items.len();
+        for item in items.into_iter().rev() {
+            self.items.insert(
+                i + if empty { 0 } else { 1 },
+                QueueItem {
+                    item,
+                    state: QueueState::NoState,
+                    source,
+                    by_human,
+                },
+            );
+        }
+        self.items[i + len - if empty { 1 } else { 0 }].state = QueueState::AddHere;
+    }
+
+    /// Add multiple Items after the currently playing Item
+    pub fn add_multi_next(&mut self, items: Vec<QueueItemType<T, U>>, source: Option<L>) {
+        use QueueState::*;
+        let empty = self.items.is_empty();
+
+        let add_here = (self.items.get(1).is_none()
+            || !self.has_addhere() && self.items.get(1).is_some())
+            || empty;
+
+        let len = items.len();
+
+        for item in items {
+            self.items.insert(
+                if empty { 0 } else { 1 },
+                QueueItem {
+                    item,
+                    state: NoState,
+                    source,
+                    by_human: true,
+                },
+            )
+        }
+
+        if add_here {
+            self.items[len - if empty { 1 } else { 0 }].state = QueueState::AddHere;
+        }
+    }
+
+    pub fn remove_item(&mut self, remove_index: usize) -> Result<QueueItem<T, U, L>, QueueError> {
+        // dbg!(/*&remove_index, self.current_index(), &index,*/ &self.items[remove_index]);
+
+        if remove_index < self.items.len() {
+            // update the state of the next item to replace the item being removed
+            if self.items.get(remove_index + 1).is_some() {
+                self.items[remove_index + 1].state = self.items[remove_index].state;
+            }
+            Ok(self.items.remove(remove_index))
+        } else {
+            Err(QueueError::EmptyQueue)
+        }
+    }
+
+    pub fn insert(
+        &mut self,
+        index: usize,
+        new_item: QueueItemType<T, U>,
+        source: Option<L>,
+        addhere: bool,
+    ) -> Result<(), QueueError> {
+        if self.items.get_mut(index).is_none()
+            && index > 0
+            && self.items.get_mut(index - 1).is_none()
+        {
+            return Err(QueueError::OutOfBounds {
+                index,
+                len: self.items.len(),
+            });
+        }
+        if addhere {
+            let mut new_item = QueueItem::from_item_type(new_item, source);
+            for item in &mut self.items {
+                if item.state == QueueState::AddHere {
+                    item.state = QueueState::NoState
+                }
+            }
+            new_item.state = QueueState::AddHere;
+            self.items.insert(index, new_item);
+        } else {
+            let new_item = QueueItem::from_item_type(new_item, source);
+            self.items.insert(index, new_item);
+        }
+        Ok(())
+    }
+
+    pub fn clear(&mut self) {
+        self.items.clear();
+    }
+
+    pub fn clear_except(&mut self, index: usize) -> Result<(), QueueError> {
+        use QueueState::*;
+        let empty = self.items.is_empty();
+
+        if !empty && index < self.items.len() {
+            let i = self.items[index].clone();
+            self.items.retain(|item| *item == i);
+            self.items[0].state = AddHere;
+        } else if empty {
+            return Err(QueueError::EmptyQueue);
+        } else {
+            return Err(QueueError::OutOfBounds {
+                index,
+                len: self.items.len(),
+            });
+        }
+        Ok(())
+    }
+
+    pub fn clear_played(&mut self) {
+        self.played.clear();
+    }
+
+    pub fn clear_all(&mut self) {
+        self.items.clear();
+        self.played.clear();
+    }
+
+    pub fn move_to(&mut self, index: usize) -> Result<(), QueueError> {
+        use QueueState::*;
+
+
+
+        let empty = self.items.is_empty();
+
+        let index = if !empty {
+            index
+        } else {
+            return Err(QueueError::EmptyQueue);
+        };
+
+        if !empty && dbg!(index < self.items.len()) {
+            let to_item = self.items[index].clone();
+
+            if let QueueItemType::Multi(_) = to_item.item {
+                unimplemented!(); //TODO: Add logic for multi items
+            }
+
+            loop {
+                let empty = self.items.is_empty();
+                let item = self.items[0].item.to_owned();
+
+                if item != to_item.item && !empty {
+                    if self.items[0].state == AddHere && self.items.get(1).is_some() {
+                        self.items[1].state = AddHere;
+                    }
+                    let item = self.items.remove(0);
+                    self.played.push(item);
+
+                // dbg!(&to_item.item, &self.items[ind].item);
+                } else if empty {
+                    return Err(QueueError::EmptyQueue);
+                } else {
+                    break;
+                }
+            }
+        } else {
+            return Err(QueueError::EmptyQueue);
+        }
+        Ok(())
+    }
+
+    pub fn swap(&mut self, a: usize, b: usize) {
+        self.items.swap(a, b)
+    }
+
+    pub fn move_item(&mut self, from: usize, to: usize) {
+        let item = self.items[from].to_owned();
+        if from != to {
+            self.items.remove(from);
+        }
+        self.items.insert(to, item);
+    }
+
+    #[allow(clippy::should_implement_trait)]
+    pub fn next(&mut self) -> Result<&QueueItem<T, U, L>, QueueError> {
+        if self.items.is_empty() {
+            if self.loop_ {
+                unimplemented!() // TODO: add function to loop the queue
+            } else {
+                return Err(QueueError::EmptyQueue);
+            }
+        }
+
+        if self.items[0].state == QueueState::AddHere || !self.has_addhere() {
+            if let QueueItemType::Multi(_) = self.items[0].item {
+                unimplemented!(); // TODO: Handle Multi items here?
+            }
+
+            self.items[0].state = QueueState::NoState;
+            if self.items.get_mut(1).is_some() {
+                self.items[1].state = QueueState::AddHere;
+            }
+        }
+        let item = self.items.remove(0);
+        self.played.push(item);
+
+        if self.items.is_empty() {
+            Err(QueueError::NoNext)
+        } else {
+            Ok(&self.items[0])
+        }
+    }
+
+    pub fn prev(&mut self) -> Result<&QueueItem<T, U, L>, QueueError> {
+        if let Some(item) = self.played.pop() {
+            if item.state == QueueState::First && self.loop_ {
+                todo!()
+            }
+
+            if let QueueItemType::Multi(_) = self.items[0].item {
+                unimplemented!(); // TODO: Handle Multi items here?
+            } if let QueueItemType::Multi(_) = item.item {
+                unimplemented!(); // TODO: Handle Multi items here?
+            }
+
+            self.items.insert(0, item);
+            Ok(&self.items[0])
+        } else {
+            Err(QueueError::EmptyPlayed)
+        }
+    }
+
+    pub fn current(&self) -> Result<&QueueItem<T, U, L>, QueueError> {
+        if !self.items.is_empty() {
+            if let QueueItemType::Multi(_) = self.items[0].item {
+                unimplemented!(); // TODO: Handle Multi items here?
+            }
+            Ok(&self.items[0])
+        } else {
+            Err(QueueError::EmptyQueue)
+        }
+    }
+
+    pub fn check_played(&mut self, limit: usize) {
+        while self.played.len() > limit {
+            self.played.remove(0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/traits.rs b/src/traits.rs
new file mode 100644
index 0000000..306fc19
--- /dev/null
+++ b/src/traits.rs
@@ -0,0 +1,3 @@
+pub trait TrackGroup {}
+
+pub trait Location {}
\ No newline at end of file

From d6c3b7c3b71f1a90e62149cdbc609ebca122d1b3 Mon Sep 17 00:00:00 2001
From: MrDulfin <dulfinaminator@gmail.com>
Date: Sun, 2 Jun 2024 19:09:17 -0400
Subject: [PATCH 02/10] manual merge from master

---
 Cargo.toml | 9 ++++++++-
 README.md  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 README.md

diff --git a/Cargo.toml b/Cargo.toml
index 6907d9f..3c3d56a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,9 +2,16 @@
 name = "kushi"
 version = "0.1.0"
 edition = "2021"
+description = "A queue built for the Dango Music Player and Oden"
+readme = "README.md"
+homepage = "https://github.com/Dangoware/kushi-queue"
+repository = "https://github.com/Dangoware/kushi-queue"
+license = "MIT OR Apache-2.0"
+keywords = ["queue","music","vec", "dmp"]
+categories = ["data-structures"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 thiserror = "1.0.61"
-uuid = "1.8.0"
+uuid = "1.8.0"
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..bdd90d5
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+a queue built for the [Dango Music Player](https://github.com/Dangoware/dango-music-player) and [Oden](https://github.com/Dangoware/oden)[Discord Music Bot]
\ No newline at end of file

From 1f831f4f6d935ed9efc129445540db08cda7e70a Mon Sep 17 00:00:00 2001
From: MrDulfin <dulfinaminator@gmail.com>
Date: Sun, 2 Jun 2024 19:15:51 -0400
Subject: [PATCH 03/10] updated dependencies

---
 Cargo.lock | 7 -------
 Cargo.toml | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dd4b522..d1b2823 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,7 +7,6 @@ name = "kushi"
 version = "0.1.0"
 dependencies = [
  "thiserror",
- "uuid",
 ]
 
 [[package]]
@@ -64,9 +63,3 @@ name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "uuid"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
diff --git a/Cargo.toml b/Cargo.toml
index 3c3d56a..b9b4367 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,5 +13,4 @@ categories = ["data-structures"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-thiserror = "1.0.61"
-uuid = "1.8.0"
\ No newline at end of file
+thiserror = "1.0.61"
\ No newline at end of file

From 9c0c787229983be22d2cf2999f814073661a241d Mon Sep 17 00:00:00 2001
From: MrDulfin <mrdulfin@mrdulfin.com>
Date: Sun, 2 Jun 2024 19:27:06 -0400
Subject: [PATCH 04/10] fixed warnings

---
 Cargo.toml | 10 +++++-----
 src/lib.rs |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b9b4367..89a6498 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "kushi"
 version = "0.1.0"
-edition = "2021"
-description = "A queue built for the Dango Music Player and Oden"
-readme = "README.md"
-homepage = "https://github.com/Dangoware/kushi-queue"
-repository = "https://github.com/Dangoware/kushi-queue"
 license = "MIT OR Apache-2.0"
+description = "A queue built for the Dango Music Player and Oden"
+homepage = "https://github.com/Dangoware/kushi-queue"
+edition = "2021"
+readme = "README.md"
+repository = "https://github.com/Dangoware/kushi-queue"
 keywords = ["queue","music","vec", "dmp"]
 categories = ["data-structures"]
 
diff --git a/src/lib.rs b/src/lib.rs
index 23c25f9..3a1d149 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,7 +45,7 @@ impl<
 QueueItem<T, U, L> {
     pub fn from_item_type(item: QueueItemType<T, U>, source: Option<L>) -> Self {
         QueueItem {
-            item: item,
+            item,
             state: QueueState::NoState,
             source,
             by_human: false,

From d094ee734b96804293840874a12dc8545df2bfa0 Mon Sep 17 00:00:00 2001
From: MrDulfin <mrdulfin@mrdulfin.com>
Date: Sun, 2 Jun 2024 19:57:15 -0400
Subject: [PATCH 05/10] updaated 'Oden' to 'Oden Music Bot'

---
 Cargo.toml | 2 +-
 README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 89a6498..200f8b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "kushi"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
-description = "A queue built for the Dango Music Player and Oden"
+description = "A queue built for the Dango Music Player and Oden Music Bot"
 homepage = "https://github.com/Dangoware/kushi-queue"
 edition = "2021"
 readme = "README.md"
diff --git a/README.md b/README.md
index bdd90d5..51f97ba 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-a queue built for the [Dango Music Player](https://github.com/Dangoware/dango-music-player) and [Oden](https://github.com/Dangoware/oden)[Discord Music Bot]
\ No newline at end of file
+a queue built for the [Dango Music Player](https://github.com/Dangoware/dango-music-player) and [Oden Music Bot](https://github.com/Dangoware/oden-music-bot)
\ No newline at end of file

From ee0d4ee0d0baf0a9b612af7192381ed2d3d43e0a Mon Sep 17 00:00:00 2001
From: MrDulfin <mrdulfin@mrdulfin.com>
Date: Sun, 2 Jun 2024 22:46:29 -0400
Subject: [PATCH 06/10] Added functions to create QueueItemType

---
 src/lib.rs | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 3a1d149..236ef57 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,10 +21,10 @@ pub struct QueueItem<
     U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
     L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful
 > {
-    pub(crate) item: QueueItemType<T, U>,
-    pub(crate) state: QueueState,
-    pub(crate) source: Option<L>,
-    pub(crate) by_human: bool,
+    pub item: QueueItemType<T, U>,
+    pub state: QueueState,
+    pub source: Option<L>,
+    pub by_human: bool,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -37,6 +37,20 @@ pub enum QueueItemType<
     Multi(U)
 }
 
+impl<
+    T: Debug + Clone + PartialEq, // T: The Singular Item Type
+    U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
+> QueueItemType<T, U>  {
+    pub fn from_single(item: T) -> Self {
+        QueueItemType::Single(item)
+    }
+
+    pub fn from_multi(item: U) -> Self {
+        QueueItemType::Multi(item)
+    }
+}
+
+
 impl<
     T: Debug + Clone + PartialEq,
     U: Debug + PartialEq + Clone + TrackGroup,
@@ -91,6 +105,15 @@ impl<
         );
     }
 
+    pub fn new(loop_: bool, shuffle: Option<Vec<usize>>) -> Self {
+        Queue {
+            items: Vec::new(),
+            played: Vec::new(),
+            loop_,
+            shuffle
+        }
+    }
+
     pub fn set_items(&mut self, tracks: Vec<QueueItem<T, U, L>>) {
         let mut tracks = tracks;
         self.items.clear();
@@ -98,7 +121,8 @@ impl<
     }
 
     /// Inserts an item after the AddHere item
-    pub fn add_item(&mut self, item: QueueItemType<T, U>, source: Option<L>, by_human: bool) {
+    pub fn add_item(&mut self, item: T, source: Option<L>, by_human: bool) {
+        let item = QueueItemType::from_single(item);
         let mut i: usize = 0;
 
         self.items = self
@@ -128,7 +152,8 @@ impl<
     }
 
     /// Inserts an item after the currently playing item
-    pub fn add_item_next(&mut self, item: QueueItemType<T, U>, source: Option<L>) {
+    pub fn add_item_next(&mut self, item: T, source: Option<L>) {
+        let item = QueueItemType::from_single(item);
         use QueueState::*;
         let empty = self.items.is_empty();
 

From 40add98adc27c532de3f70ea66bf46850a8c811c Mon Sep 17 00:00:00 2001
From: MrDulfin <mrdulfin@mrdulfin.com>
Date: Sun, 2 Jun 2024 22:47:28 -0400
Subject: [PATCH 07/10] updated package version

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1b2823..7f08880 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "kushi"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "thiserror",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 200f8b8..bcef6f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kushi"
-version = "0.1.0"
+version = "0.1.1"
 license = "MIT OR Apache-2.0"
 description = "A queue built for the Dango Music Player and Oden Music Bot"
 homepage = "https://github.com/Dangoware/kushi-queue"

From c41044f53f2813204dedfa28e9cd235af09cf917 Mon Sep 17 00:00:00 2001
From: MrDulfin <mrdulfin@mrdulfin.com>
Date: Sat, 29 Jun 2024 14:32:03 -0400
Subject: [PATCH 08/10] Changed the TrackGroup trait to IntoIterator

---
 Cargo.toml    |  2 +-
 src/lib.rs    | 17 +++++++++--------
 src/traits.rs |  3 ---
 3 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 src/traits.rs

diff --git a/Cargo.toml b/Cargo.toml
index bcef6f2..be9ba3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kushi"
-version = "0.1.1"
+version = "0.1.2"
 license = "MIT OR Apache-2.0"
 description = "A queue built for the Dango Music Player and Oden Music Bot"
 homepage = "https://github.com/Dangoware/kushi-queue"
diff --git a/src/lib.rs b/src/lib.rs
index 236ef57..4e67e5f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,10 +1,11 @@
 use std::fmt::Debug;
 
 use error::QueueError;
-use traits::{Location, TrackGroup};
+
 
 pub mod error;
-pub mod traits;
+
+pub trait Location {}
 
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub enum QueueState {
@@ -18,7 +19,7 @@ pub enum QueueState {
 #[non_exhaustive]
 pub struct QueueItem<
     T: Debug + Clone + PartialEq, // T: The Singular Item Type
-    U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
+    U: Debug + PartialEq + Clone + IntoIterator, // U: an Iterator
     L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful
 > {
     pub item: QueueItemType<T, U>,
@@ -31,7 +32,7 @@ pub struct QueueItem<
 #[non_exhaustive]
 pub enum QueueItemType<
     T: Debug + Clone + PartialEq, // T: The Singular Item Type
-    U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
+    U: Debug + PartialEq + Clone + IntoIterator, // U: The Multi-Item Type. Needs to be tracked as multiple items
 > {
     Single(T),
     Multi(U)
@@ -39,7 +40,7 @@ pub enum QueueItemType<
 
 impl<
     T: Debug + Clone + PartialEq, // T: The Singular Item Type
-    U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
+    U: Debug + PartialEq + Clone + IntoIterator, // U: The Multi-Item Type. Needs to be tracked as multiple items
 > QueueItemType<T, U>  {
     pub fn from_single(item: T) -> Self {
         QueueItemType::Single(item)
@@ -53,7 +54,7 @@ impl<
 
 impl<
     T: Debug + Clone + PartialEq,
-    U: Debug + PartialEq + Clone + TrackGroup,
+    U: Debug + PartialEq + Clone + IntoIterator,
     L: Debug + PartialEq + Clone + Copy + Location
 >
 QueueItem<T, U, L> {
@@ -70,7 +71,7 @@ QueueItem<T, U, L> {
 #[derive(Debug, Default)]
 pub struct Queue<
     T: Debug + Clone + PartialEq, // T: The Singular Item Type
-    U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
+    U: Debug + PartialEq + Clone + IntoIterator, // U: The Multi-Item Type. Needs to be tracked as multiple items
     L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful
 > {
     pub items: Vec<QueueItem<T, U, L>>,
@@ -82,7 +83,7 @@ pub struct Queue<
 // TODO: HAndle the First QueueState[looping] and shuffle
 impl<
     T: Debug + Clone + PartialEq,
-    U: Debug + PartialEq + Clone + TrackGroup,
+    U: Debug + PartialEq + Clone + IntoIterator,
     L: Debug + PartialEq + Clone + Copy + Location
 > Queue<T, U, L> {
     fn has_addhere(&self) -> bool {
diff --git a/src/traits.rs b/src/traits.rs
deleted file mode 100644
index 306fc19..0000000
--- a/src/traits.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub trait TrackGroup {}
-
-pub trait Location {}
\ No newline at end of file

From 8b0e77cfca37435b868588e3597ba5ba08ae5646 Mon Sep 17 00:00:00 2001
From: MrDulfin <mrdulfin@mrdulfin.com>
Date: Sun, 7 Jul 2024 19:08:51 -0400
Subject: [PATCH 09/10] Removed error mod and all Location generics and trait

---
 Cargo.lock   |  2 +-
 src/error.rs | 13 ----------
 src/lib.rs   | 71 +++++++++++++++++++++++++---------------------------
 3 files changed, 35 insertions(+), 51 deletions(-)
 delete mode 100644 src/error.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7f08880..6fb9e46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "kushi"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "thiserror",
 ]
diff --git a/src/error.rs b/src/error.rs
deleted file mode 100644
index b81f78f..0000000
--- a/src/error.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum QueueError {
-    #[error("Index out of bounds! Index {index} is over len {len}")]
-    OutOfBounds { index: usize, len: usize },
-    #[error("The Queue is empty!")]
-    EmptyQueue,
-    #[error("There are no past played songs!")]
-    EmptyPlayed,
-    #[error("There is no item after this in the Queue")]
-    NoNext,
-}
diff --git a/src/lib.rs b/src/lib.rs
index 4e67e5f..6120c32 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,12 +1,5 @@
 use std::fmt::Debug;
 
-use error::QueueError;
-
-
-pub mod error;
-
-pub trait Location {}
-
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub enum QueueState {
     Played,
@@ -20,11 +13,9 @@ pub enum QueueState {
 pub struct QueueItem<
     T: Debug + Clone + PartialEq, // T: The Singular Item Type
     U: Debug + PartialEq + Clone + IntoIterator, // U: an Iterator
-    L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful
 > {
     pub item: QueueItemType<T, U>,
     pub state: QueueState,
-    pub source: Option<L>,
     pub by_human: bool,
 }
 
@@ -55,14 +46,12 @@ impl<
 impl<
     T: Debug + Clone + PartialEq,
     U: Debug + PartialEq + Clone + IntoIterator,
-    L: Debug + PartialEq + Clone + Copy + Location
 >
-QueueItem<T, U, L> {
-    pub fn from_item_type(item: QueueItemType<T, U>, source: Option<L>) -> Self {
+QueueItem<T, U> {
+    pub fn from_item_type(item: QueueItemType<T, U>) -> Self {
         QueueItem {
             item,
             state: QueueState::NoState,
-            source,
             by_human: false,
         }
     }
@@ -72,10 +61,9 @@ QueueItem<T, U, L> {
 pub struct Queue<
     T: Debug + Clone + PartialEq, // T: The Singular Item Type
     U: Debug + PartialEq + Clone + IntoIterator, // U: The Multi-Item Type. Needs to be tracked as multiple items
-    L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful
 > {
-    pub items: Vec<QueueItem<T, U, L>>,
-    pub played: Vec<QueueItem<T, U, L>>,
+    pub items: Vec<QueueItem<T, U>>,
+    pub played: Vec<QueueItem<T, U>>,
     pub loop_: bool,
     pub shuffle: Option<Vec<usize>>,
 }
@@ -84,8 +72,7 @@ pub struct Queue<
 impl<
     T: Debug + Clone + PartialEq,
     U: Debug + PartialEq + Clone + IntoIterator,
-    L: Debug + PartialEq + Clone + Copy + Location
-> Queue<T, U, L> {
+> Queue<T, U> {
     fn has_addhere(&self) -> bool {
         for item in &self.items {
             if item.state == QueueState::AddHere {
@@ -115,14 +102,14 @@ impl<
         }
     }
 
-    pub fn set_items(&mut self, tracks: Vec<QueueItem<T, U, L>>) {
+    pub fn set_items(&mut self, tracks: Vec<QueueItem<T, U>>) {
         let mut tracks = tracks;
         self.items.clear();
         self.items.append(&mut tracks);
     }
 
     /// Inserts an item after the AddHere item
-    pub fn add_item(&mut self, item: T, source: Option<L>, by_human: bool) {
+    pub fn add_item(&mut self, item: T, by_human: bool) {
         let item = QueueItemType::from_single(item);
         let mut i: usize = 0;
 
@@ -139,21 +126,20 @@ impl<
                 }
                 item_
             })
-            .collect::<Vec<QueueItem<T, U, L>>>();
+            .collect::<Vec<QueueItem<T, U>>>();
 
         self.items.insert(
             i + if self.items.is_empty() { 0 } else { 1 },
             QueueItem {
                 item,
                 state: QueueState::AddHere,
-                source,
                 by_human,
             },
         );
     }
 
     /// Inserts an item after the currently playing item
-    pub fn add_item_next(&mut self, item: T, source: Option<L>) {
+    pub fn add_item_next(&mut self, item: T) {
         let item = QueueItemType::from_single(item);
         use QueueState::*;
         let empty = self.items.is_empty();
@@ -170,13 +156,12 @@ impl<
                 } else {
                     NoState
                 },
-                source,
                 by_human: true,
             },
         )
     }
 
-    pub fn add_multi(&mut self, items: Vec<QueueItemType<T, U>>, source: Option<L>, by_human: bool) {
+    pub fn add_multi(&mut self, items: Vec<QueueItemType<T, U>>, by_human: bool) {
         let mut i: usize = 0;
 
         self.items = self
@@ -192,7 +177,7 @@ impl<
                 }
                 item_
             })
-            .collect::<Vec<QueueItem<T, U, L>>>();
+            .collect::<Vec<QueueItem<T, U>>>();
 
         let empty = self.items.is_empty();
 
@@ -203,7 +188,6 @@ impl<
                 QueueItem {
                     item,
                     state: QueueState::NoState,
-                    source,
                     by_human,
                 },
             );
@@ -212,7 +196,7 @@ impl<
     }
 
     /// Add multiple Items after the currently playing Item
-    pub fn add_multi_next(&mut self, items: Vec<QueueItemType<T, U>>, source: Option<L>) {
+    pub fn add_multi_next(&mut self, items: Vec<QueueItemType<T, U>>) {
         use QueueState::*;
         let empty = self.items.is_empty();
 
@@ -228,7 +212,6 @@ impl<
                 QueueItem {
                     item,
                     state: NoState,
-                    source,
                     by_human: true,
                 },
             )
@@ -239,7 +222,7 @@ impl<
         }
     }
 
-    pub fn remove_item(&mut self, remove_index: usize) -> Result<QueueItem<T, U, L>, QueueError> {
+    pub fn remove_item(&mut self, remove_index: usize) -> Result<QueueItem<T, U>, QueueError> {
         // dbg!(/*&remove_index, self.current_index(), &index,*/ &self.items[remove_index]);
 
         if remove_index < self.items.len() {
@@ -257,7 +240,6 @@ impl<
         &mut self,
         index: usize,
         new_item: QueueItemType<T, U>,
-        source: Option<L>,
         addhere: bool,
     ) -> Result<(), QueueError> {
         if self.items.get_mut(index).is_none()
@@ -270,7 +252,7 @@ impl<
             });
         }
         if addhere {
-            let mut new_item = QueueItem::from_item_type(new_item, source);
+            let mut new_item = QueueItem::from_item_type(new_item);
             for item in &mut self.items {
                 if item.state == QueueState::AddHere {
                     item.state = QueueState::NoState
@@ -279,7 +261,7 @@ impl<
             new_item.state = QueueState::AddHere;
             self.items.insert(index, new_item);
         } else {
-            let new_item = QueueItem::from_item_type(new_item, source);
+            let new_item = QueueItem::from_item_type(new_item);
             self.items.insert(index, new_item);
         }
         Ok(())
@@ -374,7 +356,7 @@ impl<
     }
 
     #[allow(clippy::should_implement_trait)]
-    pub fn next(&mut self) -> Result<&QueueItem<T, U, L>, QueueError> {
+    pub fn next(&mut self) -> Result<&QueueItem<T, U>, QueueError> {
         if self.items.is_empty() {
             if self.loop_ {
                 unimplemented!() // TODO: add function to loop the queue
@@ -403,7 +385,7 @@ impl<
         }
     }
 
-    pub fn prev(&mut self) -> Result<&QueueItem<T, U, L>, QueueError> {
+    pub fn prev(&mut self) -> Result<&QueueItem<T, U>, QueueError> {
         if let Some(item) = self.played.pop() {
             if item.state == QueueState::First && self.loop_ {
                 todo!()
@@ -422,7 +404,7 @@ impl<
         }
     }
 
-    pub fn current(&self) -> Result<&QueueItem<T, U, L>, QueueError> {
+    pub fn current(&self) -> Result<&QueueItem<T, U>, QueueError> {
         if !self.items.is_empty() {
             if let QueueItemType::Multi(_) = self.items[0].item {
                 unimplemented!(); // TODO: Handle Multi items here?
@@ -438,4 +420,19 @@ impl<
             self.played.remove(0);
         }
     }
-}
\ No newline at end of file
+}
+
+
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum QueueError {
+    #[error("Index out of bounds! Index {index} is over len {len}")]
+    OutOfBounds { index: usize, len: usize },
+    #[error("The Queue is empty!")]
+    EmptyQueue,
+    #[error("There are no past played songs!")]
+    EmptyPlayed,
+    #[error("There is no item after this in the Queue")]
+    NoNext,
+}

From 390fcae80b6d65e88b8cd95f8dfdc458311409fe Mon Sep 17 00:00:00 2001
From: MrDulfin <mrdulfin@mrdulfin.com>
Date: Sun, 7 Jul 2024 19:09:46 -0400
Subject: [PATCH 10/10] Updated to 0.1.3

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index be9ba3c..74dda60 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kushi"
-version = "0.1.2"
+version = "0.1.3"
 license = "MIT OR Apache-2.0"
 description = "A queue built for the Dango Music Player and Oden Music Bot"
 homepage = "https://github.com/Dangoware/kushi-queue"