Ticket #8904: archivemember-2.patch

archive.cpp

@@ -30 +30 @@
 namespace Common {
 
 
-int Archive::matchPattern(StringList &list, const String &pattern) {
+int Archive::listMatchingMembers(ArchiveMemberList &list, const String &pattern) {
         // Get all "names" (TODO: "files" ?)
-        StringList allNames;
-        getAllNames(allNames);
+        ArchiveMemberList allNames;
+        listMembers(allNames);
 
         int matches = 0;
 
@@ -41 +41 @@
         String lowercasePattern = pattern;
         lowercasePattern.toLowercase();
 
-        StringList::iterator it = allNames.begin();
+        ArchiveMemberList::iterator it = allNames.begin();
         for ( ; it != allNames.end(); it++) {
-                if (it->matchString(lowercasePattern)) {
+                if ((*it)->getName().matchString(lowercasePattern)) {
                         list.push_back(*it);
                         matches++;
                 }
@@ -52 +52 @@
         return matches;
 }
 
+/**
+ *  FSDirectoryMemeber is the implementation of ArchiveMember used by
+ *  by FSDirectory. It is right now a light wrapper or FSNode.
+ */
+class FSDirectoryMember : public ArchiveMember {
+        FilesystemNode  _node;
 
+public:
+        FSDirectoryMember(FilesystemNode &node) : _node(node) {
+        }
+
+        /*
+                NOTE/FIXME: since I assume that the only use case for getName()
+                is for error messages, I am returning the full path of the node
+                here. This seems better than we did before, when matchPattern
+                and getAllNames used to work with StringList, and we used to
+                put the relative path of the file to the list instead.
+        */
+        String getName() const {
+                return _node.getPath();
+        }
+
+        SeekableReadStream *open() {
+                return _node.openForReading();
+        }
+};
+
+typedef SharedPtr<FSDirectoryMember> FSDirectoryMemberPtr;
+
+
 FSDirectory::FSDirectory(const FilesystemNode &node, int depth)
   : _node(node), _cached(false), _depth(depth) {
 }
@@ -159 +188 @@
 
 }
 
-int FSDirectory::matchPattern(StringList &list, const String &pattern) {
+int FSDirectory::listMatchingMembers(ArchiveMemberList &list, const String &pattern) {
         if (!_node.isDirectory())
                 return 0;
 
@@ -169 +198 @@
                 _cached = true;
         }
 
-        // Small optimization: Ensure the StringList has to grow at most once
-        list.reserve(list.size() + _fileCache.size());
-        
-        // Add all filenames from our cache
+        String lowercasePattern(pattern);
+        lowercasePattern.toLowercase();
+
+        int matches = 0;
         NodeCache::iterator it = _fileCache.begin();
         for ( ; it != _fileCache.end(); it++) {
-                if (it->_key.matchString(pattern))
-                        list.push_back(it->_key);
+                if ((*it)._key.matchString(lowercasePattern)) {
+                        list.push_back(FSDirectoryMemberPtr(new FSDirectoryMember((*it)._value)));
+                        matches++;
+                }
         }
-        
-        return _fileCache.size();
+        return matches;
 }
 
-int FSDirectory::getAllNames(StringList &list) {
-        if (!_node.isDirectory())
-                return 0;
+int FSDirectory::listMembers(ArchiveMemberList &list) {
+        return listMatchingMembers(list, "*");
+}
 
-        // Cache dir data
-        if (!_cached) {
-                cacheDirectoryRecursive(_node, _depth, "");
-                _cached = true;
-        }
 
-        // Small optimization: Ensure the StringList has to grow at most once
-        list.reserve(list.size() + _fileCache.size());
-        
-        // Add all filenames from our cache
-        NodeCache::iterator it = _fileCache.begin();
-        for ( ; it != _fileCache.end(); it++) {
-                list.push_back((*it)._key);
-        }
-        
-        return _fileCache.size();
-}
 
 
 
@@ -288 +302 @@
         return false;
 }
 
-int SearchSet::matchPattern(StringList &list, const String &pattern) {
+int SearchSet::listMatchingMembers(ArchiveMemberList &list, const String &pattern) {
         int matches = 0;
 
         ArchiveList::iterator it = _list.begin();
         for ( ; it != _list.end(); it++) {
-                matches += (*it)._arc->matchPattern(list, pattern);
+                matches += (*it)._arc->listMatchingMembers(list, pattern);
         }
 
         return matches;
 }
 
-int SearchSet::getAllNames(StringList &list) {
+int SearchSet::listMembers(ArchiveMemberList &list) {
         int matches = 0;
 
         ArchiveList::iterator it = _list.begin();
         for ( ; it != _list.end(); it++) {
-                matches += (*it)._arc->getAllNames(list);
+                matches += (*it)._arc->listMembers(list);
         }
 
         return matches;

archive.h

@@ -36 +36 @@
 
 namespace Common {
 
+class ArchiveMember {
+public:
+        virtual ~ArchiveMember() { }
+        virtual String getName() const = 0;
+        virtual SeekableReadStream *open() = 0;
+};
+
+typedef List<SharedPtr<ArchiveMember> > ArchiveMemberList;
+
 /**
  * FilePtr is a convenient way to keep track of a SeekableReadStream without
  * having to worry about releasing its memory.
@@ -63 +72 @@
          *
          * @return the number of names added to list
          */
-        virtual int matchPattern(StringList &list, const String &pattern);
+        virtual int listMatchingMembers(ArchiveMemberList &list, const String &pattern);
 
         /**
          * Add all the names present in the Archive to list. Returned
@@ -72 +81 @@
          *
          * @return the number of names added to list
          */
-        virtual int getAllNames(StringList &list) = 0;
+        virtual int listMembers(ArchiveMemberList &list) = 0;
 
         /**
          * Create a stream bound to a file in the archive.
@@ -138 +147 @@
         FSDirectory *getSubDirectory(const String &name);
 
         virtual bool hasFile(const String &name);
-        virtual int matchPattern(StringList &list, const String &pattern);
-        virtual int getAllNames(StringList &list);
+        virtual int listMatchingMembers(ArchiveMemberList &list, const String &pattern);
+        virtual int listMembers(ArchiveMemberList &list);
         virtual SeekableReadStream *openFile(const String &name);
 };
 
@@ -192 +201 @@
         void setPriority(const String& name, uint priority);
 
         virtual bool hasFile(const String &name);
-        virtual int matchPattern(StringList &list, const String &pattern);
-        virtual int getAllNames(StringList &list);
+        virtual int listMatchingMembers(ArchiveMemberList &list, const String &pattern);
+        virtual int listMembers(ArchiveMemberList &list);
 
         /**
          * Implements openFile from Archive base class. The current policy is