give path to header.pl

[mkgallery.git] / mkgallery.pl

diff --git a/mkgallery.pl b/mkgallery.pl
index bcd6a00fa220240e4c28f1e062b3f7de032d064a..21eccb5d8583aeb55a7c31a570f2d8eecebe5834 100755 (executable)
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -41,9 +41,12 @@ binmode(STDOUT, ":utf8");
 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
 
@@ -57,7 +60,7 @@ my $rssobj;
 my $debug = 0;
 my $asktitle = 0;
 my $noasktitle = 0;
-my $rssfile = "";
+my $feed = "";
 
 charset("utf-8");
 
@@ -66,13 +69,13 @@ unless (GetOptions(
                '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;
 }
 
@@ -86,13 +89,13 @@ 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;
@@ -186,35 +189,29 @@ sub initrss {
        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);
 
-       $rssobj->{'file'} = $self->{-toppath}.'/'.$rssfile;
+       $rssobj->{'file'} = $self->{-toppath}.'/'.$feed;
        $rssobj->{'rss'} = new XML::RSS (version=>'2.0');
        if ( -f $rssobj->{'file'} ) {
                $rssobj->{'rss'}->parsefile($rssobj->{'file'});
@@ -228,12 +225,12 @@ sub initrss {
                my $p1;
                my $p2;
                for ($p1=0,$p2=length($toppath);
-                               substr($rssfile,$p1,3) eq '../' && $p2>0;
+                               substr($feed,$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) {
+               while (($p1=index($feed,'/',$p1+1)) >= 0) {
                        $link = '../'.$link;
                }
                
@@ -446,6 +443,7 @@ sub edittitle {
        my $title;
        my $T;
        if (open($T,'<'.$fullpath.'/.title')) {
+               binmode($T, ":utf8");
                $title = <$T>;
                $title =~ s/[\r\n]*$//;
                close($T);
@@ -658,7 +656,7 @@ sub startindex {
                $rsslink=Link({-rel=>'alternate',
                                -type=>'application/rss+xml',
                                -title=>'RSS',
-                               -href=>$self->{-inc}.$rssfile});
+                               -href=>$self->{-inc}.$feed});
        }
        print $IND start_html(-title => $title,
                        -encoding=>"utf-8",
@@ -692,6 +690,7 @@ sub startindex {
                        -version        => $version,
                        -depth          => $self->{-depth},
                        -title          => $title,
+                       -path           => $self->{-fullpath},
                        -breadcrumbs    => "breadcrumbs unimplemented",
                );
                print $IND eval $prm,"\n";
@@ -811,7 +810,7 @@ sub img_entry {
                                                "?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,