From 830a5cff29b2cf2db3344a673a95847c15e53d4e Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Wed, 10 Oct 2018 12:44:52 -0700 Subject: [PATCH] Extract trackName into trackUtils --- js/reducers/tracks.ts | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/js/reducers/tracks.ts b/js/reducers/tracks.ts index 0d0d9634..42effa6e 100644 --- a/js/reducers/tracks.ts +++ b/js/reducers/tracks.ts @@ -8,8 +8,7 @@ import { ADD_TRACK_FROM_URL } from "../actionTypes"; import { MEDIA_TAG_REQUEST_STATUS } from "../constants"; - -import { filenameFromUrl } from "../fileUtils"; +import * as TrackUtils from "../trackUtils"; export interface TracksState { [id: string]: PlaylistTrack; @@ -99,18 +98,6 @@ export const getTrackDisplayName = ( if (track == null) { return null; } - const { artist, title, defaultName, url } = track; - if (artist && title) { - return `${artist} - ${title}`; - } else if (title) { - return title; - } else if (defaultName) { - return defaultName; - } else if (url) { - const filename = filenameFromUrl(url); - if (filename) { - return filename; - } - } - return "???"; + + return TrackUtils.trackName(track); };