Ticket #8904: archive-prefix.patch

archive.cpp

@@ -71 +71 @@
  */
 class FSDirectoryMember : public ArchiveMember {
         FSNode  _node;
-  
+
 public:
         FSDirectoryMember(FSNode &node) : _node(node) {
         }
@@ -96 +96 @@
 
 FSDirectory::FSDirectory(const FSNode &node, int depth)
   : _node(node), _cached(false), _depth(depth) {
+
+        setPrefix(String::emptyString);
 }
 
+FSDirectory::FSDirectory(const String &prefix, const FSNode &node, int depth)
+  : _node(node), _cached(false), _depth(depth) {
+
+        setPrefix(prefix);
+}
+
 FSDirectory::FSDirectory(const String &name, int depth)
   : _node(name), _cached(false), _depth(depth) {
+
+        setPrefix(String::emptyString);
 }
 
+FSDirectory::FSDirectory(const String &prefix, const String &name, int depth)
+  : _node(name), _cached(false), _depth(depth) {
+
+        setPrefix(prefix);
+}
+
 FSDirectory::~FSDirectory() {
 }
 
+void FSDirectory::setPrefix(const String &prefix) {
+        _prefix = prefix;
+
+        if (!_prefix.empty() && !_prefix.hasSuffix("/")) {
+                _prefix += "/";
+        }
+}
+
 FSNode FSDirectory::getFSNode() const {
         return _node;
 }
@@ -113 +137 @@
         // make caching as lazy as possible
         if (!name.empty()) {
                 if (!_cached) {
-                        cacheDirectoryRecursive(_node, _depth, "");
+                        cacheDirectoryRecursive(_node, _depth, _prefix);
                         _cached = true;
                 }
 
@@ -157 +181 @@
 }
 
 FSDirectory *FSDirectory::getSubDirectory(const String &name, int depth) {
+        return getSubDirectory(String::emptyString, name, depth);
+}
+
+FSDirectory *FSDirectory::getSubDirectory(const String &prefix, const String &name, int depth) {
         if (name.empty() || !_node.isDirectory()) {
                 return 0;
         }
 
         FSNode node = lookupCache(_subDirCache, name);
-        return new FSDirectory(node, depth);
+        return new FSDirectory(prefix, node, depth);
 }
 
 void FSDirectory::cacheDirectoryRecursive(FSNode node, int depth, const String& prefix) {

archive.h

@@ -131 +131 @@
         // Key is stored in lowercase.
         typedef HashMap<String, FSNode, IgnoreCase_Hash, IgnoreCase_EqualTo> NodeCache;
         NodeCache       _fileCache, _subDirCache;
+        Common::String  _prefix;        // string that is prepended to each cache item key
+        void setPrefix(const String &prefix);
 
         // look for a match
         FSNode lookupCache(NodeCache &cache, const String &name);
@@ -146 +148 @@
          * unbound FSDirectory if name is not found on the filesystem or is not a directory.
          */
         FSDirectory(const String &name, int depth = 1);
+        FSDirectory(const String &prefix, const String &name, int depth = 1);
 
         /**
          * Create a FSDirectory representing a tree with the specified depth. Will result in an
          * unbound FSDirectory if node does not exist or is not a directory.
          */
         FSDirectory(const FSNode &node, int depth = 1);
+        FSDirectory(const String &prefix, const FSNode &node, int depth = 1);
 
         virtual ~FSDirectory();
 
@@ -165 +169 @@
          * @return a new FSDirectory instance
          */
         FSDirectory *getSubDirectory(const String &name, int depth = 1);
+        FSDirectory *getSubDirectory(const String &prefix, const String &name, int depth = 1);
 
         virtual bool hasFile(const String &name);
         virtual int listMatchingMembers(ArchiveMemberList &list, const String &pattern);