Changeset 482

Timestamp:

Oct 13, 2007, 3:40:38 AM (14 years ago)

Author:

Peter Johansson

Message:

fixes #79 and #5. Only updating changed files.

Location:

trunk/lib

Files:

• Directory.cc (modified) (1 diff)
• File.cc (modified) (1 diff)
• Node.cc (modified) (1 diff)
• Node.h (modified) (2 diffs)
• Stats.cc (modified) (6 diffs)
• Stats.h (modified) (3 diffs)
• utility.cc (modified) (4 diffs)
• utility.h (modified) (2 diffs)

trunk/lib/Directory.cc

@@ -161 +161 @@
     if (user=="all")
       mkdir(imagedir);
-
     std::string html_name = outdir+"/index.html";
     std::ofstream os(html_name.c_str());

trunk/lib/File.cc

@@ -194 +194 @@
       std::cout << "Parsing " << path_ << std::endl; 
     stats_.reset();
+    std::string cache_dir = directory_name(path()) + std::string(".svndigest/"); 
+    std::string cache_file = cache_dir + name()+std::string(".svndigest-cache");
+    if (node_exist(cache_file)){
+      std::ifstream is(cache_file.c_str());
+      if (stats_.load_cache(is)){
+        return stats_;
+      }
+      std::cout << "failed: " << path_ << std::endl;
+    }
+    stats_.reset();
     stats_.parse(path_);
+    if (!node_exist(cache_dir))
+      mkdir(cache_dir);
+    std::ofstream os(cache_file.c_str());
+    stats_.print(os);
     return stats_;
   }

trunk/lib/Node.cc

@@ -154 +154 @@
         log_ = new SVNlog(log_core());
     return *log_;
+  }
+
+
+  std::string Node::name(void) const 
+  { 
+    std::string res = file_name(path_); 
+    return res;
   }
 

trunk/lib/Node.h

@@ -133 +133 @@
     /// @return name of node (not full path)
     ///
-    inline std::string name(void) const { return file_name(path_); }
+    std::string name(void) const;
 
     /**
@@ -139 +139 @@
        exception when an empty string is returned.
 
-       @return output dir for example 'lib' for this file
+       @return output dir for example 'lib/' for this file
      */
     std::string output_dir(void) const;

trunk/lib/Stats.cc

@@ -92 +92 @@
                   const Parser::line_type& lt)
   {
+    assert(user.size());
     authors_.insert(user);
 
@@ -145 +146 @@
 
 
-  void Stats::load(std::istream& is)
-  {
-    is >> last_changed_rev_;
+  bool Stats::load_cache(std::istream& is)
+  {
+    svn_revnum_t rev;
+    is >> rev;
+    if (rev<last_changed_rev_){
+      return false; // cache is not up to date
+    }
     size_t a_size=0;
     authors_.clear();
@@ -154 +159 @@
     while (authors_.size()<a_size){
       getline(is, str);
+      assert(str.size());
       authors_.insert(str);
     }
+    getline(is, str);
+    if (str!=code_cache()){
+      return false;
+    }
     load(is, code_);
+    getline(is, str);
+    getline(is, str);
+    if (str!=comments_cache()){
+      return false;
+    }
     load(is, comments_);
+    getline(is, str);
+    getline(is, str);
+    if (str!=empty_cache()){
+      return false;
+    }
     load(is, empty_);
+    getline(is, str);
+    getline(is, str);
+    if (str!=total_cache()){
+      return false;
+    }
     load(is, total_);
+    getline(is,str);
+    getline(is,str);
+    return str==end_of_cache();
   }
 
@@ -166 +194 @@
   {
     m.clear();
-    while (m.size() < authors_.size()) {
+    while (m.size() < authors_.size() && is.good()) {
       std::string name;
       std::getline(is, name);
+      assert(name.size());
       std::vector<u_int>& vec=m[name];
       size_t revs=0;
@@ -319 +348 @@
   void Stats::print(std::ostream& os) const
   {
-    os << last_changed_rev_ << "\n";
-    os << authors_.size() << "\n";
+    os << last_changed_rev_ << " ";
+    os << authors_.size() << " ";
+
     std::copy(authors_.begin(), authors_.end(), 
               std::ostream_iterator<std::string>(os, "\n"));
+    os << code_cache() << "\n";
     print(os, code_);
+    os << "\n" << comments_cache() << "\n";
     print(os, comments_);
+    os << "\n" << empty_cache() << "\n";
     print(os, empty_);
+    os << "\n" << total_cache() << "\n";
     print(os, total_);
+    os << "\n" << end_of_cache() << "\n";
   }
 
@@ -334 +369 @@
     for (MapConstIter_ i(m.begin()); i!=m.end(); ++i){
       os << i->first << "\n";
-      os << i->second.size() << "\n";
+      os << i->second.size() << " ";
       std::copy(i->second.begin(), i->second.end(),
-                std::ostream_iterator<u_int>(os, "\n"));
+                std::ostream_iterator<u_int>(os, " "));
     }
   }

trunk/lib/Stats.h

@@ -32 +32 @@
 
 #include <map>
+#include <istream>
 #include <set>
 #include <string>
@@ -104 +105 @@
     { return accumulated(total_, user).back(); }
 
+    /**
+       Load object from a stream.
+       
+       \return true if successful
+     */
+    bool load_cache(std::istream&);
+
     void parse(const std::string&);
 
@@ -178 +186 @@
              const Parser::line_type&); 
 
-
-    /**
-       Load object from a stream.
-     */
-    void load(std::istream&);
+    // Change this string if cache format is changed in such a way
+    // that all old cache files are obsolete.
+    inline std::string end_of_cache(void) const {return "END OF OK CACHE FILE";} 
+    inline std::string code_cache(void) const {return "CACHE CODE";} 
+    inline std::string comments_cache(void) const {return "CACHE COMMENTS";} 
+    inline std::string empty_cache(void) const {return "CACHE EMPTY";} 
+    inline std::string total_cache(void) const {return "CACHE TOTAL";} 
+    
 
     /**

trunk/lib/utility.cc

@@ -24 +24 @@
 #include "utility.h"
 
+#include <cerrno> 
 #include <cstdlib>
 #include <fstream>
@@ -79 +80 @@
 
 
+  std::string directory_name(std::string path)
+  {
+    size_t pos = path.find_last_of("/");
+    if (pos==path.size()-1)
+      return directory_name(path.substr(0,path.size()-2));
+    return path.substr(0,pos+1);
+  }
+
+
   std::string file_name(const std::string& full_path)
   {
@@ -140 +150 @@
   }
 
+  void mkdir(const std::string& dir)
+  { 
+    int code = ::mkdir(dir.c_str(),0777);
+    if (code){
+      std::stringstream ss;
+      ss << "mkdir(" << dir << "): failed with error code: errno=" << errno;
+      throw std::runtime_error(ss.str());
+    }
+  }
+
+
+  bool node_exist(const std::string& path)
+  {
+    struct stat buf;
+    return !stat(path.c_str(),&buf);
+  }
+
 
   int percent(int a, int b)
@@ -146 +173 @@
       return (100*a)/b;
     return 0;
-  }
-
-
-  bool node_exist(const std::string& path)
-  {
-    struct stat buf;
-    return !stat(path.c_str(),&buf);
   }
 

trunk/lib/utility.h

@@ -61 +61 @@
   void copy_file(const std::string& source, const std::string& target);
 
+  /**
+     Parsing out the directory of path that is everything prior the
+     last '/' with the eception if \a path ends with '/' in which case
+     everything prior the second last '/' is returned.
+
+     \return directory of path.
+   */
+  std::string directory_name(std::string path);
+
   ///
   /// @return everything after last '/'
@@ -113 +122 @@
   /// mkdir'.
   ///
-  inline int mkdir(const std::string& dir) { return ::mkdir(dir.c_str(),0777); }
+  void mkdir(const std::string& dir);
 
   ///