near/airsonic-ui
1
0
Fork 0
mirror of https://github.com/heyarne/airsonic-ui.git synced 2026-05-07 10:43:39 +02:00
Code Issues Projects Releases Wiki Activity

Remove start-idx parameter when constructing playlists

Browse source
This commit is contained in:
Arne Schlüter 2018-08-20 15:17:13 +02:00
commit c8fa855dc5
2 changed files with 100 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/cljs/airsonic_ui/audio/playlist.cljs
View file

@ -13,16 +13,16 @@
(defmulti ->playlist (defmulti ->playlist
"Creates a new playlist that behaves according to the given playback- and "Creates a new playlist that behaves according to the given playback- and
repeat-mode parameters." repeat-mode parameters."
(fn [queue playing-idx playback-mode repeat-mode] playback-mode)) (fn [queue playback-mode repeat-mode] playback-mode))
(defn- playlist-queue (defn- mark-first-song [queue]
[queue playing-idx] (let [[first-idx _] (find-where #(= 0 (:order %)) queue)]
(assoc-in (vec queue) [playing-idx :currently-playing?] true)) (assoc-in queue [first-idx :currently-playing?] true)))
(defmethod ->playlist :playback-mode/linear (defmethod ->playlist :playback-mode/linear
[queue playing-idx playback-mode repeat-mode] [queue playback-mode repeat-mode]
(let [queue (->> (playlist-queue queue playing-idx) (let [queue (-> (mapv (fn [order song] (assoc song :order order)) (range) queue)
(mapv (fn [order song] (assoc song :order order)) (range)))] (mark-first-song))]
(->Playlist queue playback-mode repeat-mode))) (->Playlist queue playback-mode repeat-mode)))
(defn- -shuffle-songs [queue] (defn- -shuffle-songs [queue]
@ -30,16 +30,35 @@
(mapv (fn [song order] (assoc song :order order)) queue))) (mapv (fn [song order] (assoc song :order order)) queue)))
(defmethod ->playlist :playback-mode/shuffled (defmethod ->playlist :playback-mode/shuffled
[queue playing-idx playback-mode repeat-mode] [queue playback-mode repeat-mode]
(let [queue (->> (playlist-queue queue playing-idx) (let [queue (conj (mapv #(update % :order inc) (-shuffle-songs (rest queue)))
(-shuffle-songs))] (assoc (first queue) :order 0 :currently-playing? true))]
(->Playlist queue playback-mode repeat-mode))) (->Playlist queue playback-mode repeat-mode)))
(defn set-current-song
"Marks a song in the queue as currently playing, given its ID"
[playlist next-idx]
(let [[current-idx _] (find-where :currently-playing? (:queue playlist))]
(-> (if current-idx
(update-in playlist [:queue current-idx] dissoc :currently-playing?)
playlist)
(assoc-in [:queue next-idx :currently-playing?] true))))
(defn set-playback-mode (defn set-playback-mode
"Changes the playback mode of a playlist and re-shuffles it if necessary" "Changes the playback mode of a playlist and re-shuffles it if necessary"
[playlist playback-mode] [playlist playback-mode]
(if (= playback-mode :playback-mode/shuffled)
;; for shuffled playlists we reorder the songs make sure that the currently
;; playing song has order 0
(let [playlist (->playlist (:queue playlist) playback-mode (:repeat-mode playlist))
[current-idx current-song] (find-where :currently-playing? (:queue playlist))
[swap-idx _] (find-where #(= 0 (:order %)) (:queue playlist))]
(-> (assoc-in playlist [:queue current-idx :order] 0)
(assoc-in [:queue swap-idx :order] (:order current-song))))
;; for linear songs we just make sure that the current does not change
(let [[current-idx _] (find-where :currently-playing? (:queue playlist))] (let [[current-idx _] (find-where :currently-playing? (:queue playlist))]
(->playlist (:queue playlist) current-idx playback-mode (:repeat-mode playlist)))) (-> (->playlist (:queue playlist) playback-mode (:repeat-mode playlist))
(set-current-song current-idx)))))
(defn set-repeat-mode (defn set-repeat-mode
"Allows to change the way the next and previous song of a playlist is selected" "Allows to change the way the next and previous song of a playlist is selected"
@ -53,15 +72,6 @@
(filter :currently-playing?) (filter :currently-playing?)
(first))) (first)))
(defn set-current-song
"Marks a song in the queue as currently playing, given its ID"
[playlist next-idx]
(let [[current-idx _] (find-where :currently-playing? (:queue playlist))]
(-> (if current-idx
(update-in playlist [:queue current-idx] dissoc :currently-playing?)
playlist)
(assoc-in [:queue next-idx :currently-playing?] true))))
(defmulti next-song "Advances the currently playing song" :repeat-mode) (defmulti next-song "Advances the currently playing song" :repeat-mode)
(defmethod next-song :repeat-mode/none (defmethod next-song :repeat-mode/none
@ -111,7 +121,10 @@
(if next-idx (if next-idx
(set-current-song playlist next-idx) (set-current-song playlist next-idx)
(if (= :playback-mode/shuffled (:playback-mode playlist)) (if (= :playback-mode/shuffled (:playback-mode playlist))
(set-current-song (update playlist :queue -shuffle-songs) 0) (let [highest-order (dec (count playlist))
playlist (update playlist :queue -shuffle-songs)
[last-idx _] (find-where #(= (:order %) highest-order) (:queue playlist))]
(set-current-song playlist last-idx))
(set-current-song playlist (mod (dec (:order current-song)) (count playlist))))))) (set-current-song playlist (mod (dec (:order current-song)) (count playlist)))))))
(defn enqueue-last [playlist song] (defn enqueue-last [playlist song]

126
test/cljs/airsonic_ui/audio/playlist_test.cljs
View file

@ -34,56 +34,44 @@
(deftest playlist-creation (deftest playlist-creation
(testing "Playlist creation" (testing "Playlist creation"
(testing "should give us the correct current song" (testing "should give us the correct current song"
(let [queue (song-queue 10) (let [queue (song-queue 10)]
start-idx (rand-int 10)]
(doseq [playback-mode [:playback-mode/linear, :playback-mode/shuffled] (doseq [playback-mode [:playback-mode/linear, :playback-mode/shuffled]
repeat-mode [:repeat-mode/none, :repeat-mode/single, :repeat-mode/all]] repeat-mode [:repeat-mode/none, :repeat-mode/single, :repeat-mode/all]]
(is (same-song? (nth queue start-idx) (is (same-song? (first queue)
(-> (playlist/->playlist queue start-idx playback-mode repeat-mode) (-> (playlist/->playlist queue playback-mode repeat-mode)
(playlist/peek))) (playlist/peek)))
(str playback-mode ", " repeat-mode))))) (str playback-mode ", " repeat-mode)))))
(testing "should give us a playlist with the correct number of tracks" (testing "should give us a playlist with the correct number of tracks"
(let [queue (song-queue 100) (let [queue (song-queue 100)]
start-idx (rand-int 100)]
(doseq [playback-mode [:playback-mode/linear, :playback-mode/shuffled] (doseq [playback-mode [:playback-mode/linear, :playback-mode/shuffled]
repeat-mode [:repeat-mode/none, :repeat-mode/single, :repeat-mode/all]] repeat-mode [:repeat-mode/none, :repeat-mode/single, :repeat-mode/all]]
(is (= (count queue) (is (= (count queue)
(count (playlist/->playlist queue start-idx playback-mode repeat-mode))) (count (playlist/->playlist queue playback-mode repeat-mode)))
(str playback-mode ", " repeat-mode))))))) (str playback-mode ", " repeat-mode)))))))
(deftest changing-playback-mode (deftest changing-playback-mode
(testing "Changing playback mode" (testing "Changing playback mode"
(testing "from linear to shuffled" (testing "from linear to shuffled"
(let [queue (song-queue 10) (let [queue (song-queue 10)
start-idx (rand-int 10) linear (playlist/->playlist queue :playback-mode/linear :repeat-mode/none)
linear (playlist/->playlist queue start-idx :playback-mode/linear :repeat-mode/node)
shuffled (playlist/set-playback-mode linear :playback-mode/shuffled)] shuffled (playlist/set-playback-mode linear :playback-mode/shuffled)]
(testing "should re-order the tracks" (testing "should re-order the tracks"
(is (not= (map :order (:queue shuffled)) (map :order (:queue linear))))) (is (not= (map :order (:queue shuffled)) (map :order (:queue linear)))))
(testing "should not change the currently playing track" (testing "should not change the currently playing track"
(is (same-song? (playlist/peek linear) (playlist/peek shuffled)))) (is (same-song? (playlist/peek linear) (playlist/peek shuffled))))
(testing "should not change the repeat mode" (testing "should not change the repeat mode"
(is (= (:repeat-mode shuffled) (:repeat-mode linear))))) (is (= (:repeat-mode shuffled) (:repeat-mode linear))))))
(testing "from shuffled to linear" (testing "from shuffled to linear"
(let [queue (song-queue 10) (let [queue (song-queue 10)
start-idx (rand-int 10) shuffled (playlist/->playlist queue :playback-mode/shuffled :repeat-mode/none)
shuffled (playlist/->playlist queue start-idx
:playback-mode/shuffled :repeat-mode/none)
linear (playlist/set-playback-mode shuffled :playback-mode/linear)] linear (playlist/set-playback-mode shuffled :playback-mode/linear)]
(testing "should set the correct order for tracks" (testing "should set the correct order for tracks"
(is (every? #(apply same-song? %) (is (every? #(apply same-song? %) (interleave queue (:queue linear))))
(interleave (take start-idx (:queue shuffled))
(take start-idx (:queue linear))))
"before")
(is (every? #(apply same-song? %)
(interleave (drop (inc start-idx) (:queue shuffled))
(drop (inc start-idx) (:queue linear))))
"after")
(is (< (:order (first (:queue linear))) (:order (last (:queue linear)))))) (is (< (:order (first (:queue linear))) (:order (last (:queue linear))))))
(testing "should not change the currently playing track" (testing "should not change the currently playing track"
(is (same-song? (playlist/peek linear) (playlist/peek shuffled)))) (is (same-song? (playlist/peek linear) (playlist/peek shuffled))))
(testing "should not change the repeat mode" (testing "should not change the repeat mode"
(is (= (:repeat-mode shuffled) (:repeat-mode linear))))))))) (is (= (:repeat-mode shuffled) (:repeat-mode linear))))))))
(deftest chaging-repeat-mode (deftest chaging-repeat-mode
(testing "Changing the repeat mode" (testing "Changing the repeat mode"
@ -91,8 +79,7 @@
(doseq [playback-mode [:playback-mode/linear, :playback-mode/shuffled] (doseq [playback-mode [:playback-mode/linear, :playback-mode/shuffled]
repeat-mode [:repeat-mode/none, :repeat-mode/single, :repeat-mode/all] repeat-mode [:repeat-mode/none, :repeat-mode/single, :repeat-mode/all]
next-repeat-mode [:repeat-mode/none, :repeat-mode/single, :repeat-mode/all]] next-repeat-mode [:repeat-mode/none, :repeat-mode/single, :repeat-mode/all]]
(let [playlist (-> (playlist/->playlist (song-queue 1) 0 (let [playlist (-> (playlist/->playlist (song-queue 1) playback-mode repeat-mode)
playback-mode repeat-mode)
(playlist/set-repeat-mode next-repeat-mode))] (playlist/set-repeat-mode next-repeat-mode))]
(is (= playback-mode (:playback-mode playlist))) (is (= playback-mode (:playback-mode playlist)))
(is (= next-repeat-mode (:repeat-mode playlist)) (is (= next-repeat-mode (:repeat-mode playlist))
@ -102,7 +89,7 @@
(testing "Should follow the same order as the queue used for creation" (testing "Should follow the same order as the queue used for creation"
(doseq [repeat-mode [:repeat-mode/none :repeat-mode/all]] (doseq [repeat-mode [:repeat-mode/none :repeat-mode/all]]
(let [queue (song-queue 5) (let [queue (song-queue 5)
playlist (playlist/->playlist queue 0 :playback-mode/linear repeat-mode)] playlist (playlist/->playlist queue :playback-mode/linear repeat-mode)]
(is (same-song? (nth queue 1) (-> (playlist/next-song playlist) (is (same-song? (nth queue 1) (-> (playlist/next-song playlist)
(playlist/peek))) (playlist/peek)))
(str repeat-mode ", skipped once")) (str repeat-mode ", skipped once"))
@ -113,81 +100,73 @@
(testing "Should go back to the first song when repeat-mode is all and we played the last song") (testing "Should go back to the first song when repeat-mode is all and we played the last song")
(testing "Should always give the same track when repeat-mode is single" (testing "Should always give the same track when repeat-mode is single"
(let [queue (song-queue 3) (let [queue (song-queue 3)
playing-idx (rand-int 3) playlist (playlist/->playlist queue :playback-mode/linear :repeat-mode/single)
playlist (playlist/->playlist queue playing-idx
:playback-mode/linear :repeat-mode/single)
played-back (map playlist/peek (iterate playlist/next-song playlist))] played-back (map playlist/peek (iterate playlist/next-song playlist))]
(is (same-song? (nth queue playing-idx) (nth played-back 0))) (is (same-song? (first queue) (nth played-back 0)))
(is (same-song? (nth queue playing-idx) (nth played-back 1))) (is (same-song? (first queue) (nth played-back 1)))
(is (same-song? (nth queue playing-idx) (nth played-back 2))) (is (same-song? (first queue) (nth played-back 2)))
(is (same-song? (nth queue playing-idx) (nth played-back 3)) "wrapping around"))) (is (same-song? (first queue) (nth played-back 3)) "wrapping around")))
(testing "Should stop playing at the end of the queue when repeat-mode is none" (testing "Should stop playing at the end of the queue when repeat-mode is none"
(is (nil? (-> (song-queue 1) (is (nil? (-> (song-queue 1)
(playlist/->playlist 0 :playback-mode/linear :repeat-mode/none) (playlist/->playlist :playback-mode/linear :repeat-mode/none)
(playlist/next-song) (playlist/next-song)
(playlist/peek)))))) (playlist/peek))))))
(deftest shuffled-next-song (deftest shuffled-next-song
(testing "Should play every track once when called for the entire queue" (testing "Should play every track once when called for the entire queue"
(with-redefs [shuffle reverse]
(doseq [repeat-mode '(:repeat-mode/none :repeat-mode/all)] (doseq [repeat-mode '(:repeat-mode/none :repeat-mode/all)]
(let [length 10 (let [length 10
playlist (playlist/->playlist (song-queue length) 9 playlist (playlist/->playlist (song-queue length) :playback-mode/shuffled repeat-mode)
:playback-mode/shuffled repeat-mode)
played-tracks (->> (iterate playlist/next-song playlist) played-tracks (->> (iterate playlist/next-song playlist)
(map playlist/peek) (map playlist/peek)
(take length))] (take length))]
(is (= (count played-tracks) (count (set played-tracks))) (is (= (count played-tracks) (count (set played-tracks)))
(str repeat-mode)))))) (str repeat-mode)))))
(testing "Should re-shuffle the playlist when wrapping around and repeat-mode is all" (testing "Should re-shuffle the playlist when wrapping around and repeat-mode is all"
(let [playlist (playlist/->playlist (song-queue 100) 0 :playback-mode/shuffled :repeat-mode/all) (let [playlist (playlist/->playlist (song-queue 100) :playback-mode/shuffled :repeat-mode/all)
[last-idx _] (find-where #(= (:order %) 99) (:queue playlist))] [last-idx _] (find-where #(= (:order %) 99) (:queue playlist))]
(is (not= (map :order (:queue playlist)) (is (not= (map :order (:queue playlist))
(map :order (:queue (-> (playlist/set-current-song playlist last-idx) (map :order (:queue (-> (playlist/set-current-song playlist last-idx)
(playlist/next-song)))))))) (playlist/next-song))))))))
(testing "Should always give the same track when repeat-mode is single" (testing "Should always give the same track when repeat-mode is single"
(let [queue (song-queue 3) (let [queue (song-queue 3)
playing-idx (rand-int 3) playlist (playlist/->playlist queue :playback-mode/shuffled :repeat-mode/single)
playlist (playlist/->playlist queue playing-idx
:playback-mode/shuffled :repeat-mode/single)
played-back (map playlist/peek (iterate playlist/next-song playlist))] played-back (map playlist/peek (iterate playlist/next-song playlist))]
(is (same-song? (nth queue playing-idx) (nth played-back 0))) (is (same-song? (first queue) (nth played-back 0)))
(is (same-song? (nth queue playing-idx) (nth played-back 1))) (is (same-song? (first queue) (nth played-back 1)))
(is (same-song? (nth queue playing-idx) (nth played-back 2))) (is (same-song? (first queue) (nth played-back 2)))
(is (same-song? (nth queue playing-idx) (nth played-back 3)) "wrapping around"))) (is (same-song? (first queue) (nth played-back 3)) "wrapping around")))
(testing "Should stop playing at the end of the queue when repeat-mode is none" (testing "Should stop playing at the end of the queue when repeat-mode is none"
(is (nil? (-> (song-queue 1) (is (nil? (-> (song-queue 1)
(playlist/->playlist 0 :playback-mode/linear :repeat-mode/none) (playlist/->playlist :playback-mode/linear :repeat-mode/none)
(playlist/next-song) (playlist/next-song)
(playlist/peek)))))) (playlist/peek))))))
(deftest linear-previous-song (deftest linear-previous-song
(testing "Should always give the same track when repeat-mode is single" (testing "Should always give the same track when repeat-mode is single"
(let [queue (song-queue 3) (let [queue (song-queue 3)
playing-idx (rand-int 3) playlist (playlist/->playlist queue :playback-mode/linear :repeat-mode/single)
playlist (playlist/->playlist queue playing-idx
:playback-mode/linear :repeat-mode/single)
played-back (map playlist/peek (iterate playlist/next-song playlist))] played-back (map playlist/peek (iterate playlist/next-song playlist))]
(is (same-song? (nth queue playing-idx) (nth played-back 0))) (is (same-song? (first queue) (nth played-back 0)))
(is (same-song? (nth queue playing-idx) (nth played-back 1))) (is (same-song? (first queue) (nth played-back 1)))
(is (same-song? (nth queue playing-idx) (nth played-back 2))) (is (same-song? (first queue) (nth played-back 2)))
(is (same-song? (nth queue playing-idx) (nth played-back 3)) "wrapping around"))) (is (same-song? (first queue) (nth played-back 3)) "wrapping around")))
(testing "Should keep the linear order when repeat-mode is not single" (testing "Should keep the linear order when repeat-mode is not single"
(doseq [repeat-mode '(:repeat-mode/none :repeat-mode/all)] (doseq [repeat-mode '(:repeat-mode/none :repeat-mode/all)]
(let [queue (song-queue 3) (let [queue (song-queue 3)
playlist (playlist/->playlist queue 0 :playback-mode/linear repeat-mode)] playlist (playlist/->playlist queue :playback-mode/linear repeat-mode)]
(is (same-song? (nth queue 1) (-> (playlist/next-song playlist) (is (same-song? (nth queue 1) (-> (playlist/next-song playlist)
(playlist/next-song) (playlist/next-song)
(playlist/previous-song) (playlist/previous-song)
(playlist/peek))))))) (playlist/peek)))))))
(testing "Should repeatedly give the first song when repeat-mode is none" (testing "Should repeatedly give the first song when repeat-mode is none"
(let [queue (song-queue 3) (let [queue (song-queue 3)
playlist (playlist/->playlist queue 0 :playback-mode/linear :repeat-mode/none)] playlist (playlist/->playlist queue :playback-mode/linear :repeat-mode/none)]
(is (same-song? (first queue) (-> (playlist/previous-song playlist) (is (same-song? (first queue) (-> (playlist/previous-song playlist)
(playlist/peek)))))) (playlist/peek))))))
(testing "Should wrap around to last song when repeat-mode is all" (testing "Should wrap around to last song when repeat-mode is all"
(let [queue (song-queue 3) (let [queue (song-queue 3)
playlist (playlist/->playlist queue 0 :playback-mode/linear :repeat-mode/all)] playlist (playlist/->playlist queue :playback-mode/linear :repeat-mode/all)]
(is (same-song? (last queue) (-> (playlist/previous-song playlist) (is (same-song? (last queue) (-> (playlist/previous-song playlist)
(playlist/peek))))))) (playlist/peek)))))))
@ -195,20 +174,16 @@
(with-redefs [shuffle reverse] (with-redefs [shuffle reverse]
(testing "Should always give the same track when repeat-mode is single" (testing "Should always give the same track when repeat-mode is single"
(let [queue (song-queue 3) (let [queue (song-queue 3)
playing-idx (rand-int 3) playlist (playlist/->playlist queue :playback-mode/shuffled :repeat-mode/single)
playlist (playlist/->playlist queue playing-idx
:playback-mode/shuffled :repeat-mode/single)
played-back (map playlist/peek (iterate playlist/next-song playlist))] played-back (map playlist/peek (iterate playlist/next-song playlist))]
(is (same-song? (nth queue playing-idx) (nth played-back 0))) (is (same-song? (first queue) (nth played-back 0)))
(is (same-song? (nth queue playing-idx) (nth played-back 1))) (is (same-song? (first queue) (nth played-back 1)))
(is (same-song? (nth queue playing-idx) (nth played-back 2))) (is (same-song? (first queue) (nth played-back 2)))
(is (same-song? (nth queue playing-idx) (nth played-back 3)) "wrapping around"))) (is (same-song? (first queue) (nth played-back 3)) "wrapping around")))
(testing "Should keep the playing order when repeat-mode is not single" (testing "Should keep the playing order when repeat-mode is not single"
(doseq [repeat-mode '(:repeat-mode/none :repeat-mode/all)] (doseq [repeat-mode '(:repeat-mode/none :repeat-mode/all)]
(let [queue (song-queue 3) (let [queue (song-queue 3)
playlist' (playlist/->playlist queue 0 :playback-mode/shuffled repeat-mode) playlist (playlist/->playlist queue :playback-mode/shuffled repeat-mode)]
[first-idx _] (find-where #(= (:order %) 0) (:queue playlist'))
playlist (playlist/set-current-song playlist' first-idx)]
(is (same-song? (playlist/peek playlist) (is (same-song? (playlist/peek playlist)
(-> playlist (-> playlist
(playlist/next-song) (playlist/next-song)
@ -222,17 +197,17 @@
(playlist/previous-song) (playlist/previous-song)
(playlist/peek))) (playlist/peek)))
(str "for repeat mode " repeat-mode))))) (str "for repeat mode " repeat-mode)))))
(testing "Should re-shuffle when repeat-mode is all and we pass the start" (testing "Should re-shuffle when repeat-mode is all and we go back to before the first track"
(with-redefs [shuffle identity] (let [playlist (with-redefs [shuffle identity]
(let [playlist (playlist/->playlist (song-queue 2) 0 :playback-mode/shuffled :repeat-mode/all) (playlist/->playlist (song-queue 10) :playback-mode/shuffled :repeat-mode/all))
playlist' (with-redefs [shuffle reverse] playlist' (with-redefs [shuffle reverse]
(playlist/previous-song playlist))] (playlist/previous-song playlist))]
(is (not= (map :order (:queue playlist)) (map :order (:queue playlist'))))))))) (is (not= (map :order (:queue playlist)) (map :order (:queue playlist'))))))))
(deftest set-current-song (deftest set-current-song
(testing "Should correctly set the new song" (testing "Should correctly set the new song"
(let [queue (song-queue 3) (let [queue (song-queue 3)
playlist (playlist/->playlist queue 0 :playback-mode/shuffled :repeat-mode/single) playlist (playlist/->playlist queue :playback-mode/shuffled :repeat-mode/single)
current-track (first queue) current-track (first queue)
next-track (-> (playlist/set-current-song playlist 1) next-track (-> (playlist/set-current-song playlist 1)
(playlist/peek))] (playlist/peek))]
@ -245,7 +220,7 @@
repeat-mode '(:repeat-mode/none :repeat-mode/all)] repeat-mode '(:repeat-mode/none :repeat-mode/all)]
(let [length 5, queue (song-queue length) (let [length 5, queue (song-queue length)
playlist (with-redefs [shuffle identity] playlist (with-redefs [shuffle identity]
(playlist/->playlist queue 0 playback-mode repeat-mode)) (playlist/->playlist queue playback-mode repeat-mode))
played-back (->> (iterate playlist/next-song playlist) played-back (->> (iterate playlist/next-song playlist)
(take (dec length)) (take (dec length))
(map #(:id (playlist/peek %))) (map #(:id (playlist/peek %)))
@ -261,10 +236,7 @@
(doseq [playback-mode '(:playback-mode/linear :playback-mode/shuffled) (doseq [playback-mode '(:playback-mode/linear :playback-mode/shuffled)
repeat-mode '(:repeat-mode/none :repeat-mode/all)] repeat-mode '(:repeat-mode/none :repeat-mode/all)]
(let [length 5, queue (song-queue length) (let [length 5, queue (song-queue length)
playlist (playlist/->playlist queue 0 playback-mode repeat-mode) playlist (playlist/->playlist queue playback-mode repeat-mode)
;; FIXME: Playlists should just start with order 0, basta
[first-song-idx _] (find-where #(= 0 (:order %)) (:queue playlist))
playlist (playlist/set-current-song playlist first-song-idx)
played-back-songs (fn played-back-songs [playlist] played-back-songs (fn played-back-songs [playlist]
(->> (iterate playlist/next-song playlist) (->> (iterate playlist/next-song playlist)
(take length) (take length)
@ -280,7 +252,7 @@
(doseq [playback-mode '(:playback-mode/linear :playback-mode/shuffled) (doseq [playback-mode '(:playback-mode/linear :playback-mode/shuffled)
repeat-mode '(:repeat-mode/none :repeat-mode/all)] repeat-mode '(:repeat-mode/none :repeat-mode/all)]
(let [length 5, queue (song-queue length) (let [length 5, queue (song-queue length)
playlist (playlist/->playlist queue 0 playback-mode repeat-mode) playlist (playlist/->playlist queue playback-mode repeat-mode)
next-song (song)] next-song (song)]
(is (same-song? next-song (-> (playlist/enqueue-next playlist next-song) (is (same-song? next-song (-> (playlist/enqueue-next playlist next-song)
(playlist/next-song) (playlist/next-song)