Publish update v3.3

Specy · Apr 8, 2024 · 2350f04 · 2350f04
1 parent c939ee0
commit 2350f04
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 49 deletions.
diff --git a/src/components/pages/Composer/MidiParser/index.tsx b/src/components/pages/Composer/MidiParser/index.tsx
@@ -123,7 +123,7 @@ class MidiImport extends Component<MidiImportProps, MidiImportState> {
         return buffer
     }
     parseAudioToMidi = async (audio: AudioBuffer, name: string) => {
-        if (!this.warnedOfExperimental) logger.warn("🔬 This feature is experimental, it might not work or get stuck. \nAudio and video conversion is less accurate than MIDI, if you can, it's better to use MIDI or compose manualy. \nUse audio and videos that have only one instrument playing.", 18000)
+        if (!this.warnedOfExperimental) logger.warn("🔬 This feature is experimental, it might not work or get stuck. \nAudio and video conversion is less accurate than MIDI, if you can, it's better to use MIDI or compose manually. \nUse audio and videos that have only one instrument playing.", 18000)
         this.warnedOfExperimental = true
         const frames: number[][] = []
         const onsets: number[][] = []

diff --git a/src/components/pages/Index/Home.tsx b/src/components/pages/Index/Home.tsx
@@ -38,7 +38,8 @@ export default function Home({askForStorage, hasVisited, setDontShowHome, closeW
     const history = useRouter()
     const [theme] = useTheme()
 
-    function clearCache() {
+    async function clearCache() {
+        if(await asyncConfirm("Are you sure you want to clear the cache? The page will reload")) return
         clearClientCache()
             .then(() => {
                 logger.success("Cache Cleared")

diff --git a/src/pages/keybinds/index.tsx b/src/pages/keybinds/index.tsx
@@ -60,6 +60,45 @@ export default function Keybinds() {
         <MidiSetup/>
         {!IS_MOBILE
             && <>
+                <h1>
+                    Keyboard keybinds
+                </h1>
+                <div>
+                    You can remap the keyboard keys to whatever key on your keyboard, press the note you want to remap
+                    then press the key you want to assign to it.
+                </div>
+                <div className="flex-centered">
+                    <div
+                        className={`keyboard ${APP_NAME === 'Sky' ? 'keyboard-5' : ''}`}
+                        style={{
+                            margin: '1rem 0'
+                        }}
+                    >
+                        {baseInstrument.notes.map((note, i) =>
+                            <BaseNote
+                                key={i}
+                                data={{
+                                    status: (selected.type === 'keyboard' && i === selected.index) ? 'clicked' : ''
+                                }}
+                                noteImage={baseInstrument.notes[i].noteImage}
+                                noteText={(
+                                    keyBinds.getKeyOfShortcut(
+                                        "keyboard",
+                                        {name: note.noteNames.keyboard, holdable: false}
+                                    ) ?? "???")
+                                    .replace("Key", "")
+                                }
+                                handleClick={() => {
+                                    setSelected({
+                                        type: 'keyboard',
+                                        index: selected.index === i ? -1 : i
+                                    })
+                                }}
+                            />
+                        )}
+                    </div>
+                </div>
+
                 <h1>
                     Composer shortcuts
                 </h1>
@@ -112,43 +151,6 @@ export default function Keybinds() {
                         }}
                     />
                 </div>
-                <h1>
-                    Keyboard keybinds
-                </h1>
-                <div>
-                    You can remap the keyboard keys to whatever key on your keyboard
-                </div>
-                <div className="flex-centered">
-                    <div
-                        className={`keyboard ${APP_NAME === 'Sky' ? 'keyboard-5' : ''}`}
-                        style={{
-                            margin: '1rem 0'
-                        }}
-                    >
-                        {baseInstrument.notes.map((note, i) =>
-                            <BaseNote
-                                key={i}
-                                data={{
-                                    status: (selected.type === 'keyboard' && i === selected.index) ? 'clicked' : ''
-                                }}
-                                noteImage={baseInstrument.notes[i].noteImage}
-                                noteText={(
-                                    keyBinds.getKeyOfShortcut(
-                                        "keyboard",
-                                        {name: note.noteNames.keyboard, holdable: false}
-                                    ) ?? "???")
-                                    .replace("Key", "")
-                                }
-                                handleClick={() => {
-                                    setSelected({
-                                        type: 'keyboard',
-                                        index: selected.index === i ? -1 : i
-                                    })
-                                }}
-                            />
-                        )}
-                    </div>
-                </div>
                 <h1>
                     Vsrg keybinds
                 </h1>

diff --git a/src/service-worker.ts b/src/service-worker.ts
@@ -55,11 +55,13 @@ if (IS_TAURI) {
     console.log("registering routes")
     registerRoute(
         ({url}) => {
-            if (forbiddenCachedItems(new URL(url))) {
-                console.log("forbidden", url.pathname)
-                return false
+            try {
+                if (forbiddenCachedItems(new URL(url))) {
+                    return false
+                }
+            } catch (e) {
+                console.error("Error caching", e)
             }
-            console.log("allowed", url.pathname)
             return true
         },
         new NetworkFirst({
@@ -68,12 +70,15 @@ if (IS_TAURI) {
     );
     registerRoute(
         ({url}) => {
-            if (forbiddenCachedItems(new URL(url))){
-                 return false
-            }
-            if(url.pathname.endsWith(".mp3") || url.pathname.endsWith(".wav")){
-                console.log("runtime cache audio", url.pathname)
-                return true
+            try {
+                if (forbiddenCachedItems(new URL(url))) {
+                    return false
+                }
+                if (url.pathname.endsWith(".mp3") || url.pathname.endsWith(".wav")) {
+                    return true
+                }
+            } catch (e) {
+                console.error("Error caching", e)
             }
             return false
         },