my $haveimagick = eval { require Image::Magick; };
{ package Image::Magick; } # to make perl compiler happy
-my $haverssxml = eval { require XML::RSS; };
+my $haverss = eval { require XML::RSS; };
{ package XML::RSS; } # to make perl compiler happy
+my $haveatom = eval { require XML::Atom; };
+{ package XML::Atom; } # to make perl compiler happy
+
my $havegeoloc = eval { require Image::ExifTool::Location; };
{ package Image::ExifTool::Location; } # to make perl compiler happy
my $debug = 0;
my $asktitle = 0;
my $noasktitle = 0;
-my $rssfile = "";
+my $feed = "";
charset("utf-8");
'incpath'=>\$incpath,
'asktitle'=>\$asktitle,
'noasktitle'=>\$noasktitle,
- 'rssfile=s'=>\$rssfile,
+ 'feed=s'=>\$feed,
'debug'=>\$debug)) {
&help;
}
-if ($rssfile && ! $haverssxml) {
- print STDERR "You need to get XML::RSS from CPAN to use --rssfile\n";
+if ($feed && ! ($haverss || $haveatom)) {
+ print STDERR "You need to get XML::RSS and/or XML::Atom to use --feed\n";
exit 1;
}
my $term = new Term::ReadLine "Edit Title";
FsObj->new(getcwd)->iterate;
-if ($rssobj) { $rssobj->{'rss'}->save($rssobj->{'file'}); }
+if ($rssobj) { $rssobj->{-rss}->save($rssobj->{-savepath}); }
sub help {
print STDERR <<__END__;
usage: $0 [options]
--help: print help message and exit
- --incpath: do not try to find .gallery2 diretory upstream, use
+ --incpath: do not try to find .gallery2 directory upstream, use
specified path (absolute or relavive). Use with causion.
--debug: print a lot of debugging info to stdout as you run
--asktitle: ask to edit album titles even if there are ".title" files
--noasktitle: don't ask to enter album titles even where ".title"
files are absent. Use partial directory names as titles.
- --rssfile=...: build RSS feed for newly added "albums", give name of rss file
+ --feed=...: build RSS feed for newly added "albums", give name of rss file
__END__
exit 1;
my $fullpath=$self->{-fullpath};
my $toppath=$self->{-toppath};
my $inc=$self->{-inc}.$incdir.'/';
- my $conffile=$toppath.'/'.$incdir.'/rss.conf';
+ my $conffile=$toppath.'/'.$incdir.'/feed.conf';
my $CONF;
- if ($rssfile) {
- if (open($CONF,">".$conffile)) {
- print $CONF "file: ",$rssfile,"\n";
- close($CONF);
+ if (! $incpath) {
+ if ($feed) {
+ if (open($CONF,">".$conffile)) {
+ print $CONF $feed,"\n";
+ close($CONF);
+ } else {
+ print STDERR "could not open $conffile: $!\n";
+ }
} else {
- print STDERR "could not open $conffile: $!\n";
- }
- } else {
- if (open($CONF,$conffile)) {
- my $ln=<$CONF>;
- close($CONF);
- chop $ln;
- my ($k,$v)=split(':', $ln);
- $k =~ s/^\s*//;
- $k =~ s/\s*$//;
- $v =~ s/^\s*//;
- $v =~ s/\s*$//;
- if ($k eq 'file') {
- $rssfile=$v;
+ if (open($CONF,$conffile)) {
+ $feed=<$CONF>;
+ close($CONF);
+ chop $feed;
}
}
}
- return unless ($rssfile);
+ return unless ($feed);
+
+ my ($feedfile, $feedbase, $feedhub) = split(',', $feed);
+ $feedbase .= '/' unless ($feedbase =~ /\/$/);
+ print "($feedfile, $feedbase, $feedhub)\n";
- $rssobj->{'file'} = $self->{-toppath}.'/'.$rssfile;
- $rssobj->{'rss'} = new XML::RSS (version=>'2.0');
- if ( -f $rssobj->{'file'} ) {
- $rssobj->{'rss'}->parsefile($rssobj->{'file'});
- my $itemstodel = @{$rssobj->{'rss'}->{'items'}} - 15;
+ $rssobj->{-savepath} = $self->{-toppath}.'/'.$feedfile;
+ $rssobj->{-file} = $feedfile;
+ $rssobj->{-base} = $feedbase;
+ $rssobj->{-hub} = $feedhub;
+ $rssobj->{-rss} = new XML::RSS (version=>'2.0');
+ if ( -f $rssobj->{-file} ) {
+ $rssobj->{-rss}->parsefile($rssobj->{-file});
+ my $itemstodel = @{$rssobj->{-rss}->{'items'}} - 15;
while ($itemstodel-- > 0) {
- pop(@{$rssobj->{'rss'}->{'items'}})
+ pop(@{$rssobj->{-rss}->{'items'}})
}
- $rssobj->{'rss'}->save($rssobj->{'file'});
+ $rssobj->{-rss}->save($rssobj->{-savepath});
} else {
- my $link;
- my $p1;
- my $p2;
- for ($p1=0,$p2=length($toppath);
- substr($rssfile,$p1,3) eq '../' && $p2>0;
- $p1+=3,$p2=rindex($toppath,'/',$p2-1)) {;}
- $link=substr($toppath,$p2);
- $link =~ s%^/%%;
- $link .= '/' if ($link);
- while (($p1=index($rssfile,'/',$p1+1)) >= 0) {
- $link = '../'.$link;
- }
-
- $rssobj->{'rss'}->channel(
+ $rssobj->{-rss}->channel(
title=>'Gallery',
- link=>$link,
+ link=>$feedbase,
description=>'Gallery Feed',
#language=>$language,
#rating=>$rating,
#managingEditor=>$editor,
#webMaster=>$webMaster
);
- $rssobj->{'rss'}->save($rssobj->{'file'});
+ $rssobj->{-rss}->save($rssobj->{-savepath});
}
- $self->{-rss} = $rssobj->{'rss'};
+ $self->{-rss} = $rssobj->{-rss};
}
sub iterate {
my $title;
my $T;
if (open($T,'<'.$fullpath.'/.title')) {
+ binmode($T, ":utf8");
$title = <$T>;
$title =~ s/[\r\n]*$//;
close($T);
if ($rssobj) {
$rsslink=Link({-rel=>'alternate',
-type=>'application/rss+xml',
- -title=>'RSS',
- -href=>$self->{-inc}.$rssfile});
+ -title=>'Gallery Feed',
+ -href=>$rssobj->{-base}.$rssobj->{-file}});
}
print $IND start_html(-title => $title,
-encoding=>"utf-8",
-version => $version,
-depth => $self->{-depth},
-title => $title,
+ -path => $self->{-fullpath},
-breadcrumbs => "breadcrumbs unimplemented",
);
print $IND eval $prm,"\n";
$self->{-title},
$self->{-numofimgs},
$self->{-numofsubs};
- my $rsslink=$rssobj->{'rss'}->channel('link').
+ my $rsslink=$rssobj->{-rss}->channel('link').
$self->{-relpath}."index.html";
- $rssobj->{'rss'}->add_item(
+ $rssobj->{-rss}->add_item(
title => $self->{-title},
link => $rsslink,
description => $rsstitle,
"?q=$la,$lo&ll=$la,$lo",
-title=>"$la,$lo",
-class=>'geoloc'},
- div({-class=>'geoloc'},"G")),"\n";
+ div({-class=>'geoloc'},"")),"\n";
}
print $IND a({-href=>".html/$name-static.html",
-title=>$title,