add error handling for xaudio (#5)

add error handling for xaudio

Author: wolfv

include/xtensor-io/xaudio.hpp

@@ -21,6 +21,11 @@ namespace xt
     auto load_wav(std::string filename)
     {
         SndfileHandle file(filename);
+        // testing for rawHandle because file not exist isn't handled otherwise
+        if (!file || file.rawHandle() == nullptr)
+        {
+            throw std::runtime_error(std::string("load_wav: ") + file.strError());
+        }
         auto result = xarray<T>::from_shape({(std::size_t) file.frames(), (std::size_t) file.channels()});
         file.read(result.raw_data(), (sf_count_t) result.size());
         return std::make_tuple(file.samplerate(), std::move(result));
@@ -39,6 +44,11 @@ namespace xt
     {
         auto&& de = xt::eval(e.derived_cast());
         SndfileHandle file(filename, SFM_WRITE, format, (int) de.shape()[1], samplerate);
+        // need to explicitly check the rawHandle otherwise permission errors etc. are not detected
+        if (!file || file.rawHandle() == nullptr)
+        {
+            throw std::runtime_error(std::string("dump_wav: ") + file.strError());
+        }
         file.write(de.raw_data(), (sf_count_t) de.size());
     }
 }

include/xtensor-io/ximage.hpp

@@ -16,7 +16,7 @@ namespace xt
         if (!in)
         {
             // something went wrong
-            throw std::runtime_error("Couldn't read image");
+            throw std::runtime_error("Error reading image.");
         }
         const OIIO::ImageSpec &spec = in->spec();
         int xres = spec.width;
@@ -44,7 +44,7 @@ namespace xt
         if (!out)
         {
             // something went wrong
-            throw std::runtime_error("Couldn't open file to write image.");
+            throw std::runtime_error("Error opening file to write image.");
         }
         OIIO::ImageSpec spec((int) ex.shape()[0], (int) ex.shape()[1], (int) ex.shape()[2], OIIO::TypeDesc::UINT8);
 

test/test_xaudio.cpp

@@ -57,4 +57,15 @@ namespace xt
 		EXPECT_TRUE(all(equal(std::get<1>(load_back), expected)));
 		EXPECT_EQ(std::get<0>(load_back), sampling_freq);
 	}
+
+	TEST(xaudio, errors)
+	{
+		EXPECT_THROW(load_wav("files/big.jpg"), std::runtime_error);
+		EXPECT_THROW(load_wav("hahahahahaha.jpg"), std::runtime_error);
+
+		auto load_one = xt::load_wav("files/xtensor.wav");
+		auto& arr_one = std::get<1>(load_one);
+		EXPECT_THROW(xt::dump_wav("/out.wav", arr_one, SF_FORMAT_WAV | SF_FORMAT_PCM_16, std::get<0>(load_one)),
+					 std::runtime_error);
+	}
 }