1.4.2 - SP Mono upload, HiMD disc wiping, disc-protected warning window

asivery · Sep 1, 2023 · 5baf902 · 5baf902
1 parent 323e886
commit 5baf902
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 55 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,8 +28,8 @@
     "jszip": "^3.10.1",
     "lint-staged": "^10.5.3",
     "music-metadata-browser": "^2.5.9",
-    "netmd-exploits": "^0.5.3",
-    "netmd-js": "^4.1.3",
+    "netmd-exploits": "^0.5.4",
+    "netmd-js": "^4.1.4",
     "netmd-tocmanip": "^0.1.5",
     "prettier": "^1.19.1",
     "react": "^16.14.0",

diff --git a/src/components/changelog-dialog.tsx b/src/components/changelog-dialog.tsx
@@ -65,6 +65,23 @@ export const ChangelogDialog = (props: {}) => {
 
     const content = (
         <React.Fragment>
+            <h2 className={classes.header}>Version 1.4.2</h2>
+            <ul>
+                <li>
+                    Updated to netmd-exploits 0.5.4
+                    <ul>
+                        <li>Added support for SP MONO upload</li>
+                    </ul>
+                </li>
+                <li>
+                    Updated to himd-js 0.1.10
+                    <ul>
+                        <li>Added support for HiMD disc wiping</li>
+                    </ul>
+                </li>
+                <li>Added a disc-protected warning window</li>
+                <li>Added a shortcut to SP Speedup in Homebrew Shortcuts menu</li>
+            </ul>
             <h2 className={classes.header}>Version 1.4.1</h2>
             <ul>
                 <li>
@@ -139,7 +156,7 @@ export const ChangelogDialog = (props: {}) => {
                 <li>Renamed 'Factory Mode' to 'Homebrew Mode'</li>
                 <li>Added track normalization</li>
                 <li>
-                    Added the ability to use a <Link onClick={handleOpenEncoderSettings}>high quality LP encoder</Link>
+                    Added the ability to use a <Link onClick={handleOpenEncoderSettings} href="#">high quality LP encoder</Link>
                 </li>
                 <li>Added song recognition</li>
                 <li>Added CSV track list import and export</li>

diff --git a/src/components/topmenu.tsx b/src/components/topmenu.tsx
@@ -40,7 +40,6 @@ import SecurityIcon from '@mui/icons-material/Security';
 import MenuOpenIcon from '@mui/icons-material/MenuOpen';
 import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward';
 import CodeIcon from '@mui/icons-material/Code';
-import FolderDeleteIcon from '@mui/icons-material/FolderDelete'
 
 import { W95TopMenu } from './win95/topmenu';
 import { Capability, ExploitCapability } from '../services/interfaces/netmd';
@@ -53,6 +52,7 @@ import {
     readToc,
     stripSCMS,
     stripTrProtect,
+    toggleSPUploadSpeedup,
     writeModifiedTOC,
 } from '../redux/factory/factory-actions';
 
@@ -70,8 +70,9 @@ export const TopMenu = function(props: { tracksSelected?: number[]; onClick?: ()
     const classes = useStyles();
     const dispatch = useDispatch();
 
-    let { mainView, vintageMode, factoryModeRippingInMainUi, factoryModeShortcuts } = useShallowEqualSelector(state => state.appState);
+    const { mainView, vintageMode, factoryModeRippingInMainUi, factoryModeShortcuts } = useShallowEqualSelector(state => state.appState);
     const { deviceCapabilities, disc } = useShallowEqualSelector(state => state.main);
+    const { spUploadSpeedupActive } = useShallowEqualSelector(state => state.factory);
     let discTitle = useShallowEqualSelector(state => state.main.disc?.title ?? ``);
     let fullWidthDiscTitle = useShallowEqualSelector(state => state.main.disc?.fullWidthTitle ?? ``);
 
@@ -249,6 +250,11 @@ export const TopMenu = function(props: { tracksSelected?: number[]; onClick?: ()
         handleMenuClose();
     }, [dispatch, handleMenuClose]);
 
+    const handleToggleSPUploadSpeedup = useCallback(() => {
+        dispatch(toggleSPUploadSpeedup());
+        handleMenuClose();
+    }, [dispatch, handleMenuClose]);
+
     const handleEnterHiMDUnrestrictedMode = useCallback(() => {
         dispatch(enterHiMDUnrestrictedMode());
         handleMenuClose();
@@ -288,6 +294,24 @@ export const TopMenu = function(props: { tracksSelected?: number[]; onClick?: ()
             <ListItemText>Un-Protect all tracks</ListItemText>
         </MenuItem>
     );
+    shortcutsItems.push(
+        <MenuItem
+            key="short-speedupSP"
+            onClick={handleToggleSPUploadSpeedup}
+            disabled={!isExploitCapable(ExploitCapability.spUploadSpeedup)}
+        >
+            <ListItemIcon className={classes.listItemIcon}>
+                {spUploadSpeedupActive ? <ToggleOnIcon fontSize="small" /> : <ToggleOffIcon fontSize="small" />}
+            </ListItemIcon>
+            <ListItemText>
+                {spUploadSpeedupActive ? `Disable ` : `Enable `}
+                <Tooltip title="On some devices, this can speed up SP upload" arrow>
+                    <span className={classes.toolTippedText}>SP Upload Speedup</span>
+                </Tooltip>
+            </ListItemText>
+        </MenuItem>
+    );
+
 
     if (firmwareVersion.startsWith('H') && !window.native?.himdFullInterface) {
         // HIMD

diff --git a/src/index.tsx b/src/index.tsx
@@ -26,7 +26,7 @@ serviceRegistry.mediaRecorderService = new MediaRecorderService();
 serviceRegistry.mediaSessionService = new BrowserMediaSessionService(store);
 
 Object.defineProperty(window, 'wmdVersion', {
-    value: '1.4.1',
+    value: '1.4.2',
     writable: false,
 });
 

diff --git a/yarn.lock b/yarn.lock
@@ -5997,10 +5997,10 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-himd-js@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.npmjs.org/himd-js/-/himd-js-0.1.6.tgz"
-  integrity sha512-WZp48ywBNiWuoHYE/o4N193aPxVtNXGfGv5ESmX2/udBDqSxg12v/IqxdRo+facC2VmF95qKe7RZWQcHU/r/eg==
+himd-js@^0.1.10:
+  version "0.1.10"
+  resolved "https://registry.npmjs.org/himd-js/-/himd-js-0.1.10.tgz"
+  integrity sha512-aJLwK3FaMOvNZ159SsUtuRldnjqugxZF0dHWLuL3XTo2LxqBRofzHCEv+fOZC+Ia5nGdQR2Ogg4CcWUM8tWSUA==
   dependencies:
     "@originjs/crypto-js-wasm" "github:asivery/crypto-js-wasm"
     async-mutex "^0.4.0"
@@ -6009,7 +6009,7 @@ himd-js@^0.1.6:
     jconv "^0.1.5"
     mp3-parser "^0.3.0"
     node-id3 "^0.2.5"
-    node-mass-storage "^0.1.7"
+    node-mass-storage "^0.1.8"
     usb "^2.4.1"
 
 hmac-drbg@^1.0.1:
@@ -8331,21 +8331,21 @@ neo-async@^2.5.0, neo-async@^2.6.1:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
-netmd-exploits@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.npmjs.org/netmd-exploits/-/netmd-exploits-0.5.3.tgz"
-  integrity sha512-etVQQTHydN8RyJng21SNkihWpHk6CdeFIfeDOYK/XlCgoDlvnTcxpP0b3+w0lOf11f2qt9NtHNF7b1R9mMQwjQ==
+netmd-exploits@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.npmjs.org/netmd-exploits/-/netmd-exploits-0.5.4.tgz"
+  integrity sha512-gA67iFGCpKzfxO/TVwqA+f+xPFRfPtqtKhceyT1Nwf7E88zfMgh94Wt0WdS9xd817rIYbSL01Ifd5P6lvUs/CQ==
   dependencies:
     browser-or-node "^2.1.1"
     expr-eval "^2.0.2"
     jsbi "^4.3.0"
-    netmd-js "^4.1.3"
+    netmd-js "^4.1.4"
     netmd-tocmanip "^0.1.4"
 
-netmd-js@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.npmjs.org/netmd-js/-/netmd-js-4.1.3.tgz"
-  integrity sha512-h6KuQ6GFB3YsYBd+B9tILTPUieteqcju56G00+7YqdX4nsRHwfUMpsmMZj6bykT4oN4qPBPCf2IcWY8WUxMfhA==
+netmd-js@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.npmjs.org/netmd-js/-/netmd-js-4.1.4.tgz"
+  integrity sha512-0ILJrkq5MhXN/tl9qWnQK+0+qmnP09fPzuTt0MQnbRg46XdhgAWupGZdzLDqhRxCrwPl8eHdm9aPLQLSK93QdQ==
   dependencies:
     "@originjs/crypto-js-wasm" "github:asivery/crypto-js-wasm"
     browser-bunyan "^1.5.3"
@@ -8459,10 +8459,10 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-mass-storage@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.npmjs.org/node-mass-storage/-/node-mass-storage-0.1.7.tgz"
-  integrity sha512-AoK2PX9//fX3UWokM59/aoHOb8zZ/uw6JULPY3q2BDoroB4yxBKncSNQEogIYzOOzQrVTz8BBQ4+Tr/HXZ3kQA==
+node-mass-storage@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.npmjs.org/node-mass-storage/-/node-mass-storage-0.1.8.tgz"
+  integrity sha512-U1DtGthznWmdBbccpTzbKysv400gvdE0qmGd5qP1nCX57qzHQuDt7EoLuIS1WJJAH+bKdzoGJaZRP48asG4gGA==
   dependencies:
     async-mutex "^0.4.0"
     usb "^2.4.1"