mirror of
https://github.com/captbaritone/webamp.git
synced 2026-01-23 02:15:01 +00:00
Upgrade prettier
This commit is contained in:
Jordan Eldredge
parent
f00fda9297
commit
15b3fa7c74
4 changed files with 66 additions and 44 deletions
|
|
@ -1,2 +1,5 @@
|
|||
package.json
|
||||
js/googleAnalytics.min.js
|
||||
**/*.min.css
|
||||
**/base-skin.css
|
||||
js/googleAnalytics.min.js
|
||||
built/*
|
||||
|
|
|
|||
|
|
@ -32,32 +32,39 @@ import { SerializedStateV1 } from "./serializedStates/v1Types";
|
|||
|
||||
export const getSliders = (state: AppState) => state.equalizer.sliders;
|
||||
|
||||
export const getEqfData = createSelector(getSliders, sliders => {
|
||||
const preset: { [key: string]: number | string } = {
|
||||
name: "Entry1",
|
||||
preamp: Utils.denormalize(sliders.preamp)
|
||||
};
|
||||
BANDS.forEach(band => {
|
||||
preset[`hz${band}`] = Utils.denormalize(sliders[band]);
|
||||
});
|
||||
const eqfData = {
|
||||
presets: [preset],
|
||||
type: "Winamp EQ library file v1.1"
|
||||
};
|
||||
return eqfData;
|
||||
});
|
||||
export const getEqfData = createSelector(
|
||||
getSliders,
|
||||
sliders => {
|
||||
const preset: { [key: string]: number | string } = {
|
||||
name: "Entry1",
|
||||
preamp: Utils.denormalize(sliders.preamp)
|
||||
};
|
||||
BANDS.forEach(band => {
|
||||
preset[`hz${band}`] = Utils.denormalize(sliders[band]);
|
||||
});
|
||||
const eqfData = {
|
||||
presets: [preset],
|
||||
type: "Winamp EQ library file v1.1"
|
||||
};
|
||||
return eqfData;
|
||||
}
|
||||
);
|
||||
|
||||
export const getTracks = (state: AppState) => state.tracks;
|
||||
|
||||
export const getTracksMatchingFilter = createSelector(getTracks, tracks => {
|
||||
const tracksArray = Object.values(tracks);
|
||||
const filter = Utils.makeCachingFilterFunction(tracksArray, (track, query) =>
|
||||
TrackUtils.trackFilterContents(track).includes(query)
|
||||
);
|
||||
return (filterString: string): PlaylistTrack[] => {
|
||||
return filter(filterString.toLowerCase());
|
||||
};
|
||||
});
|
||||
export const getTracksMatchingFilter = createSelector(
|
||||
getTracks,
|
||||
tracks => {
|
||||
const tracksArray = Object.values(tracks);
|
||||
const filter = Utils.makeCachingFilterFunction(
|
||||
tracksArray,
|
||||
(track, query) => TrackUtils.trackFilterContents(track).includes(query)
|
||||
);
|
||||
return (filterString: string): PlaylistTrack[] => {
|
||||
return filter(filterString.toLowerCase());
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
export const getTrackUrl = (state: AppState) => {
|
||||
return (id: number): string | null => {
|
||||
|
|
@ -243,10 +250,13 @@ export const getDuration = (state: AppState): number | null => {
|
|||
return currentTrack && currentTrack.duration;
|
||||
};
|
||||
|
||||
export const getTrackDisplayName = createSelector(getTracks, tracks => {
|
||||
return (trackId: number | null) =>
|
||||
fromTracks.getTrackDisplayName(tracks, trackId);
|
||||
});
|
||||
export const getTrackDisplayName = createSelector(
|
||||
getTracks,
|
||||
tracks => {
|
||||
return (trackId: number | null) =>
|
||||
fromTracks.getTrackDisplayName(tracks, trackId);
|
||||
}
|
||||
);
|
||||
|
||||
export const getCurrentTrackDisplayName = createSelector(
|
||||
getCurrentTrackId,
|
||||
|
|
@ -318,11 +328,13 @@ export const getMediaText = createSelector(
|
|||
|
||||
export const getNumberOfTracks = (state: AppState) =>
|
||||
getTrackOrder(state).length;
|
||||
const getPlaylistDuration = createSelector(getTracks, tracks =>
|
||||
Object.values(tracks).reduce(
|
||||
(total, track) => total + (track.duration || 0),
|
||||
0
|
||||
)
|
||||
const getPlaylistDuration = createSelector(
|
||||
getTracks,
|
||||
tracks =>
|
||||
Object.values(tracks).reduce(
|
||||
(total, track) => total + (track.duration || 0),
|
||||
0
|
||||
)
|
||||
);
|
||||
|
||||
export const getPlaylistURL = createSelector(
|
||||
|
|
@ -416,9 +428,12 @@ export const getWindowSizes = createSelector(
|
|||
}
|
||||
);
|
||||
|
||||
export const getWindowPixelSize = createSelector(getWindowSizes, sizes => {
|
||||
return (windowId: WindowId) => sizes[windowId];
|
||||
});
|
||||
export const getWindowPixelSize = createSelector(
|
||||
getWindowSizes,
|
||||
sizes => {
|
||||
return (windowId: WindowId) => sizes[windowId];
|
||||
}
|
||||
);
|
||||
|
||||
// TODO: Now that both size and position are stored on genWindows this seems a bit silly.
|
||||
export const getWindowsInfo = createSelector(
|
||||
|
|
@ -428,7 +443,10 @@ export const getWindowsInfo = createSelector(
|
|||
Object.keys(sizes).map(key => ({ key, ...sizes[key], ...positions[key] }))
|
||||
);
|
||||
|
||||
export const getWindowGraph = createSelector(getWindowsInfo, generateGraph);
|
||||
export const getWindowGraph = createSelector(
|
||||
getWindowsInfo,
|
||||
generateGraph
|
||||
);
|
||||
|
||||
export const getSkinPlaylistStyle = (state: AppState): PlaylistStyle => {
|
||||
return (
|
||||
|
|
@ -489,8 +507,9 @@ export function getBrowserWindowSize(
|
|||
return state.windows.browserWindowSize;
|
||||
}
|
||||
|
||||
export const getOpenWindows = createSelector(getGenWindows, genWindows =>
|
||||
Utils.objectFilter(genWindows, w => w.open)
|
||||
export const getOpenWindows = createSelector(
|
||||
getGenWindows,
|
||||
genWindows => Utils.objectFilter(genWindows, w => w.open)
|
||||
);
|
||||
|
||||
export const getStackedLayoutPositions = createSelector(
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
"test": "jest --projects config/jest.unit.js config/jest.eslint.js",
|
||||
"travis-tests": "npm run test && npm run type-check && npm run build && npm run build-library",
|
||||
"tdd": "jest --projects config/jest.unit.js --watch",
|
||||
"format": "prettier --write experiments/**/*.js js/**/*.js js/**/*.ts **/*.d.ts css/**/*.css !css/**/*.min.css",
|
||||
"format": "prettier --write **/*.js **/*.ts **/*.tsx **/*.d.ts **/*.css",
|
||||
"integration-tests": "npm run build -- --display=errors-only && jest --projects config/jest.integration.js",
|
||||
"build-skin": "rm skins/base-2.91.wsz && cd skins/base-2.91 && zip -x .* -x 'Skining Updates.txt' -r ../base-2.91.wsz .",
|
||||
"build-skin-png": "rm skins/base-2.91-png.wsz && cd skins/base-2.91-png && zip -x .* -x 'Skining Updates.txt' -r ../base-2.91-png.wsz .",
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
"lodash": "^4.17.11",
|
||||
"milkdrop-preset-converter-aws": "^0.1.6",
|
||||
"music-metadata-browser": "^0.6.1",
|
||||
"prettier": "^1.14.2",
|
||||
"prettier": "^1.15.3",
|
||||
"prop-types": "^15.5.10",
|
||||
"puppeteer": "^1.4.0",
|
||||
"raven-for-redux": "^1.3.1",
|
||||
|
|
|
|||
|
|
@ -6657,9 +6657,9 @@ preserve@^0.2.0:
|
|||
version "0.2.0"
|
||||
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
|
||||
|
||||
prettier@^1.14.2:
|
||||
version "1.14.2"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.2.tgz#0ac1c6e1a90baa22a62925f41963c841983282f9"
|
||||
prettier@^1.15.3:
|
||||
version "1.15.3"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
|
||||
|
||||
pretty-bytes@^4.0.2:
|
||||
version "4.0.2"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue