Changeset 201

Timestamp:

Sep 9, 2006, 7:36:34 PM (17 years ago)

Author:

Peter Johansson

Message:

fixes #76 and refs #87 new output file structure and draft to new main page.

Location:

trunk

Files:

• bin/svndigest.cc (modified) (2 diffs)
• lib/Directory.cc (modified) (3 diffs)
• lib/Directory.h (modified) (1 diff)
• lib/File.cc (modified) (2 diffs)
• lib/File.h (modified) (1 diff)
• lib/Node.cc (modified) (2 diffs)
• lib/Node.h (modified) (5 diffs)
• lib/html_utility.cc (modified) (7 diffs)
• lib/html_utility.h (modified) (2 diffs)
• lib/utility.cc (modified) (2 diffs)
• lib/utility.h (modified) (1 diff)

trunk/bin/svndigest.cc

@@ -138 +138 @@
   GnuplotFE::instance()->command(std::string("cd '")+option->targetdir()+"'");
   chdir(option->targetdir().c_str());
+  mkdir(tree.name());
+  print_css(tree.name()+"/svndigest.css");
+  print_main_page(tree.name(), commit_dates);
+  mkdir(tree.name()+"/all");
+  mkdir(tree.name()+"/all/total");
   try {
-    tree.print(option->verbose());
+    tree.print(tree.name()+"/all/total", option->verbose());
   }
   catch (const std::runtime_error& x) {
@@ -156 +161 @@
   if (option->verbose())
     std::cout << "Finalizing" << std::endl;
-  std::string css(file_name(option->root())+"/svndigest.css");
-  std::ofstream os(css.c_str());
-  print_css(os);
-  os.close();
 
   delete option;

trunk/lib/Directory.cc

@@ -72 +72 @@
           if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
             daughters_.push_back(new Directory(level_+1,fullpath, 
-                                               output_name()+"/"));
+                                               local_path()+"/"));
           else
-            daughters_.push_back(new File(level_,fullpath,output_name()+"/"));
+            daughters_.push_back(new File(level_,fullpath,local_path()+"/"));
           break;
         case SVN::unresolved:
@@ -118 +118 @@
 
 
-  void Directory::print(const bool verbose) const
+  void Directory::print(const std::string& out_path, const bool verbose) const
   {
-    mkdir(output_name());
-    std::string output(output_name() + "/index.html");
+    mkdir(out_path);
+    std::string output(out_path + "/index.html");
     if (verbose)
       std::cout << "Printing output for " << path_ << std::endl;
     std::ofstream os(output.c_str());
-    print_header(os, name(), level_);
+    print_header(os, name(), level_+2);
     path_anchor(os);
     os << "<p align=center>\n<img src='" 
-       << file_name(stats_.plot(output_name()+"/index.png", output_name()))
+       << file_name(stats_.plot(out_path+"/index.png", local_path()))
        << "' alt='[plot]' border=0><br>\n";
     os << "<table class=\"listings\">\n";
@@ -176 +176 @@
 
     // print daughter nodes, i.e, this function is recursive
-    std::for_each(daughters_.begin(), daughters_.end(),
-                  std::bind2nd(std::mem_fun(&Node::print),verbose));
+    for (NodeConstIterator i=daughters_.begin(); i!=daughters_.end(); ++i)
+      (*i)->print(out_path+"/"+(*i)->name(), verbose);
   }
 

trunk/lib/Directory.h

@@ -77 +77 @@
     const Stats& parse(const bool verbose=false);
 
-    void print(const bool verbose=false) const;
+    void print(const std::string&, const bool verbose=false) const;
 
     void print_copyright(const std::vector<std::string>& dates) const;

trunk/lib/File.cc

@@ -56 +56 @@
 
 
-  void File::print(const bool verbose) const 
+  void File::print(const std::string& out_path, const bool verbose) const 
   {
     // no output page for binary files
     if (ignore())
       return;
-    std::string output(output_name() + ".html");
+    std::string output(out_path + ".html");
     if (verbose)
       std::cout << "Printing output for " << path_ << std::endl;
     std::ofstream os(output.c_str());
-    print_header(os, name(), level_);
+    print_header(os, name(), level_+2);
     path_anchor(os);
     os << "<p align=center>\n<img src='" 
-       << file_name(stats_.plot(output_name()+".png",output_name()))
+       << file_name(stats_.plot(out_path+".png",local_path()))
        << "' alt='[plot]' border=0>\n</p>";
 
@@ -126 +126 @@
     if (ignore())
       return;
-    std::cout << "\nCOPYRIGHT " << output_name() << std::endl;
+    std::cout << "\nCOPYRIGHT " << local_path() << std::endl;
     // last rev and 4-chars string for each year
     std::vector<std::pair<size_t,std::string> > years;

trunk/lib/File.h

@@ -62 +62 @@
     ///
     ///
-    void print(const bool verbose=false) const;
+    void print(const std::string&, const bool verbose=false) const;
 
     void print_copyright(const std::vector<std::string>&) const;

trunk/lib/Node.cc

@@ -41 +41 @@
     binary_=property.binary();
     svndigest_ignore_=property.svndigest_ignore();
-    output_name_ = output+file_name(path_); 
+    local_path_ = output+file_name(path_); 
   }
 
@@ -57 +57 @@
     words.reserve(level_+1);
     std::string word;
-    std::stringstream ss(output_name());
+    std::stringstream ss(local_path());
     while(getline(ss,word,'/'))
       words.push_back(word);

trunk/lib/Node.h

@@ -115 +115 @@
     /// @return 
     ///
-    inline const std::string& output_name(void) const { return output_name_; }
+    inline const std::string& local_path(void) const { return local_path_; }
+
+    ///
+    /// Function returning everything after the last '/'
+    ///
+    /// @return name of node (not full path)
+    ///
+    inline std::string name(void) const { return file_name(path_); }
 
     ///
@@ -130 +137 @@
     /// Function printing HTML in current working directory
     ///
-    virtual void print(const bool verbose=false) const=0;
+    virtual void print(const std::string&, const bool verbose=false) const=0;
 
     virtual void print_copyright(const std::vector<std::string>& dates) const=0;
@@ -149 +156 @@
 
     ///
-    /// Function returning everything after the last '/'
-    ///
-    /// @return name of node (not full path)
-    ///
-    inline std::string name(void) const { return file_name(path_); }
-
-    ///
     /// print path in html format (with anchors) to @a os
     ///
@@ -161 +161 @@
 
     u_int level_;
-    std::string output_name_; //without suffix
-    std::string path_;
+    std::string local_path_; // path from root
+    std::string path_; // absolute path from
     Stats stats_;
 
@@ -181 +181 @@
     {   
       if (first->dir()==second->dir())
-        return first->output_name()<second->output_name();
+        return first->name()<second->name();
       return first->dir();
     }

trunk/lib/html_utility.cc

@@ -22 +22 @@
 */
 
+#include "html_utility.h"
 #include "utility.h"
 #include <config.h> // this header file is created by configure
@@ -32 +33 @@
 #include <sys/param.h>
 #include <unistd.h>
+#include <vector>
 
 namespace theplu{
@@ -90 +92 @@
   
 
-  void print_css(std::ostream& s)
-  {
+  void print_css(const std::string& str)
+  {
+    std::ofstream s(str.c_str());
     s << "body {\n";
     s << " background: #fff; \n";
@@ -128 +131 @@
     s << "}\n";
     s << "\n";
+    s << "div.main {\n";
+    s << " text-align: center\n";
+    s << "}\n";
     s << "table.listings {\n";
     s << " clear: both;\n";
@@ -175 +181 @@
     s << "\n";
     s << "\n";
+    s.close();
+  }
+
+
+  void print_main_page(const std::string& dir,
+                       const std::vector<std::string>& commit_dates)
+  {
+    std::string filename=dir+"/index.html";
+    std::ofstream os(filename.c_str());
+    print_header(os, dir, 0);
+    time_t now; 
+    time (&now);
+    u_int n7=0;
+    u_int n30=0;
+    u_int n365=0;
+    for (size_t i=1; i<commit_dates.size(); ++i){
+      double diff = difftime(now,str2time(commit_dates[i]));
+      if (diff<365*24*3600){
+        n365++;
+        if (diff<30*24*3600){
+          n30++;
+          if (diff<7*24*3600)
+            n7++;
+        }
+      }
+    }
+    os << "<div class=\"main\">\n"
+       << "<table><thead><tr><th>Statistics for " << dir 
+       << "</th></tr><thead>\n"
+       << "<tr><td>Commits last year</td><td>" << n365 << "</td></tr>\n"
+       << "<tr><td>Commits last month</td><td>" << n30 << "</td></tr>\n"
+       << "<tr><td>Commits last week</td><td>" << n7 << "</td></tr>\n"
+       << "</table></div>\n";
+    
+        
+    print_footer(os);
+    os.close();
   }
 
@@ -199 +242 @@
        << " xml:lang=\"en\" lang=\"en\"><head>\n"
        << "<head>\n"
-       << "<title> svndigest " << title << "</title>\n"
+       << "<title> " << title << " - svndigest</title>\n"
        << "</head>\n"
        << "<link rel=\"stylesheet\" "
@@ -212 +255 @@
     anchor(os, "index.html", "Home", level, "Main page");
     os << "</li>"
+       << "<li>";
+    anchor(os, "all/total/index.html", "Browse", level, "Browser");
+    os << "</li>"
        << "</ul></div>"
        << "<div id=\"main\">\n";

trunk/lib/html_utility.h

@@ -29 +29 @@
 #include <iosfwd>
 #include <string>
+#include <vector>
 
 namespace theplu{
@@ -52 +53 @@
 
   ///
-  /// @printing cascading style sheet to stream @a s.
+  /// @printing cascading style sheet to file name @a str.
   ///
-  void print_css(std::ostream& s);
+  void print_css(const std::string& str);
 
+  ///
+  /// @brief print main page
+  ///
+  void print_main_page(const std::string&, const std::vector<std::string>&);
+    
   ///
   /// @brief print html footer of page

trunk/lib/utility.cc

@@ -31 +31 @@
 #include <sys/param.h>
 #include <unistd.h>
+
+#include <iostream>
 
 namespace theplu{
@@ -84 +86 @@
   }
 
+  time_t str2time(const std::string& str)
+  {
+    //  str in format 2006-09-09T10:55:52.132733Z
+    std::stringstream sstream(str);
+    time_t rawtime;
+    struct tm * timeinfo;
+    time ( &rawtime );
+    timeinfo =  gmtime ( &rawtime );
+
+    u_int year, month, day, hour, minute, second;
+    std::string tmp;
+    getline(sstream,tmp,'-');
+    year=atoi(tmp.c_str());
+    timeinfo->tm_year = year - 1900;
+    std::cout << tmp << " " << year << std::endl;
+
+    getline(sstream,tmp,'-');
+    month=atoi(tmp.c_str());
+    timeinfo->tm_mon = month - 1;
+    std::cout << tmp << " " << month << std::endl;
+
+    getline(sstream,tmp,'T');
+    day=atoi(tmp.c_str());
+    timeinfo->tm_mday = day;
+    std::cout << tmp << " " << day << std::endl;
+
+    getline(sstream,tmp,':');
+    hour=atoi(tmp.c_str());
+    timeinfo->tm_hour = hour;
+    std::cout << tmp << " " << hour << std::endl;
+
+    getline(sstream,tmp,':');
+    minute=atoi(tmp.c_str());
+    timeinfo->tm_min = minute;
+    std::cout << tmp << " " << minute << std::endl;
+
+    getline(sstream,tmp,'.');
+    second=atoi(tmp.c_str());
+    timeinfo->tm_sec = second;
+    std::cout << tmp << " " << second << std::endl;
+
+    return mktime(timeinfo);
+  }
+
+
 }} // end of namespace svndigest and namespace theplu

trunk/lib/utility.h

@@ -94 +94 @@
 
   ///
+  ///
+  ///
+  time_t str2time(const std::string&);
+
+  ///
   /// Calculating sum of two vectors.
   ///