Changeset 274

Timestamp:

May 2, 2007, 11:05:55 AM (14 years ago)

Author:

Peter Johansson

Message:

support for Trac. Fixes #125. Also added a config file.

Location:

trunk

Files:

• .svndigest (added)
• .svndigest/config (added)
• lib/Configuration.cc (modified) (4 diffs)
• lib/Configuration.h (modified) (4 diffs)
• lib/Date.cc (modified) (1 diff)
• lib/Directory.cc (modified) (1 diff)
• lib/Node.cc (modified) (3 diffs)
• lib/html_utility.cc (modified) (4 diffs)
• lib/html_utility.h (modified) (1 diff)
• lib/utility.cc (modified) (1 diff)
• lib/utility.h (modified) (1 diff)

trunk/lib/Configuration.cc

@@ -31 +31 @@
 #include <string>
 #include <sstream>
+#include <utility>
 
 namespace theplu{
@@ -73 +74 @@
         copyright_alias_[key] = name;
       }
+      else if (section == "trac"){
+        getline(ss, tmp, '=');
+        std::string key = trim(tmp);
+        getline(ss, tmp);
+        std::string value = trim(tmp);
+        if (key=="trac-ticket")
+          trac_ticket_=value;
+        if (key=="trac-revision")
+          trac_revision_=value;
+        
+      }
     }
   }
@@ -88 +100 @@
   {
     copyright_alias_.clear();
+    trac_ticket_ = "";
+    trac_revision_ = "";
   }
 
@@ -106 +120 @@
       os << i->first << " = " << i->second << " \n";
     }
+
+    os << "\n"
+       << "### Section for setting trac environment\n"
+       << "[trac]\n"
+       << "# If trac-ticket is set, svndigest will create anchors for\n"
+       << "# ticket to the Trac page.\n"
+       << "trac-ticket = " << conf.trac_ticket() << "\n";
+    os << "# If trac-revision is set, svndigest will create anchors for\n"
+       << "# revisions to the Trac page.\n"
+       << "trac-revision = " << conf.trac_revision() << "\n";
+
     return os;
   }

trunk/lib/Configuration.h

@@ -28 +28 @@
 #include <map>
 #include <string>
+#include <utility>
 
 namespace theplu{
 namespace svndigest{
 
+  ///
+  /// Configuration class takes care of all setting defined in the
+  /// configuration file.
+  ///
   class Configuration
   {
@@ -53 +58 @@
     copyright_alias(void) const { return copyright_alias_; }
 
+    ///
+    /// @return root for the trac envrionment, e.g.,
+    /// http://lev.thep.lu.se/trac/svndigest/ticket/
+    ///
+    inline std::string trac_ticket(void) const { return trac_ticket_; }
+
+    ///
+    /// @return root for the trac envrionment, e.g.,
+    /// http://lev.thep.lu.se/trac/svndigest/ticket/
+    ///
+    std::string trac_revision(void) const { return trac_revision_; }
+
   private:
     /// 
@@ -60 +77 @@
     /// 
     Configuration(void);
+    // Copy Constructor not implemented
+    Configuration(const Configuration&);
 
     void clear(void);
@@ -69 +88 @@
     std::map<std::string, std::string> copyright_alias_;
 
+    std::string trac_ticket_;
+    std::string trac_revision_;
+    
   };
 

trunk/lib/Date.cc

@@ -208 +208 @@
           else
             ss << timeinfo->tm_wday;
-        else if (*i == 'y')
-          ss << timeinfo->tm_year % 100;
+        else if (*i == 'y') {
+          int y(timeinfo->tm_year % 100);
+          if (y<10)
+            ss << "0";
+          ss << y;
+        }
         else if (*i == 'Y')
           ss << timeinfo->tm_year+1900;

trunk/lib/Directory.cc

@@ -209 +209 @@
       os << "<td>" << stats_.empty(user) << "</td>\n";
     }
-    os << "<td>" << stats_.last_changed_rev() << "</td>\n";
+    os << "<td>" << trac_revision(stats_.last_changed_rev()) << "</td>\n";
     os << "<td>" << author() << "</td>\n";
     os << "</tr>\n";

trunk/lib/Node.cc

@@ -116 +116 @@
          << "<td>" << stats_.empty(user) << "</td>\n";
     }
-    os << "<td>" << stats_.last_changed_rev() << "</td>\n"
+    os << "<td>" << trac_revision(stats_.last_changed_rev()) << "</td>\n"
        << "<td>" << author() << "</td>\n"
        << "</tr>\n";
@@ -195 +195 @@
          << "</td><td>" << stats_.empty(*i);
       Commitment lc(log.latest_commit(*i));
-      os << "</td>" << "<td>" << lc.revision() 
+      os << "</td>" << "<td>" << trac_revision(lc.revision()) 
          << "</td>" << "<td>" << lc.date()(timefmt)
          << "</td></tr>\n";
@@ -214 +214 @@
     os << "<td>" << stats_.empty() << "</td>\n";
     Commitment lc(log.latest_commit());
-    os << "<td>" << lc.revision() << "</td>\n";
+    os << "<td>" << trac_revision(lc.revision()) << "</td>\n";
     os << "<td>" << lc.date()(timefmt)<< "</td>\n";
     os << "</tr>\n";

trunk/lib/html_utility.cc

@@ -25 +25 @@
 
 #include "Commitment.h"
+#include "Configuration.h"
 #include "Date.h"
 #include "HtmlStream.h"
@@ -421 +422 @@
     std::string timefmt("%b %d %H:%M:%S %Y");
     const size_t maxlength = 80;
+    const Configuration* conf = Configuration::instance();
     for (size_t i=0; i<10 && a!=log.author().rend(); ++i) {
       os << "<tr><td>" << anchor(*a+"/total/index.html",*a) << "</td>";
       Date date(*d);
       os << "<td>" << date(timefmt) << "</td>";
-      os << "<td>" << *r << "</td>";
+      os << "<td>"; 
+      os << trac_revision(*r);
+      os << "</td>";
       os << "<td>";
       std::string mess = *m;
@@ -434 +438 @@
       if (mess.size()>maxlength)
         mess = mess.substr(0,maxlength-3) + "...";
-      hs << mess;
+
+      if (conf->trac_ticket().empty())
+        hs << mess;
+      else { // make anchors to trac
+        char c;
+        std::stringstream ss(mess);
+        for (ss.get(c); ss.good(); ss.get(c)) {
+          if (c=='#') {
+            std::string str;
+            ss >> str;
+            if (is_int(str)) 
+              os << anchor(conf->trac_ticket()+str,"#"+str); 
+            else 
+              hs << "#" << str;
+          }
+          else
+            hs << c;
+        }
+      }
+
       os << "</td></tr>";
       ++a;
@@ -444 +467 @@
   }
 
+
+  std::string trac_revision(size_t r)
+  {
+    Configuration* conf = Configuration::instance();
+    std::stringstream ss;
+    if (conf->trac_revision().empty())
+      ss << r; 
+    else {
+      std::stringstream rev;
+      rev << r;
+      ss << anchor(conf->trac_revision()+rev.str(), rev.str());
+    }
+    return ss.str();
+  }
+
 }} // end of namespace svndigest and namespace theplu

trunk/lib/html_utility.h

@@ -89 +89 @@
 
 
+  ///
+  /// @return if trac-revision is set in config file anchor to trac is
+  /// given otherwise just a string corresponding to passed parameter.
+  ///
+  std::string trac_revision(size_t);
+
 }} // end of namespace svndigest end of namespace theplu
 

trunk/lib/utility.cc

@@ -88 +88 @@
 
 
+  bool is_int(std::string s)
+  {
+    std::stringstream ss(s);
+    int a;
+    ss >> a;
+    if(ss.fail()) 
+      return false;
+    // Check that nothing is left on stream
+    std::string b;
+    ss >> b;
+    return b.empty();
+  }
+
+
   std::string ltrim(std::string str)
   {

trunk/lib/utility.h

@@ -68 +68 @@
   ///
   std::string htrim(std::string str);
+
+  ///
+  /// @return true if \a str is an integer
+  ///
+  bool is_int(std::string str);
 
   ///