Changeset 1254

Timestamp:

Nov 1, 2010, 12:20:34 AM (13 years ago)

Author:

Peter Johansson

Message:

closes #228. Added count number of files and directories on first page. No count for individual authors.

Location:

trunk

Files:

• bin/svndigest.cc (modified) (2 diffs)
• lib/Makefile.am (modified) (2 diffs)
• lib/NodeCounter.cc (added)
• lib/NodeCounter.h (added)
• lib/first_page.cc (modified) (5 diffs)
• lib/first_page.h (modified) (3 diffs)

trunk/bin/svndigest.cc

@@ -30 +30 @@
 #include "lib/html_utility.h"
 #include "lib/main_utility.h"
+#include "lib/NodeCounter.h"
 #include "lib/rmdirhier.h"
 #include "lib/Stats.h"
@@ -123 +124 @@
                              option.report());
     tree.traverse(visitor);
-    //    const StatsCollection& stats(tree.parse(option.verbose(), 
-    //                                      option.ignore_cache()));
+    NodeCounter file_count;
+    tree.traverse(file_count);
 
     if (option.report())
-      print_main_page(tree.name(), tree.log(), tree.stats(), tree.url());
+      print_main_page(tree.name(), tree.log(), tree.stats(), tree.url(), 
+                      file_count);
 
   }

trunk/lib/Makefile.am

@@ -35 +35 @@
   Graph.h \
   HtmlBuf.h HtmlStream.h html_utility.h LineTypeParser.h \
-  main_utility.h Node.h NodeVisitor.h \
+  main_utility.h Node.h NodeCounter.h NodeVisitor.h \
   OptionVersion.h rmdirhier.h \
   Stats.h StatsCollection.h subversion_info.h \
@@ -48 +48 @@
   Functor.cc Graph.cc HtmlBuf.cc HtmlStream.cc \
   html_utility.cc LineTypeParser.cc main_utility.cc Node.cc \
-  OptionVersion.cc \
+  NodeCounter.cc OptionVersion.cc \
   rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc \
   SVNblame.cc SVNdiff.cc SvndigestVisitor.cc SVNinfo.cc \

trunk/lib/first_page.cc

@@ -31 +31 @@
 #include "HtmlStream.h"
 #include "html_utility.h"
+#include "NodeCounter.h"
 #include "Stats.h"
 #include "StatsCollection.h"
@@ -52 +53 @@
 
   void print_main_page(const std::string& dir, const SVNlog& log,
-                       const StatsCollection& stats, std::string url)
+                       const StatsCollection& stats, std::string url, 
+                       const NodeCounter& node_counter)
   {
     std::string filename="index.html";
@@ -73 +75 @@
 
     print_summary_plot(os, stats["classic"]);
-    print_general_information(os, log, authors.size(), url);
+    print_general_information(os, log, authors.size(), url, node_counter);
     sort(latest_commit.begin(), latest_commit.end(), GreaterRevision());
     print_authors(os, latest_commit, stats["classic"]);
@@ -83 +85 @@
 
   void print_general_information(std::ostream& os, const SVNlog& log, 
-                                 size_t nof_authors, std::string url)
+                                 size_t nof_authors, std::string url,
+                                 const NodeCounter& node_counter)
   { 
     assert(log.commits().size());
@@ -116 +119 @@
        << "</td></tr>\n"
        << "<tr><td>Number of Authors:</td><td>" << nof_authors
+       << "</td></tr>\n"
+       << "<tr><td>Number of Directories:</td><td>" 
+       << node_counter.directories()
+       << "</td></tr>\n"
+       << "<tr><td>Number of Files:</td><td>" 
+       << node_counter.files()
        << "</td></tr>\n"
        << "</tbody>\n"

trunk/lib/first_page.h

@@ -32 +32 @@
 
   class Commitment;
+  class NodeCounter;
   class Stats;
   class StatsCollection;
@@ -44 +45 @@
   ///
   void print_general_information(std::ostream&, const SVNlog&, size_t, 
-                                 std::string url);
+                                 std::string url, const NodeCounter&);
 
   ///
@@ -50 +51 @@
   ///
   void print_main_page(const std::string&, const SVNlog&, 
-                       const StatsCollection&, std::string url);
+                       const StatsCollection&, std::string url,
+                       const NodeCounter&);
     
   void print_recent_logs(std::ostream&, const SVNlog& log,