fixup! Add test on parsing of redirect file.

src/zimwriterfs/zimcreatorfs.cpp

@@ -30,8 +30,6 @@
 #include <limits.h>
 #include <cassert>
 
-
-using redirect_handler = std::function<void(std::string, std::string, std::string)>;
 void parse_redirectArticles(std::istream& in_stream, redirect_handler handler) {
   std::string line;
   int line_number = 1;
@@ -44,10 +42,12 @@ void parse_redirectArticles(std::istream& in_stream, redirect_handler handler) {
       );
     }
 
-    auto path = matches[1].str();
-    auto title = matches[2].str();
-    auto redirectUrl = matches[3].str();
-    handler(path, title, redirectUrl);
+    Redirect redirect = {
+      .path= matches[1].str(),
+      .title = matches[2].str(),
+      .target = matches[3].str()
+    };
+    handler(redirect);
     ++line_number;
   }
 }
@@ -74,7 +74,7 @@ void ZimCreatorFS::add_redirectArticles_from_file(const std::string& path)
 
   in_stream.open(path.c_str());
   try {
-    parse_redirectArticles(in_stream, [this](std::string path, std::string title, std::string redirectUrl) {this->addRedirection(path, title, redirectUrl);});
+    parse_redirectArticles(in_stream, [this](Redirect redirect) {this->addRedirection(redirect.path, redirect.title, redirect.target);});
   } catch(const std::runtime_error& e) {
     std::cerr << e.what() << "\nin redirect file " << path << std::endl;
     in_stream.close();

src/zimwriterfs/zimcreatorfs.h

@@ -23,6 +23,7 @@
 
 #include <vector>
 #include <string>
+#include <functional>
 
 #include <zim/writer/creator.h>
 
@@ -54,4 +55,11 @@ class ZimCreatorFS : public zim::writer::Creator
   std::string canonical_basedir;
 };
 
+struct Redirect {
+  std::string path, title, target;
+};
+
+using redirect_handler = std::function<void(Redirect)>;
+void parse_redirectArticles(std::istream& in_stream, redirect_handler handler);
+
 #endif  // OPENZIM_ZIMWRITERFS_ARTICLESOURCE_H

test/zimwriterfs-zimcreatorfs.cpp

@@ -18,7 +18,6 @@
 #include <unistd.h>
 #include <iostream>
 #include <magic.h>
-#include <functional>
 
 #include <zim/archive.h>
 
@@ -129,18 +128,10 @@ TEST(ZimCreatorFSTest, ThrowsErrorIfDirectoryNotExist)
   }, std::invalid_argument );
 }
 
-struct Redirect {
-  std::string path;
-  std::string title;
-  std::string target;
-};
-
 bool operator==(const Redirect& a, const Redirect& b) {
   return a.path == b.path && a.title == b.title && a.target == b.target;
 }
 
-void parse_redirectArticles(std::istream& in_stream, std::function<void(std::string, std::string, std::string)> handler);
-
 TEST(ZimCreatorFSTest, ParseRedirect)
 {
   {
@@ -151,13 +142,14 @@ TEST(ZimCreatorFSTest, ParseRedirect)
   std::vector<Redirect> found;
   parse_redirectArticles(
     ss,
-    [&](std::string path, std::string title, std::string target)
-     {found.push_back({path, title, target});}
+    [&](Redirect redirect)
+     {found.push_back(redirect);}
   );
 
-  std::vector<Redirect> expected;
-  expected.push_back({"path", "title", "target"});
-  expected.push_back({"A/path/to/somewhere", "An amazing title", "Another/path"});
+  const std::vector<Redirect> expected {
+    {"path", "title", "target"},
+    {"A/path/to/somewhere", "An amazing title", "Another/path"}
+  };
   EXPECT_EQ(found, expected);
   }
 
@@ -168,7 +160,7 @@ TEST(ZimCreatorFSTest, ParseRedirect)
     EXPECT_THROW({
       parse_redirectArticles(
             ss,
-            [&](std::string path, std::string title, std::string target)
+            [&](Redirect redirect)
              {}
           );
     }, std::runtime_error);