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

version 1.8, 2005/10/24 21:38:14 version 1.9, 2005/10/24 21:53:20
Line 43  my $author = getpwuid(getuid()) . "\@" . Line 43  my $author = getpwuid(getuid()) . "\@" .
 $author = 'guy' . "\@" . 'albertelli.com';  $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 $description;
 my @title=split(",",$ARGV[0]);  
   
   my @args = split(" ", $ARGV[0]);
   # bail when this is a new directory
   &bail if $args[0] eq '-' && "$args[1] $args[2]" eq 'New directory';
   # bail if this is an import
   &bail if $args[0] eq '-' && $args[1] eq 'Imported';
   
   
 my $rss = new XML::RSS(version => '2.0');  my $rss = new XML::RSS(version => '2.0');
   
Line 61  $rss->channel( Line 68  $rss->channel(
       pubDate => $pubDate         pubDate => $pubDate 
       );        );
   
   
 # 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);
   
 # Format title of the rss item  foreach my $file (@args) {
 # Remove space, append / and set title to /file/that/changed - oldversion/newversion      my @title=split(",",$file);
 $title[0] =~s/ /\//;  
   
 # Format the cvslog msg itself      # Format title of the rss item
 while (<STDIN>) {      # Remove space, append / and set title to /file/that/changed - oldversion/newversion
     chomp($_);      $title[0] =~s/ /\//;
     if ($_=~/^[A-Z].*:\s*$/) {      
  $_ = "<br /><b>" . &HTML::Entities::encode($_,'<>&"') . "</b><br />";      # Format the cvslog msg itself
     } else {      while (<STDIN>) {
  $_ = &HTML::Entities::encode($_,'<>&"');   chomp($_);
  $_ .= "<br />";   if ($_=~/^[A-Z].*:\s*$/) {
       $_ = "<br /><b>" . &HTML::Entities::encode($_,'<>&"') . "</b><br />";
    } else {
       $_ = &HTML::Entities::encode($_,'<>&"');
       $_ .= "<br />";
    }
    $description .= $_;
     }      }
     $description .= $_;  
 }  
   
 if ($cvsDiff == 1) {       if ($cvsDiff == 1) { 
   
     # If the old version of the file is not NONE (if   # If the old version of the file is not NONE (if
     # it isn't a new file), and if it is a pm/pl/conf/tab file.   # it isn't a new file), and if it is a pm/pl/conf/tab file.
     # 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)$/)){
  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);
       
  $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 .= &HTML::Entities::encode($line,'<>&"');
       }
       $description .= "</pre>";
       unlink($tmpFile);   
  }   }
  $description .= "</pre>";      }
  unlink($tmpFile);     
     }       my $link = 'http://install.loncapa.org/cgi-bin/cvsweb.cgi/'.$title[0];
 }      if ($title[1] != "NONE") {
           $link .= '.diff?r1='.$title[1].';r2='.$title[2].';f=h';
       }
   
 $rss->add_item(      $rss->add_item(
        title => "/" . $title[0] . " - " . $title[1] . "/" . $title[2],     title => "/" . $title[0] . " - " . $title[1] . "/" . $title[2],
        author => $author,     author => $author,
        description=> $description,     description=> $description,
        mode => 'insert',     mode => 'insert',
        pubDate => $pubDate,     pubDate => $pubDate,
        link => 'http://install.loncapa.org/cgi-bin/cvsweb.cgi/'.$title[0].'.diff?r1='.$title[1].';r2='.$title[2].';f=h'     link => $link
        );     );
   
 foreach my $element (@{$rss->{'items'}}) {      foreach my $element (@{$rss->{'items'}}) {
     $element->{'description'} = &HTML::Entities::encode($element->{'description'},'<>&"');    $element->{'description'} = &HTML::Entities::encode($element->{'description'},'<>&"'); 
       }
 }  }
   
 $rss->save($rssFeed);  $rss->save($rssFeed);
Line 121  $rss->save($rssFeed); Line 137  $rss->save($rssFeed);
 # Rsync this rss feed to another publically accessable machine.  # Rsync this rss feed to another publically accessable machine.
 #my $cmdLine="rsync -r -e ssh --delete /export/www/rss/html/ builder\@monkey:/export/www/rss/html/";  #my $cmdLine="rsync -r -e ssh --delete /export/www/rss/html/ builder\@monkey:/export/www/rss/html/";
 #system($cmdLine);  #system($cmdLine);
   
   sub bail {
       my @toss = <STDIN>;
       exit @_;
   }

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


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