Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-22 09:37:17 +00:00
Code Issues Projects Releases Wiki Activity

Compute track number in marquee

Browse source
This commit is contained in:
Jordan Eldredge 2017-11-19 14:25:58 -08:00
parent 4c70cb23e0
commit c9020fcc5a
5 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/components/MainWindow/Marquee.js
View file

@ -7,6 +7,7 @@ import { getTimeStr } from "../../utils";
import { STEP_MARQUEE } from "../../actionTypes";
import CharacterString from "../CharacterString";
import { noMarquee } from "../../config";
import { getCurrentTrackNumber } from "../../selectors";
const CHAR_WIDTH = 5;
@ -29,8 +30,8 @@ export const getPositionText = (duration, seekToPercent) => {
return `Seek to: ${newElapsedStr}/${durationStr} (${seekToPercent}%)`;
};
export const getMediaText = (name, duration) =>
`${name} (${getTimeStr(duration)}) *** `;
export const getMediaText = (trackNumber, name, duration) =>
`${trackNumber}. ${name} (${getTimeStr(duration)}) *** `;
export const getDoubleSizeModeText = enabled =>
`${enabled ? "Disable" : "Enable"} doublesize mode`;
@ -158,7 +159,8 @@ const getMarqueeText = state => {
break;
}
if (state.media.name) {
return getMediaText(state.media.name, state.media.length);
const trackNumber = getCurrentTrackNumber(state);
return getMediaText(trackNumber, state.media.name, state.media.length);
}
return "Winamp 2.91";
};

5
js/components/MainWindow/Marquee.test.js
View file

@ -57,10 +57,11 @@ describe("getPositionText", () => {
describe("getMediaText", () => {
it("formats a name and duration", () => {
const trackNumber = 1;
const name = "My Great Song";
const duration = 86;
const actual = getMediaText(name, duration);
const expected = "My Great Song (01:26) *** ";
const actual = getMediaText(trackNumber, name, duration);
const expected = "1. My Great Song (01:26) *** ";
expect(actual).toEqual(expected);
});
});

1
js/components/PlaylistWindow/index.js
View file

@ -54,7 +54,6 @@ const PlaylistWindow = props => {
toggleShade,
allTracksAreVisible
} = props;
console.log({ allTracksAreVisible });
if (playlistShade) {
return <PlaylistShade />;
}

2
js/index.js
View file

@ -31,7 +31,7 @@ Raven.context(() => {
url: skinUrl
},
initialTrack: {
name: "1. DJ Mike Llama - Llama Whippin' Intro",
name: "DJ Mike Llama - Llama Whippin' Intro",
url: audioUrl
},
avaliableSkins: [

15
js/selectors.js
View file

@ -58,15 +58,22 @@ export const getRunningTimeMessage = createSelector(
`${getTimeStr(selectedRunningTime)}/${getTimeStr(totalRunningTime)}`
);
// TODO: Consider changing `currentTrack` in the sate to be this value and
// compute the other way (cheaper)
export const getCurrentTrackIndex = state => {
const { trackOrder, currentTrack } = state.playlist;
return trackOrder.findIndex(trackId => trackId === currentTrack);
};
export const getCurrentTrackNumber = state => getCurrentTrackIndex(state) + 1;
export const nextTrack = (state, n = 1) => {
const { playlist: { trackOrder, currentTrack }, media: { repeat } } = state;
const { playlist: { trackOrder }, media: { repeat } } = state;
if (trackOrder.length === 0) {
return null;
}
const currentIndex = trackOrder.findIndex(
trackId => trackId === currentTrack
);
const currentIndex = getCurrentTrackIndex(state);
let nextIndex = currentIndex + n;
if (repeat) {