From 7bf371566b992bb1c2cb6deef958c38ec019f31b Mon Sep 17 00:00:00 2001
From: "Eric J. Humphrey" <ejhumphrey@nyu.edu>
Date: Fri, 4 Mar 2016 15:59:29 -0500
Subject: [PATCH] Added more graceful support for empty soundfiles.

---
 claudio/fileio.py            |  18 +++++++++++++-----
 claudio/tests/empty.wav      | Bin 0 -> 44 bytes
 claudio/tests/test_fileio.py |   7 +++++++
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 claudio/tests/empty.wav

diff --git a/claudio/fileio.py b/claudio/fileio.py
index 9a4a972..0b57aa2 100644
--- a/claudio/fileio.py
+++ b/claudio/fileio.py
@@ -3,6 +3,7 @@
 import logging
 import numpy as np
 import os
+import warnings
 import wave
 
 import claudio.formats as formats
@@ -57,6 +58,8 @@ def __init__(self, filepath, samplerate=None, channels=None,
         logging.debug(util.classy_print(AudioFile, "Opening wave file."))
         self.__get_handle__(self.filepath, samplerate, channels, bytedepth)
         logging.debug(util.classy_print(AudioFile, "Success!"))
+        if self.duration == 0:
+            warnings.warn("Caution: You have opened an empty sound file!")
 
     def __get_handle__(self, filepath, samplerate, channels, bytedepth):
         """Get hooks into a wave object for reading or writing.
@@ -122,7 +125,7 @@ def reset(self):
         -------
         None
         """
-        self._EOF = False
+        pass
 
     def close(self):
         """Explicit destructor."""
@@ -296,7 +299,7 @@ def __init__(self, filepath, framesize,
         self._framesize = framesize
         self._alignment = alignment
         self._offset = offset
-        self._time_points = None
+        self._time_points = [None]
         logging.debug(util.classy_print(FramedAudioFile, "Init Striding."))
         self._init_striding(time_points, framerate, stride, overlap)
         self.reset()
@@ -505,6 +508,10 @@ def num_frames(self):
         else:
             return len(self._time_points)
 
+    @property
+    def end_of_file(self):
+        return self._time_index >= len(self._time_points)
+
     def _next_time_point(self):
         """Compute the next LEFT-ALIGNED time point given the current
         state of parameters.
@@ -512,10 +519,11 @@ def _next_time_point(self):
         Takes into account the three parameters of absolute index, alignment,
         and offset.
         """
+        if self._time_points is None:
+            raise ValueError("Audio file has no time grid; is it empty?")
+
         time_point = self._time_points[self._time_index]
         self._time_index += 1
-        if self._time_index == len(self._time_points):
-            self._EOF = True
 
         if self.alignment == 'center':
             time_point -= 0.5 * self.framesize / self.samplerate
@@ -602,7 +610,7 @@ def read_frame_at_time(self, time_point, framesize=None):
 
     def next(self):
         # For python 2.
-        if not self._EOF:
+        if not self.end_of_file:
             return self.read_frame_at_time(self._next_time_point())
         else:
             self.reset()
diff --git a/claudio/tests/empty.wav b/claudio/tests/empty.wav
new file mode 100644
index 0000000000000000000000000000000000000000..8dbde9545c9f3bc0f0edf6804a28471e5c5cc00f
GIT binary patch
literal 44
vcmWIYbaPW-U|<M$40BD(Em05vvKfKUWeo#EM+74S6N3OlN@7VOP?!M#xJU<e

literal 0
HcmV?d00001

diff --git a/claudio/tests/test_fileio.py b/claudio/tests/test_fileio.py
index 9b0b78b..c3c5ae3 100644
--- a/claudio/tests/test_fileio.py
+++ b/claudio/tests/test_fileio.py
@@ -166,5 +166,12 @@ def test_write_wave(self):
         assert fs1 == fs2
 
 
+def test_read_empty_wav():
+    sfile = os.path.join(os.path.dirname(__file__), 'empty.wav')
+    signal, samplerate = fileio.read(sfile)
+    assert len(signal) == 0
+    assert samplerate
+
+
 if __name__ == "__main__":
     unittest.main()