Fix bugs

src/main/main.ts

@@ -18,7 +18,7 @@ import {
   ipcMain,
   protocol,
   screen,
-  net,
+  powerSaveBlocker,
 } from 'electron';
 import { autoUpdater } from 'electron-updater';
 import log from 'electron-log';
@@ -39,6 +39,8 @@ let mainWindow: BrowserWindow | null = null;
 
 const store = new Store();
 
+let powerSaveBlockerId: number = -1;
+
 ipcMain.on('load-song', async (event, id) => {
   const songData = (store.get('songs') as StorageSchema['songs'])[id];
 
@@ -126,6 +128,8 @@ const createWindow = async () => {
     return display.bounds.x !== 0 || display.bounds.y !== 0;
   });
 
+  powerSaveBlockerId = powerSaveBlocker.start('prevent-display-sleep');
+
   mainWindow = new BrowserWindow({
     show: false,
     x: externalDisplay ? externalDisplay.bounds.x + 50 : 0,
@@ -176,6 +180,7 @@ app.on('window-all-closed', () => {
   // after all windows have been closed
   if (process.platform !== 'darwin') {
     app.quit();
+    powerSaveBlocker.stop(powerSaveBlockerId);
   }
 });
 

src/main/util.ts

@@ -35,7 +35,7 @@ export async function parseAndSaveSongs(
 
   store.delete('songs');
 
-  glob(`${result.filePaths[0]}/**/*.mid`, {}, (err, files) => {
+  glob(`${result.filePaths[0]}/**/notes.mid`, {}, (err, files) => {
     const songList = files
       .map((file) => path.join(path.dirname(file), 'song.ini'))
       .filter((file) => fs.existsSync(file))

src/midi-parser/parser.ts

@@ -245,7 +245,7 @@ export class MidiParser {
           const currentModifierNotes = this.modifierNotes.filter(
             (modifier) =>
               currentTick >= modifier.note.ticks &&
-              currentTick <= modifier.note.ticks + modifier.note.durationTicks,
+              currentTick < modifier.note.ticks + modifier.note.durationTicks,
           );
 
           if (tickNotes) {
@@ -379,10 +379,6 @@ export class MidiParser {
               return note;
             }
 
-            if (!note.isRest) {
-              return this.getClosestDuration(availableDurations, note);
-            }
-
             const atomicDurations = this.getSubsets(
               availableDurations,
               note.durationTicks ?? 0,
@@ -399,15 +395,15 @@ export class MidiParser {
                 const { duration, dotted, isTriplet } =
                   this.durationMap[durationTicks];
 
-                const isRest = note.isRest || index === 0;
+                const isRest = note.isRest || index !== 0;
                 const newNote: Note = {
                   isTriplet: isTriplet ?? false,
                   dotted: dotted ?? false,
                   durationTicks,
                   isRest,
                   tick: 0,
                   duration: `${duration}${isRest ? 'r' : ''}`,
-                  notes: note.isRest ? ['b/4'] : note.notes,
+                  notes: isRest ? ['b/4'] : note.notes,
                 };
 
                 return newNote;

src/renderer/services/audio-player/player.ts

@@ -42,6 +42,8 @@ export class AudioPlayer {
 
         const audioTrack = new AudioTrack(audioBuffers, name, this.context);
 
+        audioTrack.endedListener = this.trackEndedListener;
+
         this.audioTracks.push(audioTrack);
 
         return audioTrack;
@@ -89,4 +91,12 @@ export class AudioPlayer {
 
     this.context.close();
   }
+
+  trackEndedListener = () => {
+    if (this.audioTracks.filter((track) => !track.ended).length !== 0) {
+      return;
+    }
+
+    this.stop();
+  };
 }

src/renderer/services/audio-player/track.ts

@@ -7,6 +7,10 @@ export class AudioTrack {
 
   duration: number;
 
+  ended: boolean = false;
+
+  endedListener: (() => void) | null = null;
+
   constructor(
     public buffers: AudioBuffer[],
     public name: string,
@@ -34,32 +38,58 @@ export class AudioTrack {
   }
 
   start(at: number, offset: number) {
+    if (this.sources.length > 0) {
+      this.stop();
+    }
+
+    this.ended = false;
+
     this.sources = this.buffers.map((buffer, index) => {
       const source = this.context.createBufferSource();
       source.buffer = buffer;
       source.start(at, offset);
 
       source.connect(this.gainNodes[index]);
 
+      source.addEventListener('ended', this.endedEventListener);
+
       return source;
     });
   }
 
   stop() {
-    this.sources.forEach((source) => {
-      source.stop(0);
-      source.disconnect();
-    });
+    this.sources.forEach((source) => this.stopSource(source));
 
     this.sources = [];
   }
 
+  endedEventListener = (event: Event) => {
+    const source = event.currentTarget as AudioBufferSourceNode;
+
+    this.stopSource(source);
+    this.sources.splice(this.sources.indexOf(source), 1);
+
+    if (this.sources.length === 0) {
+      this.ended = true;
+
+      this.endedListener?.();
+    }
+  };
+
+  stopSource(source: AudioBufferSourceNode) {
+    source.stop();
+    source.removeEventListener('ended', this.endedEventListener);
+    source.disconnect();
+  }
+
   destroy() {
     this.stop();
 
     this.gainNodes.forEach((node) => {
       node.disconnect();
     });
     this.gainNodes = [];
+
+    this.endedListener = null;
   }
 }

src/renderer/views/SelectSongView/SelectSongView.tsx

@@ -7,6 +7,7 @@ import {
   Header,
   ScanSongsButton,
   SongListContainer,
+  SongNumber,
   SongViewOverlay,
   Wrapper,
 } from './styles';
@@ -54,6 +55,9 @@ export function SelectSongView() {
             setNameFilter(value);
           }}
         />
+        <SongNumber>
+          {filteredSongList.length} / {songList.length}
+        </SongNumber>
       </Header>
       <SongListContainer>
         <SongList

src/renderer/views/SelectSongView/styles.ts

@@ -35,6 +35,14 @@ export const Header = styled.div`
   padding: 20px;
   z-index: 10;
   box-shadow: ${theme.boxShadow.soft};
+  display: flex;
+  flex-flow: column;
+`;
+
+export const SongNumber = styled.div`
+  margin-left: auto;
+  color: ${theme.color.foreground};
+  font-size: 12px;
 `;
 
 export const ScanSongsButton = styled(FloatButton)`