From b9e817b89765d9ef27a557377a356199d8a3c1e0 Mon Sep 17 00:00:00 2001 From: Alex Coyle Date: Sun, 3 Feb 2019 21:15:46 +0000 Subject: [PATCH] Rekordbox xml uses TrackNumber attribute Not Track attribute --- src/converter/traktor/core.cljc | 8 ++++---- src/converter/universal/core.cljc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/converter/traktor/core.cljc b/src/converter/traktor/core.cljc index 6a08fb6..bb8babd 100644 --- a/src/converter/traktor/core.cljc +++ b/src/converter/traktor/core.cljc @@ -142,16 +142,16 @@ :ret entry-spec) (defn item->entry - [{:keys [::u/location ::u/title ::u/artist ::u/track ::u/album ::u/total-time ::u/bpm ::u/tempos ::u/markers]}] + [{:keys [::u/location ::u/title ::u/artist ::u/track-number ::u/album ::u/total-time ::u/bpm ::u/tempos ::u/markers]}] {:tag :ENTRY :attrs (cond-> {} title (assoc :TITLE title) artist (assoc :ARTIST artist)) :content (cond-> [] true (conj (url->location location)) - (or track album) (conj {:tag :ALBUM + (or track-number album) (conj {:tag :ALBUM :attrs (cond-> {} - track (assoc :TRACK track) + track-number (assoc :TRACK track-number) album (assoc :TITLE album))}) total-time (conj {:tag :INFO :attrs {:PLAYTIME total-time}}) @@ -225,7 +225,7 @@ (cond-> {::u/location (location->url (zx/xml1-> entry-z :LOCATION))} title (assoc ::u/title title) artist (assoc ::u/artist artist) - track (assoc ::u/track track) + track (assoc ::u/track-number track) album-title (assoc ::u/album album-title) playtime (assoc ::u/total-time playtime) bpm (assoc ::u/bpm bpm) diff --git a/src/converter/universal/core.cljc b/src/converter/universal/core.cljc index c5a25e5..434575c 100644 --- a/src/converter/universal/core.cljc +++ b/src/converter/universal/core.cljc @@ -14,7 +14,7 @@ {::location ::url/url (std/opt ::title) string? (std/opt ::artist) string? - (std/opt ::track) string? + (std/opt ::track-number) string? (std/opt ::album) string? (std/opt ::total-time) string? (std/opt ::bpm) string?