Diff for /CVSROOT/cvs2rss.pl between versions 1.9 and 1.13

version 1.9, 2005/10/24 21:53:20 version 1.13, 2008/11/26 18:43:30
Line 21 Line 21
 # Edit by Guy Albertelli, -- corrected the packaging of Entities  # Edit by Guy Albertelli, -- corrected the packaging of Entities
 #                          - commits now <pre>ed  #                          - commits now <pre>ed
 #                          - removed html rants  #                          - removed html rants
 #  # Edit by Stuart Raeburn, -- eliminated earlier HTML::Entities customization.
   
 use strict;  use strict;
 use HTML::Entities();  
 use XML::RSS;  use XML::RSS;
 use POSIX;  use POSIX;
   
 # Stuff you need to setup   # Stuff you need to setup 
 my $rssFeed ="/home/loninst/public_html/loncapa.rss";  my $cvslink = 'http://source.loncapa.org/cgi-bin/cvsweb.cgi/';
   my $rssFeed ="/home/rss/cvs.rss";
 my $emailDomain = "loncapa.org";  my $emailDomain = "loncapa.org";
 my $channelTitle = "Lon-CAPA RSS Feed";  my $channelTitle = "Lon-CAPA RSS Feed";
 my $channelLink = "http://install.loncapa.org/loncapa.rss";  my $channelLink = "http://source.loncapa.org/rss/cvs.rss";
 my $numEntries = 200;  my $numEntries = 30;
   
 # Set this to 1 to enable cvs rdiff  # Set this to 1 to enable cvs rdiff
 my $cvsDiff = 1;  my $cvsDiff = 1;
   
 # Leave everything else alone  # Leave everything else alone
 my $author = getpwuid(getuid()) . "\@" . $emailDomain;  my $author = getpwuid(getuid());
 $author = 'guy' . "\@" . 'albertelli.com';  
 my $pubDate = strftime('%a, %d %b %Y %H:%M:%S %Z',localtime(time));  my $pubDate = strftime('%a, %d %b %Y %H:%M:%S %Z',localtime(time));
 my $description;  
   
   
 my @args = split(" ", $ARGV[0]);  my @args = split(" ", $ARGV[0]);
   my $dir = shift(@args);
   
 # bail when this is a new directory  # bail when this is a new directory
 &bail if $args[0] eq '-' && "$args[1] $args[2]" eq 'New directory';  &bail if $args[0] eq '-' && "$args[1] $args[2]" eq 'New directory';
 # bail if this is an import  # bail if this is an import
Line 71  $rss->channel( Line 70  $rss->channel(
 # Limit entries in the feed to $numEntries  # Limit entries in the feed to $numEntries
 pop(@{$rss->{'items'}}) while (@{$rss->{'items'}} >= $numEntries);  pop(@{$rss->{'items'}}) while (@{$rss->{'items'}} >= $numEntries);
   
   my $commit_msg;
   while (<STDIN>) {
       chomp($_);
       if ($_=~/^[A-Z].*:\s*$/) {
    $_ = "<br /><b>" .$_."</b><br />";
       } else {
    $_ .= "<br />";
       }
       $commit_msg .= $_;
   }
   
   $commit_msg .= '<br /><b>Author:</b><br />'.$author.'<br />';
   
 foreach my $file (@args) {  foreach my $file (@args) {
     my @title=split(",",$file);      my @title=split(",",$file);
   
       my $description = $commit_msg;
     # Format title of the rss item      # Format title of the rss item
     # Remove space, append / and set title to /file/that/changed - oldversion/newversion      # Remove space, append / and set title to /file/that/changed - oldversion/newversion
     $title[0] =~s/ /\//;      $title[0] =~s/ /\//;
           $title[0] = $dir.'/'.$title[0];
   
     # Format the cvslog msg itself      # Format the cvslog msg itself
     while (<STDIN>) {  
  chomp($_);  
  if ($_=~/^[A-Z].*:\s*$/) {  
     $_ = "<br /><b>" . &HTML::Entities::encode($_,'<>&"') . "</b><br />";  
  } else {  
     $_ = &HTML::Entities::encode($_,'<>&"');  
     $_ .= "<br />";  
  }  
  $description .= $_;  
     }  
   
     if ($cvsDiff == 1) {       if ($cvsDiff == 1) { 
   
Line 98  foreach my $file (@args) { Line 101  foreach my $file (@args) {
  # This will rdiff it against the previous version, and   # This will rdiff it against the previous version, and
  # include that diff in the rss feed   # include that diff in the rss feed
   
  if (($title[1] != "NONE") && ($title[0]=~/(.*).(pm|pl|conf|tab)$/)){   if (($title[1] != "NONE") 
       && ($title[0]=~/(.*)\.(pm|pl|conf|tab)$/)
       && ($title[0]!~{/localize/localize/..\.pm}) ) {
     my $tmpFile = "/tmp/diff.$$";      my $tmpFile = "/tmp/diff.$$";
     my $cmdLine = "cvs -n rdiff -u -kk -r " . $title[1] .  " -r " . $title[2] . " " . $title[0] . ">" . $tmpFile;      my $cmdLine = "cvs -n rdiff -u -kk -r " . $title[1] .  " -r " . $title[2] . " " . $title[0] . ">" . $tmpFile;
     system($cmdLine);      system($cmdLine);
Line 106  foreach my $file (@args) { Line 111  foreach my $file (@args) {
     $description .= "<br /><b>Differences:</b><br /><pre>";      $description .= "<br /><b>Differences:</b><br /><pre>";
     open CVSDIFF, "<" . $tmpFile;      open CVSDIFF, "<" . $tmpFile;
     foreach my $line (<CVSDIFF>) {      foreach my $line (<CVSDIFF>) {
  $description .= &HTML::Entities::encode($line,'<>&"');   $description .= $line;
     }      }
     $description .= "</pre>";      $description .= "</pre>";
     unlink($tmpFile);         unlink($tmpFile);   
  }   }
     }      }
   
     my $link = 'http://install.loncapa.org/cgi-bin/cvsweb.cgi/'.$title[0];      my $link = $cvslink.$title[0];
     if ($title[1] != "NONE") {      if ($title[1] != "NONE") {
         $link .= '.diff?r1='.$title[1].';r2='.$title[2].';f=h';          $link .= '.diff?r1='.$title[1].';r2='.$title[2].';f=h';
     }      }
Line 126  foreach my $file (@args) { Line 131  foreach my $file (@args) {
    pubDate => $pubDate,     pubDate => $pubDate,
    link => $link     link => $link
    );     );
   
     foreach my $element (@{$rss->{'items'}}) {  
  $element->{'description'} = &HTML::Entities::encode($element->{'description'},'<>&"');   
     }  
 }  }
   
 $rss->save($rssFeed);  $rss->save($rssFeed);

Removed from v.1.9  
changed lines
  Added in v.1.13


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>