From abd676fa49516169d240407ff058f8a70a58af2b Mon Sep 17 00:00:00 2001
From: Nekojimi <Jim@nekojimi.moe>
Date: Mon, 1 Apr 2024 12:39:09 +0100
Subject: [PATCH] Retry opening track files after failure, and gracefully
 handle final failure by skipping the track.

---
 .../moe/nekojimi/chords/MusicHandler.java     |  1 +
 .../java/moe/nekojimi/chords/TrackPlayer.java | 34 +++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/moe/nekojimi/chords/MusicHandler.java b/src/main/java/moe/nekojimi/chords/MusicHandler.java
index 4cac37e..83c7524 100644
--- a/src/main/java/moe/nekojimi/chords/MusicHandler.java
+++ b/src/main/java/moe/nekojimi/chords/MusicHandler.java
@@ -105,6 +105,7 @@ public class MusicHandler implements AudioSendHandler, Closeable, Consumer<Track
         } catch (UnsupportedAudioFileException | IOException ex)
         {
             Logger.getLogger(Chords.class.getName()).log(Level.SEVERE, null, ex);
+            skipTrack();
         } finally
         {
         }
diff --git a/src/main/java/moe/nekojimi/chords/TrackPlayer.java b/src/main/java/moe/nekojimi/chords/TrackPlayer.java
index e622dd4..0472f26 100644
--- a/src/main/java/moe/nekojimi/chords/TrackPlayer.java
+++ b/src/main/java/moe/nekojimi/chords/TrackPlayer.java
@@ -8,6 +8,8 @@ package moe.nekojimi.chords;
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
@@ -24,6 +26,8 @@ public class TrackPlayer implements Closeable
 
     private static final int DESIRED_BUFFER_SIZE = 3840 * 500;
     private static final int MAX_READ_FAILS = 3;
+    private static final int RETRY_COUNT = 10;
+    private static final int RETRY_DELAY = 100;
 
     private final CircularByteBuffer audioBuffer = new CircularByteBuffer(3840 * 1024);
 
@@ -33,8 +37,34 @@ public class TrackPlayer implements Closeable
 
     public TrackPlayer(Track track) throws UnsupportedAudioFileException, IOException
     {
-        AudioInputStream in = AudioSystem.getAudioInputStream(track.getLocation());
-        AudioFormat decodedFormat = AudioSendHandler.INPUT_FORMAT;
+        AudioInputStream in = null;
+        AudioFormat decodedFormat = null;
+        for (int retry = 0; retry < RETRY_COUNT; retry++)
+        {
+            try
+            {
+                in = AudioSystem.getAudioInputStream(track.getLocation());
+                decodedFormat = AudioSendHandler.INPUT_FORMAT;
+
+                break; // it worked!
+            } catch (IOException ex)
+            {
+                try
+                {
+                    Thread.sleep(((long) Math.pow(2, retry)) * RETRY_DELAY);
+                } catch (InterruptedException ex1)
+                {
+                    if (retry < RETRY_COUNT)
+                    {
+                        System.err.println("Open file " + track.getLocation() + " failed, retry " + retry + "...");
+                        continue;
+                    } else
+                    {
+                        throw ex;
+                    }
+                }
+            }
+        }
         input = AudioSystem.getAudioInputStream(decodedFormat, in);
         fillBuffer(false);
     }