archive/zzip: improve error reporting

Most importantly, this commit translates ZZIP_ENOENT to std::system_error(ENOENT) so IsFileNotFound() returns true and find_stream_art() can suppress the log line.

archive/zzip: improve error reporting
32799ff6 · Max Kellermann · ce093be1 · 32799ff6 · 32799ff6
Commit 32799ff6 authored Dec 04, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 4 deletions

NEWS NEWS +2 -0

ZzipArchivePlugin.cxx src/archive/plugins/ZzipArchivePlugin.cxx +15 -4

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.17 (not yet released)
+* archive
+  - zzip: improve error reporting
 * outputs
  - jack: mark ports as terminal
  - shout: declare metadata as UTF-8

--- a/src/archive/plugins/ZzipArchivePlugin.cxx
+++ b/src/archive/plugins/ZzipArchivePlugin.cxx
 /*
- * Copyright 2003-2018 The Music Player Daemon Project
+ * Copyright 2003-2019 The Music Player Daemon Project
 * http://www.musicpd.org
 *
 * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 #include "../ArchiveVisitor.hxx"
 #include "input/InputStream.hxx"
 #include "fs/Path.hxx"
+#include "system/Error.hxx"
 #include "util/RuntimeError.hxx"

 #include <zzip/zzip.h>
@@ -120,9 +121,19 @@ ZzipArchiveFile::OpenStream(const char *pathname,
 			    Mutex &mutex)
 {
 	ZZIP_FILE *_file = zzip_file_open(dir->dir, pathname, 0);
-	if (_file == nullptr)
-		throw FormatRuntimeError("not found in the ZIP file: %s",
-					 pathname);
+	if (_file == nullptr) {
+		const auto error = (zzip_error_t)zzip_error(dir->dir);
+		switch (error) {
+		case ZZIP_ENOENT:
+			throw FormatFileNotFound("Failed to open '%s' in ZIP file",
+						 pathname);
+
+		default:
+			throw FormatRuntimeError("Failed to open '%s' in ZIP file: %s",
+						 pathname,
+						 zzip_strerror(error));
+		}
+	}

 	return std::make_unique<ZzipInputStream>(dir, pathname,
 						 mutex,