Add collision number to same file names

now if two files have the same name, the 2nd file is changed to "originalFileName(1)"
openzim · Apr 29, 2024 · 93ab559 · 93ab559
1 parent 717afc0
commit 93ab559
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/zimfuse/node.h b/src/zimfuse/node.h
@@ -12,6 +12,7 @@ struct Node {
   Node* parent;
   std::string fullPath;
   std::string originalPath;
+  int collisionCount = 0;
   std::vector<Node*> children;
 
   void addChild(Node* child)

diff --git a/src/zimfuse/tree.cpp b/src/zimfuse/tree.cpp
@@ -9,13 +9,18 @@ std::string sanitize(const std::string& name)
   return name;
 }
 
-std::pair<Node*, bool> Tree::attachFile(const std::string& name, Node* parent)
+std::pair<Node*, bool> Tree::attachFile(const std::string& name, Node* parent, int collisionCount = 0)
 {
   auto sanitizedName = sanitize(name);
+  if (collisionCount)
+    sanitizedName += '(' + std::to_string(collisionCount) + ')';
   auto fullPath = parent->fullPath + '/' + sanitizedName;
   auto originalPath = parent->originalPath + '/' + name;
-  if (mappedNodes.count(fullPath))
-    return {mappedNodes[fullPath].get(), false};
+  if (mappedNodes.count(fullPath)) {
+    auto node = mappedNodes[fullPath].get();
+    node->collisionCount++;
+    return attachFile(name, parent, node->collisionCount);
+  }
 
   auto n = Node::Ptr(new Node{.name = sanitizedName,
                               .isDir = false,

diff --git a/src/zimfuse/tree.h b/src/zimfuse/tree.h
@@ -10,7 +10,7 @@ class Tree
 public:
     Tree(const std::string &path);
     std::pair<Node*, bool> attachNode(const std::string& path, Node* parent);
-    std::pair<Node*, bool> attachFile(const std::string& path, Node* parent);
+    std::pair<Node*, bool> attachFile(const std::string& path, Node* parent, int collisionCount);
     Node* findNode(const std::string& name);
     zim::Archive* getArchive() { return &zimArchive; } 
     ~Tree();