Strip out trailing newlines when reading object type.

ArtifactDB · Nov 20, 2023 · 0905bd0 · 0905bd0
1 parent 973d2bd
commit 0905bd0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/include/takane/utils_public.hpp b/include/takane/utils_public.hpp
@@ -30,6 +30,11 @@ inline std::string read_object_type(const std::filesystem::path& path) {
         size_t available = reader.available();
         output.insert(output.end(), buffer, buffer + available);
     }
+
+    // Removing trailing newline.
+    if (output.size() && output.back() == '\n') {
+        output.pop_back();
+    }
     return output;
 }
 

diff --git a/tests/src/dispatch.cpp b/tests/src/dispatch.cpp
@@ -6,6 +6,28 @@
 
 #include <filesystem>
 
+TEST(ReadObjectTest, Basic) {
+    std::filesystem::path dir = "TEST_readObj";
+    if (std::filesystem::exists(dir)) {
+        std::filesystem::remove_all(dir);
+    }
+    std::filesystem::create_directory(dir);
+
+    // Works with a trailing newline.
+    auto objpath = dir / "OBJECT";
+    {
+        std::ofstream output(objpath);
+        output << "foo_bar 2\n";
+    }
+    EXPECT_EQ(takane::read_object_type(dir), "foo_bar 2");
+
+    {
+        std::ofstream output(objpath);
+        output << "baz-stuff";
+    }
+    EXPECT_EQ(takane::read_object_type(dir), "baz-stuff");
+}
+
 TEST(GenericDispatch, Validate) {
     std::filesystem::path dir = "TEST_dispatcher";
     initialize_directory(dir, "foobar");