fix: error handling when using compression with metadata requirements

mhx · Jan 4, 2024 · 4868612 · 4868612
1 parent 2a9f301
commit 4868612
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/mkdwarfs_main.cpp b/src/mkdwarfs_main.cpp
@@ -1224,7 +1224,18 @@ int mkdwarfs_main(int argc, sys_char** argv, iolayer const& iol) {
     categorizer_list.add_implicit_defaults(cop);
     LOG_VERBOSE << cop.as_string();
 
-    fsw->add_default_compressor(compression_opt.get());
+    {
+      auto bc = compression_opt.get();
+
+      if (!bc.metadata_requirements().empty()) {
+        throw std::runtime_error(
+            fmt::format("compression '{}' cannot be used without a category: "
+                        "metadata requirements not met",
+                        bc.describe()));
+      }
+
+      fsw->add_default_compressor(std::move(bc));
+    }
 
     if (recompress) {
       compression_opt.visit_contextual(

diff --git a/test/tool_main_test.cpp b/test/tool_main_test.cpp
@@ -1071,3 +1071,10 @@ TEST(mkdwarfs_test, output_file_fail_close) {
   EXPECT_NE(0, t.run({"-i", "/", "-o", "test.dwarfs"})) << t.err();
   EXPECT_THAT(t.err(), ::testing::HasSubstr("failed to close output file"));
 }
+
+TEST(mkdwarfs_test, compression_cannot_be_used) {
+  mkdwarfs_tester t;
+  EXPECT_NE(0, t.run({"-i", "/", "-o", "-", "-C", "flac"}));
+  EXPECT_THAT(t.err(),
+              ::testing::HasSubstr("cannot be used without a category"));
+}