X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffile_group.cc;h=9863a21cbd37617c5f69fa14be7aae7bb5b55dc5;hb=e5277d4042b896c4b50c694fba0f1afb47337f45;hp=54ec8280c0a6830da2a671137dc7a4f45336b61b;hpb=74fe68e5895654e27a7cf8097917c1e95fa89519;p=dcpomatic.git

diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc
index 54ec8280c..9863a21cb 100644
--- a/src/lib/file_group.cc
+++ b/src/lib/file_group.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,11 +22,13 @@
  *  @brief FileGroup class.
  */
 
-#include <cstdio>
-#include <sndfile.h>
 #include "file_group.h"
 #include "exceptions.h"
 #include "cross.h"
+#include "compose.hpp"
+#include <sndfile.h>
+#include <cstdio>
+#include <iostream>
 
 using std::vector;
 using std::cout;
@@ -34,6 +37,7 @@ using std::cout;
 FileGroup::FileGroup ()
 	: _current_path (0)
 	, _current_file (0)
+	, _current_size (0)
 {
 
 }
@@ -42,6 +46,7 @@ FileGroup::FileGroup ()
 FileGroup::FileGroup (boost::filesystem::path p)
 	: _current_path (0)
 	, _current_file (0)
+	, _current_size (0)
 {
 	_paths.push_back (p);
 	ensure_open_path (0);
@@ -82,7 +87,7 @@ FileGroup::ensure_open_path (size_t p) const
 		/* Already open */
 		return;
 	}
-	
+
 	if (_current_file) {
 		fclose (_current_file);
 	}
@@ -90,8 +95,9 @@ FileGroup::ensure_open_path (size_t p) const
 	_current_path = p;
 	_current_file = fopen_boost (_paths[_current_path], "rb");
 	if (_current_file == 0) {
-		throw OpenFileError (_paths[_current_path]);
+		throw OpenFileError (_paths[_current_path], errno, OpenFileError::READ);
 	}
+	_current_size = boost::filesystem::file_size (_paths[_current_path]);
 }
 
 int64_t
@@ -111,9 +117,9 @@ FileGroup::seek (int64_t pos, int whence) const
 		}
 #ifdef DCPOMATIC_WINDOWS
 		full_pos += _ftelli64 (_current_file);
-#else		
+#else
 		full_pos += ftell (_current_file);
-#endif		
+#endif
 		full_pos += pos;
 		break;
 	case SEEK_END:
@@ -145,25 +151,39 @@ FileGroup::seek (int64_t pos, int whence) const
 /** Try to read some data from the current position into a buffer.
  *  @param buffer Buffer to write data into.
  *  @param amount Number of bytes to read.
- *  @return Number of bytes read, or -1 in the case of error.
+ *  @return Number of bytes read.
  */
 int
 FileGroup::read (uint8_t* buffer, int amount) const
 {
 	int read = 0;
-	while (1) {
-		int const this_time = fread (buffer + read, 1, amount - read, _current_file);
+	while (true) {
+		int64_t to_read = amount - read;
+#ifdef DCPOMATIC_WINDOWS
+		/* If we over-read from the file by too much on Windows we get a errno=22 rather than an feof condition,
+		 * for unknown reasons.  So if we're going to over-read, we need to do it by a little bit, so that feof
+		 * still gets triggered but there is no errno=22.
+		 */
+		to_read = std::min(to_read, static_cast<int64_t>(_current_size - _ftelli64(_current_file) + 1));
+#endif
+		int const this_time = fread (buffer + read, 1, to_read, _current_file);
 		read += this_time;
 		if (read == amount) {
 			/* Done */
 			break;
 		}
 
-		/* See if there is another file to use */
-		if ((_current_path + 1) >= _paths.size()) {
-			break;
+		if (ferror(_current_file)) {
+			throw FileError (String::compose("fread error %1", errno), _paths[_current_path]);
+		}
+
+		if (feof (_current_file)) {
+			/* See if there is another file to use */
+			if ((_current_path + 1) >= _paths.size()) {
+				break;
+			}
+			ensure_open_path (_current_path + 1);
 		}
-		ensure_open_path (_current_path + 1);
 	}
 
 	return read;