X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=7a4b681a5aacb29f8be85d668c839e4bd4761122;hp=747cb6c6c7187708fe5e94c2978c9144e78676cc;hb=135674817b47747d9a3c343376fc3dea6da229ac;hpb=06a8a4d9a7533249cfb200e0ddcaff3d76f6b41f diff --git a/mkgallery.pl b/mkgallery.pl index 747cb6c..7a4b681 100755 --- a/mkgallery.pl +++ b/mkgallery.pl @@ -35,14 +35,18 @@ use Image::Info qw/image_info dim/; use Term::ReadLine; use Getopt::Long; use Encode; -use encoding 'utf-8'; +use UUID; +#use encoding 'utf-8'; binmode(STDOUT, ":utf8"); my $haveimagick = eval { require Image::Magick; }; { package Image::Magick; } # to make perl compiler happy -my $haverssxml = eval { require XML::RSS; }; -{ package XML::RSS; } # to make perl compiler happy +my $havefeed = eval { require XML::FeedPP; }; +{ package XML::FeedPP; } # to make perl compiler happy + +my $havegeoloc = eval { require Image::ExifTool::Location; }; +{ package Image::ExifTool::Location; } # to make perl compiler happy my @sizes = (160, 640, 1600); my $incdir = ".gallery2"; @@ -50,11 +54,11 @@ my $incdir = ".gallery2"; ###################################################################### my $incpath; -my $rssobj; +my $feedobj; my $debug = 0; my $asktitle = 0; my $noasktitle = 0; -my $rssfile = ""; +my $feed = ""; charset("utf-8"); @@ -63,33 +67,40 @@ 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 && !$havefeed) { + print STDERR "You need to install XML::FeedPP 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 ($feedobj) { + $feedobj->{-feed}->pubDate(time); + $feedobj->{-feed}->to_file($feedobj->{-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 Atom feed for newly added "albums", + enter filename, base URL, and optionally PuSH hub url, + separated by commas. (Note: PuSH obviously does not work + "out of the box" for static tree! You need a separate + "watcher" script to do the publishing for you.) __END__ exit 1; @@ -120,7 +131,7 @@ sub new { -root=>$root, -fullpath=>$root, }; - # fill in -inc, -rss, -relpath + # fill in -inc, -feed, -relpath initpaths($self); # we are not blessed yet, so cheat. } bless $self, $class; @@ -169,87 +180,66 @@ sub initpaths { $self->{-relpath} = $relpath; $self->{-toppath} = substr($fullpath,0,$pos); #print "rel=$relpath, top=$self->{-toppath}, inc=$inc\n"; - initrss($self); + initfeed($self); } else { $self->{-inc} = 'NO-.INCLUDE-IN-PATH/'; # won't work anyway - $self->{-rss} = ''; + $self->{-feed} = ''; $self->{-relpath} = ''; $self->{-depth} = 0; } } -sub initrss { +sub initfeed { my $self=shift; # this is not a method but we cheat 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->{'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'}}) - } - $rssobj->{'rss'}->save($rssobj->{'file'}); + my ($feedfile, $feedbase, $feedhub) = split(',', $feed); + $feedbase .= '/' unless ($feedbase =~ /\/$/); + print "($feedfile, $feedbase, $feedhub)\n"; + + $feedobj->{-savepath} = $self->{-toppath}.'/'.$feedfile; + $feedobj->{-file} = $feedfile; + $feedobj->{-base} = $feedbase; + $feedobj->{-hub} = $feedhub; + if ( -f $feedobj->{-file} ) { + $feedobj->{-feed} = XML::FeedPP::Atom::Atom10->new( + $feedobj->{-file}); + $feedobj->{-feed}->limit_item(15); } 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( - title=>'Gallery', - link=>$link, - description=>'Gallery Feed', - #language=>$language, - #rating=>$rating, - #copyright=>$copyright, - #pubDate=>$pubDate, - #lastBuildDate=>$lastBuild, - #docs=>$docs, - #managingEditor=>$editor, - #webMaster=>$webMaster - ); - $rssobj->{'rss'}->save($rssobj->{'file'}); - } - $self->{-rss} = $rssobj->{'rss'}; + $feedobj->{-feed} = XML::FeedPP::Atom::Atom10->new; + $feedobj->{-feed}->title("Gallery"); + $feedobj->{-feed}->description("generated by ". + "". + "mkgallery"); + $feedobj->{-feed}->link($feedbase); + #$feedobj->{-feed}->copyright(""); + #$feedobj->{-feed}->language("en"); + #$feedobj->{-feed}->image($url, $tit, $link, $desc, $w, $h); + } + $self->{-feed} = $feedobj->{-feed}; } sub iterate { @@ -366,6 +356,16 @@ sub isimg { my $self = shift; my $fullpath = $self->{-fullpath}; return 0 unless ( -f $fullpath ); + + if ($havegeoloc) { + my $exif = new Image::ExifTool; + $exif->ExtractInfo($fullpath); + my ($la,$lo) = $exif->GetLocation(); + if ($la && $lo) { + $self->{-geoloc} = [$la,$lo]; + } + } + my $info = image_info($fullpath); if (my $error = $info->{error}) { if (($error !~ "Unrecognized file format") && @@ -433,6 +433,7 @@ sub edittitle { my $title; my $T; if (open($T,'<'.$fullpath.'/.title')) { + binmode($T, ":utf8"); $title = <$T>; $title =~ s/[\r\n]*$//; close($T); @@ -640,16 +641,16 @@ sub startindex { my $inc = $self->{-inc}.$incdir.'/'; my $title = $self->{-title}; - my $rsslink=""; - if ($rssobj) { - $rsslink=Link({-rel=>'alternate', - -type=>'application/rss+xml', - -title=>'RSS', - -href=>$self->{-inc}.$rssfile}); + my $feedlink=""; + if ($feedobj) { + $feedlink=Link({-rel=>'alternate', + -type=>'application/atom+xml', + -title=>'Gallery Feed', + -href=>$feedobj->{-base}.$feedobj->{-file}}); } print $IND start_html(-title => $title, -encoding=>"utf-8", - -head=>$rsslink, + -head=>$feedlink, -style=>[ {-src=>$inc."gallery.css"}, {-src=>$inc."custom.css"}, @@ -679,6 +680,7 @@ sub startindex { -version => $version, -depth => $self->{-depth}, -title => $title, + -path => $self->{-fullpath}, -breadcrumbs => "breadcrumbs unimplemented", ); print $IND eval $prm,"\n"; @@ -719,18 +721,23 @@ sub endindex { close($IND) if ($IND); undef $self->{-IND}; - if ($rssobj) { - my $rsstitle=sprintf "%s [%d images, %d subalbums]", + if ($feedobj) { + my $feedtitle=sprintf "%s [%d images, %d subalbums]", $self->{-title}, $self->{-numofimgs}, $self->{-numofsubs}; - my $rsslink=$rssobj->{'rss'}->channel('link'). + my $feedlink=$feedobj->{-feed}->link. $self->{-relpath}."index.html"; - $rssobj->{'rss'}->add_item( + my $uu; + my $us; + UUID::generate($uu); + UUID::unparse($uu, $us); + $feedobj->{-feed}->add_item( title => $self->{-title}, - link => $rsslink, - description => $rsstitle, - pubDate => time2str(time), + link => $feedlink, + description => $feedtitle, + pubDate => time, + guid => $us, ); } } @@ -785,20 +792,28 @@ sub img_entry { $self->{-parent}->{-numofimgs}++; print $IND a({-name=>$name}),"\n", - start_table({-class=>'slide'}),start_Tr,start_td,"\n", - div({-class=>'slidetitle'}, + start_table({-class=>'slide'}),start_Tr,start_td,"\n"; + print $IND div({-class=>'slidetitle'}, "\n ",a({-href=>".html/$name-info.html", -title=>'Image Info: '.$name, -class=>'infoBox'}, $title),"\n"),"\n", - div({-class=>'slideimage'}, - "\n ",a({-href=>".html/$name-static.html", + start_div({-class=>'slideimage'}); + if ($self->{-geoloc}) { + my ($la,$lo) = @{$self->{-geoloc}}; + print $IND a({-href=>"http://maps.google.com/". + "?q=$la,$lo&ll=$la,$lo", + -title=>"$la,$lo", + -class=>'geoloc'}, + div({-class=>'geoloc'},"")),"\n"; + } + print $IND a({-href=>".html/$name-static.html", -title=>$title, -class=>'showImage', -rel=>'i'.$name}, img({-src=>$thumb, -class=>'thumbnail', - -alt=>$title})),"\n"),"\n", + -alt=>$title})),"\n",end_div, start_div({-class=>'varimages',-id=>'i'.$name,-title=>$title}),"\n"; foreach my $sz(@sizes) { my $src=$self->{$sz}->{'url'};