Changeset 18 for trunk/lib

Timestamp:

Dec 30, 2005, 6:41:33 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Directory tree created. Use purge() to remove non subversion controlled entries.

Location:

trunk/lib

Files:

• Directory.cc (modified) (6 diffs)
• Directory.h (modified) (4 diffs)
• Node.cc (modified) (1 diff)
• Node.h (modified) (1 diff)

trunk/lib/Directory.cc

@@ -7 +7 @@
 #include <iostream>
 #include <iterator>
+#include <list>
 
 #include <errno.h>  // Needed to check error state below.
@@ -24 +25 @@
       exit(1);
     }
-    vector<string> entries;
+    list<string> entries;
     struct dirent* entry;
     errno=0;  // Global variable used by C to track errors.
@@ -37 +38 @@
 
     // Jari, change this to some STL algo?
-    for (vector<string>::iterator i=entries.begin(); i!=entries.end(); i++)
-      if ((*i)!=string(".") && (*i)!=string("..")) {
+    for (list<string>::iterator i=entries.begin(); i!=entries.end(); i++)
+      if ((*i)!=string(".") && (*i)!=string("..") && (*i)!=string(".svn")) {
         /// Jari, should test if directory in some other way
-        DIR* dirtest=opendir(i->c_str());
+        string fullpath(path_+'/'+(*i));
+        DIR* dirtest=opendir(fullpath.c_str());
         if (!dirtest)
-          daughters_.push_back(new File(*i));
+          daughters_.push_back(new File(fullpath));
         else
-          daughters_.push_back(new Directory(*i));
+          daughters_.push_back(new Directory(fullpath));
       }
   }
@@ -52 +54 @@
   {
     // Jari, change this to some STL algo?
-    for (std::vector<Node*>::iterator i=daughters_.begin();
+    for (std::list<Node*>::iterator i=daughters_.begin();
          i!=daughters_.end(); i++)
       delete *i;
@@ -62 +64 @@
     stats_.reset();
 
-    for (size_t i = 0; i<daughters_.size(); i++)
-      stats_ += daughters_[i]->parse();
+    for (std::list<Node*>::iterator i=daughters_.begin();
+         i!=daughters_.end(); i++)
+      stats_ += (*i)->parse();
     return stats_;
   }
@@ -70 +73 @@
   void Directory::print(void) {
     // Jari, temporary using this to print directory tree
-    std::cout << "-------------- Directory '" << path_ << "'" << std::endl;
     for_each(daughters_.begin(),daughters_.end(), std::mem_fun(&Node::print));
   }
 
+
+  void Directory::purge(void) {
+    for (std::list<Node*>::iterator i=daughters_.begin(); i!=daughters_.end(); )
+      if (!((*i)->subversion_controlled())) {
+        delete *i;
+        i=daughters_.erase(i);
+      }
+      else {
+        (*i)->purge();
+        i++;
+      }
+  }
+
 }} // end of namespace svnstat and namespace theplu

trunk/lib/Directory.h

@@ -6 +6 @@
 #include "Node.h"
 
-#include <vector>
+#include <list>
+#include <string>
 
 namespace theplu{
@@ -20 +21 @@
     /// @brief Constructor
     ///
+    /// Recursively create a directory tree starting from \a
+    /// path. Nodes named '.', '..', and '.svn' are ignored and not
+    /// traversed.
+    ///
     Directory(const std::string& path);
 
@@ -31 +36 @@
     void print(void);
 
+    void purge(void);
+
   private:
     ///
@@ -37 +44 @@
     Directory(const Directory&);
 
-    std::vector<Node*> daughters_;
+    std::list<Node*> daughters_;
   };
 

trunk/lib/Node.cc

@@ -37 +37 @@
   }
 
-  
+
+  bool Node::subversion_controlled(void) const {
+    std::string system_call = "svn proplist " + path_ + ">&/dev/null";
+    return !system(system_call.c_str());
+  }
+
 }} // end of namespace svnstat and namespace theplu

trunk/lib/Node.h

@@ -37 +37 @@
     virtual void print(void)=0;
 
+    inline virtual void purge(void) { /* Nothing to be done */ };
+
     ///
-    /// Check if the node is under subversion control. If node
-    /// is under subversion control, information about node is 
-    /// parsed from the 'svn info' output.
-    /// 
+    /// Check if the node is under subversion control. This is done by
+    /// checking the return status of 'svn proplist <Node>.
     ///
     /// @return True if subversion controlled, false otherwise.
     ///
-    bool subversion_controlled(void);
+    bool subversion_controlled(void) const;
 
   protected: