Merge 67670e6 into 20ac4bf

Author: a6guerre

README.md

@@ -38,21 +38,52 @@ Hyperpack is a command line utility used to create a hyperpage database
 file:
 
 ```
-Usage: hyperpack [--help] [--output VAR] directory
+Usage: hyperpack [--help] [--version] [--output VAR] [--verbose] directories...
 
 Positional arguments:
-  directory      Directory to scan for files to pack into the hyperpage database [required]
+  directories    Directories to scan for files to pack into the hyperpage database [nargs: 1 or more] [required]
 
 Optional arguments:
   -h, --help     shows help message and exits
+  -v, --version  prints version information and exits
   -o, --output   Output file for the hyperpage database [nargs=0..1] [default: "hyperpage.db"]
+  -v, --verbose  Show detailed output information
 ```
 
-It will iterate through a given directory, storing its files based on 
-paths relative to the given directory. It will also detect the mime
-type and store the contents of each file.
+### Note on Overwriting
 
+If two or more files share the same **relative subpath** (i.e., the same path within their respective parent directories), the file from the **rightmost directory** specified on the command line will overwrite the others in the final archive.
+
+Only **exact path matches** are considered conflicts — differing subdirectories or filenames will coexist as separate entries.
+
+#### Example
+
+Suppose you run:
+```bash
+hyperpack -o output.hp dir1 dir2 dir3
+```
+And the directories contain:
+```bash
+dir1/Subdir1/index.html
+dir2/Subdir2/index.html
+dir3/Index.html
+```
+These will result in three distinct files inside the archive:
+```bash
+Subdir1/index.html
+/Subdir2/index.html
+/Index.html
+```
+However, if two or more directories contain the same relative path, for example:
+```bash
+dir1/public/index.html
+dir2/public/index.html
+```
+then the file from dir2 (the rightmost one) will overwrite the file from dir1 in the resulting archive entry:
+```bash
+/public/index.html
+```
 ### Documentation and Example
 
 This is only intended to cover basic usage. For more info about the API,
-see the [docs](https://maxtek6.github.io/docs/hyperpage). To see how hyperpage is used in a basic use case, the [example](https://github.com/maxtek6/hyperpage/tree/master/example) should be helpful. 
+see the [docs](https://maxtek6.github.io/docs/hyperpage). To see how hyperpage is used in a basic use case, the [example](https://github.com/maxtek6/hyperpage/tree/master/example) should be helpful. 

hyperpack.cpp

@@ -48,6 +48,8 @@ class mapped_page : public hyperpage::page
 };
 
 static void run(int argc, char *argv[]);
+static void write_directory_to_file(const std::string &directory,
+                                    std::unique_ptr<hyperpage::writer> &writer);
 
 int main(int argc, char *argv[])
 {
@@ -92,13 +94,36 @@ size_t mapped_page::get_length() const
     return _mmap->length();
 }
 
+void write_directory_to_file(const std::string &directory, std::unique_ptr<hyperpage::writer> &writer)
+{
+    if (!std::filesystem::exists(directory))
+    {
+        throw std::runtime_error("The specified directory does not exist");
+    }
+    
+    if(!std::filesystem::is_directory(directory))
+    {
+        throw std::runtime_error("The specified directory is not a directory.");
+    }
+
+    for (const auto &entry : std::filesystem::recursive_directory_iterator(directory))
+    {
+        if (entry.is_regular_file())
+        {
+            mapped_page page(directory, entry.path());
+            writer->store(page);
+        }
+    }
+}
+
 void run(int argc, char *argv[])
 {
     argparse::ArgumentParser program("hyperpack");
     std::unique_ptr<hyperpage::writer> writer;
 
-    program.add_argument("directory")
-        .help("Directory to scan for files to pack into the hyperpage database")
+    program.add_argument("directories")
+        .help("Directories to scan for files to pack into the hyperpage database")
+        .nargs(argparse::nargs_pattern::at_least_one)
         .required();
     program.add_argument("-o", "--output")
         .help("Output file for the hyperpage database")
@@ -110,22 +135,12 @@ void run(int argc, char *argv[])
 
     program.parse_args(argc, argv);
 
-
-    auto directory = program.get<std::string>("directory");
-    if (!std::filesystem::exists(directory) || !std::filesystem::is_directory(directory))
-    {
-        throw std::runtime_error("The specified directory does not exist or is not a directory.");
-    }
-
     auto output_file = program.get<std::string>("--output");
-
     writer = std::make_unique<hyperpage::writer>(output_file);
-    for (const auto &entry : std::filesystem::recursive_directory_iterator(directory))
-    {
-        if (entry.is_regular_file())
-        {
-            mapped_page page(directory, entry.path());
-            writer->store(page);
-        }
-    }
-}
+    std::vector<std::string> directories = program.get<std::vector<std::string>>("directories");
+    std::for_each(directories.begin(), directories.end(), [&](const auto &directory)
+                                                          {
+                                                              write_directory_to_file(directory,
+                                                                                      writer);
+                                                          });
+}