Changeset 223

Timestamp:

Mar 9, 2007, 9:44:35 AM (17 years ago)

Author:

Peter Johansson

Message:

Refs #87

Location:

trunk

Files:

• bin/svndigest.cc (modified) (2 diffs)
• lib/html_utility.cc (modified) (6 diffs)
• lib/html_utility.h (modified) (2 diffs)

trunk/bin/svndigest.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2006 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2007 Peter Johansson
 
   This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -143 +144 @@
                                  +tree.name()+"'");
   print_css("svndigest.css");
-  print_main_page(tree.name(), commit_dates);
+  print_main_page(tree.name(), commit_dates, stats);
   mkdir("all");
   for (std::set<std::string>::const_iterator i = stats.authors().begin();

trunk/lib/html_utility.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2006 Peter Johansson
+  Copyright (C) 2006, 2007 Peter Johansson
 
   This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -23 +23 @@
 
 #include "html_utility.h"
+#include "Stats.h"
 #include "utility.h"
 #include <config.h> // this header file is created by configure
@@ -97 +98 @@
     s << "<-- svndigest.css generated by " << PACKAGE_STRING << "\n"
 
-      << "Copyright (C) 2006 Peter Johansson\n\n"
+      << "Copyright (C) 2006, 2007 Peter Johansson\n\n"
       << "This file is part of svndigest, " 
       << "http://lev.thep.lu.se/trac/svndigest\n\n"
@@ -188 +189 @@
     s << "\n";
     s << "div.main {\n";
-    s << " text-align: center\n";
-    s << "}\n";
+    s << "margin-top: 50px;\n";          
+    s << "margin-left: 50px;\n";
+    s << " \n";
+    s << "}\n";
+    s << "table.main {\n"; 
+    s << " text-align: left;\n";
+    s << " padding: 0 1em .1em 0;\n";
+    s << "}\n";
+    s << "table.main th {\n";
+    s << " text-align: left;\n";
+    s << " padding: 0 1em 0.5em 0;\n";
+    s << " font-size: 150%;\n";
+    s << " font-wheight: bold;\n";
+    s << "}\n";
+    s << "table.main td {\n";
+    s << " padding: 0 1em .1em 0;\n";
+    s << "}\n";
+
+
+
+
     s << "table.listings {\n";
     s << " clear: both;\n";
@@ -242 +262 @@
 
   void print_main_page(const std::string& dir,
-                       const std::vector<std::string>& commit_dates)
+                       const std::vector<std::string>& commit_dates,
+                       const Stats& stats)
   {
     std::string filename="index.html";
     std::ofstream os(filename.c_str());
     print_header(os, dir, 0, "main", "index.html");
-    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++;
-        }
+    time_t first = str2time(commit_dates[0]);
+    time_t last = str2time(commit_dates.back());
+    
+    u_int years = 0;
+    u_int months  = 0;
+    u_int days = 0;
+    // No support in std for diffing two tm structs
+    time_t now = time(NULL);
+    tm* timeinfo = gmtime(&now);
+    while (difftime(now,first)>0){
+      --timeinfo->tm_year; 
+      now = mktime(timeinfo);
+      ++years;
+    }
+    --years;
+    ++timeinfo->tm_year; 
+    now = mktime(timeinfo);
+    
+    while (difftime(now,first)>0){
+      if (timeinfo->tm_mon>0) 
+        --timeinfo->tm_mon; 
+      else{
+        timeinfo->tm_mon=11; 
+        --timeinfo->tm_year;
       }
+      now = mktime(timeinfo);
+      ++months;
     }
+    --months;
+    ++timeinfo->tm_mon; 
+    if (timeinfo->tm_mon>11){
+      timeinfo->tm_mon=0;
+      ++timeinfo->tm_year;
+    } 
+    now = mktime(timeinfo);
+    
+    days = (now - first)/60/60/24;
+
+    now = time(NULL);
     os << "<div class=\"main\">\n"
-       << "<table><thead><tr><th>Statistics for " << dir 
+       << "<table class=\"main\"><thead><tr><th colspan=\"2\">" 
+       << "General Information"
        << "</th></tr><thead>\n"
-       << "<tr><td>Total number of commits</td><td>" 
-       << commit_dates.size()-1 << "</td></tr>\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"
+       << "<tr><td>First Revision:</td><td>" 
+       << asctime(gmtime(&first)) << "</td></tr>\n"
+       << "<tr><td>Latest Revision:</td><td>" 
+       << asctime(gmtime(&last)) << "</td></tr>\n"
+       << "<tr><td>Report Generated:</td><td>" 
+       << asctime(gmtime(&now)) << "</td></tr>\n"
+       << "<tr><td>Repository Age:</td><td>"; 
+    if (years){
+      os << years << " year";
+      if (years>1)
+        os << "s";
+      os << " ";
+    }
+    if (months){
+      os << months << " month";
+      if (months>1)
+        os << "s";
+      os << " ";
+    }
+    if (months || years)
+      os << "and ";
+    os << days << " day";
+    if (days>1)
+      os << "s";
+      
+    os << "</td></tr>\n"
+       << "<tr><td>Number of Authors:</td><td>" << stats.authors().size() 
+       << "</td></tr>\n"
+       << "<tr><td>Revisions:</td><td>" << commit_dates.size()-1 
+       << "</td></tr>\n"
        << "</table></div>\n";
+    os << "<hr width=100% />";
     
         
@@ -281 +352 @@
   void print_footer(std::ostream& os)
   {
+    
     time_t rawtime;
     struct tm * timeinfo;

trunk/lib/html_utility.h

@@ -34 +34 @@
 namespace svndigest{
 
+  class Stats;
   ///
   /// @brief send anchor to stream @a os
@@ -60 +61 @@
   /// @brief print main page
   ///
-  void print_main_page(const std::string&, const std::vector<std::string>&);
+  void print_main_page(const std::string&, const std::vector<std::string>&,
+                       const Stats&);
     
   ///