From 665ee3f30f017e41acaad643e1aa0a5b22480ce0 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Mon, 1 Oct 2018 12:50:21 -0700
Subject: [PATCH] Revert "Use namespaced Utils"

This reverts commit 304935070128b30bd95eca7692e78f081e414216.
---
 js/selectors.ts | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/js/selectors.ts b/js/selectors.ts
index 4eb1b62f..90eacb82 100644
--- a/js/selectors.ts
+++ b/js/selectors.ts
@@ -8,7 +8,13 @@ import {
   SerializedStateV1
 } from "./types";
 import { createSelector } from "reselect";
-import * as Utils from "./utils";
+import {
+  denormalize,
+  getTimeStr,
+  clamp,
+  percentToIndex,
+  objectMap
+} from "./utils";
 import {
   BANDS,
   TRACK_HEIGHT,
@@ -31,10 +37,10 @@ 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)
+    preamp: denormalize(sliders.preamp)
   };
   BANDS.forEach(band => {
-    preset[`hz${band}`] = Utils.denormalize(sliders[band]);
+    preset[`hz${band}`] = denormalize(sliders[band]);
   });
   const eqfData = {
     presets: [preset],
@@ -87,9 +93,7 @@ export const getRunningTimeMessage = createSelector(
   getTotalRunningTime,
   getSelectedRunningTime,
   (totalRunningTime, selectedRunningTime) =>
-    `${Utils.getTimeStr(selectedRunningTime)}/${Utils.getTimeStr(
-      totalRunningTime
-    )}`
+    `${getTimeStr(selectedRunningTime)}/${getTimeStr(totalRunningTime)}`
 );
 
 // TODO: use slectors to get memoization
@@ -137,7 +141,7 @@ export const nextTrack = (state: AppState, n = 1) => {
     return null;
   }
 
-  nextIndex = Utils.clamp(nextIndex, 0, trackCount - 1);
+  nextIndex = clamp(nextIndex, 0, trackCount - 1);
   return trackOrder[nextIndex];
 };
 
@@ -181,7 +185,7 @@ export const getScrollOffset = createSelector(
   getNumberOfVisibleTracks,
   (playlistScrollPosition, trackCount, numberOfVisibleTracks) => {
     const overflow = Math.max(0, trackCount - numberOfVisibleTracks);
-    return Utils.percentToIndex(playlistScrollPosition / 100, overflow + 1);
+    return percentToIndex(playlistScrollPosition / 100, overflow + 1);
   }
 );
 
@@ -287,7 +291,7 @@ export const getMediaText = createSelector(
     minimalMediaText == null
       ? null
       : // TODO: Maybe the `  ***  ` should actually be added by the marquee
-        `${minimalMediaText} (${Utils.getTimeStr(duration)})  ***  `
+        `${minimalMediaText} (${getTimeStr(duration)})  ***  `
 );
 
 export const getNumberOfTracks = (state: AppState) =>
@@ -308,15 +312,13 @@ export const getPlaylistURL = createSelector(
   (numberOfTracks, playlistDuration, trackOrder, tracks, getDisplayName) =>
     createPlaylistURL({
       numberOfTracks,
-      averageTrackLength: Utils.getTimeStr(playlistDuration / numberOfTracks),
+      averageTrackLength: getTimeStr(playlistDuration / numberOfTracks),
       // TODO: Handle hours
       playlistLengthMinutes: Math.floor(playlistDuration / 60),
       playlistLengthSeconds: Math.floor(playlistDuration % 60),
       tracks: trackOrder.map(
         (id, i) =>
-          `${i + 1}. ${getDisplayName(id)} (${Utils.getTimeStr(
-            tracks[id].duration
-          )})`
+          `${i + 1}. ${getDisplayName(id)} (${getTimeStr(tracks[id].duration)})`
       )
     })
 );
@@ -369,7 +371,7 @@ export const getWindowSizes = createSelector(
   getGenWindows,
   getDoubled,
   (windows, doubled) => {
-    return Utils.objectMap(windows, w => getWPixelSize(w, doubled));
+    return objectMap(windows, w => getWPixelSize(w, doubled));
   }
 );