]> www.average.org Git - mkgallery.git/blobdiff - mkgallery.pl
calculate depth against top, not against root (current dir)
[mkgallery.git] / mkgallery.pl
index 4166ae6ce2b1c0aa55cf01663f63b989037a8b79..1031da6949dfab9397931ccfc0adfa993dfa33b5 100755 (executable)
@@ -29,6 +29,7 @@ package FsObj;
 use strict;
 use Carp;
 use POSIX qw/getcwd strftime/;
+use HTTP::Date;
 use CGI qw/:html *table *Tr *td *center *div *Link/;
 use Image::Info qw/image_info dim/;
 use Term::ReadLine;
@@ -44,6 +45,7 @@ my $haverssxml = eval { require XML::RSS; };
 { package XML::RSS; }          # to make perl compiler happy
 
 my @sizes = (160, 640, 1600);
+my $incdir = ".gallery2";
 
 ######################################################################
 
@@ -101,14 +103,15 @@ sub new {
                $class = ref($this);
                my $parent = $this;
                my $name = shift;
-               my $fullpath = $parent->{-fullpath}.'/'.$name;
                $self = {
                                -parent=>$parent,
                                -root=>$parent->{-root},
+                               -toppath=>$parent->{-toppath},
+                               -depth=>$parent->{-depth}+1,
                                -base=>$name,
-                               -fullpath=>$fullpath,
+                               -fullpath=>$parent->{-fullpath}.'/'.$name,
+                               -relpath=>$parent->{-relpath}.$name.'/',
                                -inc=>'../'.$parent->{-inc},
-                               -rss=>'../'.$parent->{-rss},
                        };
        } else {
                $class = $this;
@@ -116,9 +119,9 @@ sub new {
                $self = {
                                -root=>$root,
                                -fullpath=>$root,
-                               -inc=>getinc($root),
-                               -rss=>getrss($root),
                        };
+               # fill in -inc, -rss, -relpath
+               initpaths($self); # we are not blessed yet, so cheat.
        }
        bless $self, $class;
        if ($debug) {
@@ -130,52 +133,123 @@ sub new {
        return $self;
 }
 
-sub getinc {
-       my $fullpath=shift;     # this is not a method
+sub initpaths {
+       my $self=shift;         # this is not a method but we cheat
        my $depth=20;           # arbitrary max depth
+       my $fullpath=$self->{-fullpath};
+       my $inc;
+       my $relpath;
 
        if ($incpath) {
-               return $incpath."/.gallery2";
-       }
-
-       my $inc=".gallery2";
-       while ( ! -d $fullpath."/".$inc ) {
-               $inc = "../".$inc;
-               last unless ($depth-- > 0);
+               $inc = $incpath;
+               $inc .= '/' unless ($inc =~ m%/$%);
+       } else {
+               $inc="";
+               while ( ! -d $fullpath."/".$inc."/".$incdir ) {
+                       $inc = "../".$inc;
+                       last unless ($depth-- > 0);
+               }
        }
        if ($depth > 0) {
-               return $inc.'/';                # prefix with trailing slash
+               $self->{-inc} = $inc;
+               my $dp=0;
+               my $pos;
+               for ($pos=index($inc,'/');$pos>=0;
+                                       $pos=index($inc,'/',$pos+1)) {
+                       $dp++;
+               }
+               $self->{-depth} = $dp;
+               for ($pos=length($fullpath);$dp>0 && $pos>0;
+                                       $pos=rindex($fullpath,'/',$pos-1)) {
+                       $dp--;
+               }
+               my $relpath = substr($fullpath,$pos);
+               $relpath =~ s%^/%%;
+               $relpath .= '/' if ($relpath);
+               $self->{-relpath} = $relpath;
+               $self->{-toppath} = substr($fullpath,0,$pos);
+               #print "rel=$relpath, top=$self->{-toppath}, inc=$inc\n";
+               initrss($self);
        } else {
-               return 'NO-.INCLUDE-IN-PATH/';  # won't work anyway
+               $self->{-inc} = 'NO-.INCLUDE-IN-PATH/'; # won't work anyway
+               $self->{-rss} = '';
+               $self->{-relpath} = '';
+               $self->{-depth} = 0;
        }
 }
 
-sub getrss {
-       my $fullpath=shift;     # this is not a method
-       my $depth=20;           # arbitrary max depth
+sub initrss {
+       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 $CONF;
+
+       if ($rssfile) {
+               if (open($CONF,">".$conffile)) {
+                       print $CONF "file: ",$rssfile,"\n";
+                       close($CONF);
+               } 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;
+                       }
+               }
+       }
 
-       return "" unless $rssfile;
+       return unless ($rssfile);
 
-       my $rss=$rssfile;
-       while ( ! -f $fullpath."/".$rss ) {
-               $rss = "../".$rss;
-               last unless ($depth-- > 0);
-       }
-       if ($depth > 0) {
-               $rssobj->{'file'} = $rss;
-               $rssobj->{'rss'} = new XML::RSS (version=>2);
-               $rssobj->{'rss'}->parsefile($rss);
+       $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'});
-               return $rss;
        } else {
-               print STDERR "There is no $rssfile in this or parent ".
-                       "directories, you must create one with mkgalrss.pl\n";
-               exit 1;
+               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'};
 }
 
 sub iterate {
@@ -364,7 +438,7 @@ sub edittitle {
                close($T);
        }
        if ($asktitle || (!$title && !$noasktitle)) {
-               my $prompt = $self->{-base};
+               my $prompt = $self->{-relpath};
                $prompt = '/' unless ($prompt);
                my $OUT = $term->OUT || \*STDOUT;
                print $OUT "Enter title for $fullpath\n";
@@ -376,7 +450,7 @@ sub edittitle {
                }
        }
        unless ($title) {
-               $title=substr($fullpath,length($self->{-root}));
+               $title=$self->{-relpath};
        }
        $self->{-title}=$title;
        print "title in $fullpath is $title\n" if ($debug);
@@ -443,7 +517,7 @@ sub makeaux {
        my $dn = $self->{-parent}->{-fullpath};
        my $pref = $self->{-previmg}->{-base};
        my $nref = $self->{-nextimg}->{-base};
-       my $inc = $self->{-inc};
+       my $inc = $self->{-inc}.$incdir.'/';
        my $title = $self->{-info}->{'Comment'};
        $title = $name unless ($title);
 
@@ -563,19 +637,22 @@ sub startindex {
        binmode($IND, ":utf8");
        $self->{-IND} = $IND;
 
-       my $inc = $self->{-inc};
+       my $inc = $self->{-inc}.$incdir.'/';
        my $title = $self->{-title};
        my $rsslink="";
-       if ($self->{-rss}) {
+       if ($rssobj) {
                $rsslink=Link({-rel=>'alternate',
                                -type=>'application/rss+xml',
                                -title=>'RSS',
-                               -href=>$self->{-rss}});
+                               -href=>$self->{-inc}.$rssfile});
        }
        print $IND start_html(-title => $title,
                        -encoding=>"utf-8",
                        -head=>$rsslink,
-                       -style=>{-src=>$inc."gallery.css"},
+                       -style=>[
+                               {-src=>$inc."gallery.css"},
+                               {-src=>$inc."custom.css"},
+                       ],
                        -script=>[
                                {-src=>$inc."mootools.js"},
                                {-src=>$inc."overlay.js"},
@@ -589,19 +666,55 @@ sub startindex {
                comment("Created by ".$version),"\n",
                start_div({-class => 'indexContainer',
                                -id => 'indexContainer'}),
-               a({-href=>"../index.html"},"UP"),"\n",
-               start_center,"\n",
-               h1($title),"\n",
                "\n";
+       my $EVL;
+       if (open($EVL,$self->{-toppath}.'/'.$incdir.'/header.pl')) {
+               my $prm;
+               while (<$EVL>) {
+                       $prm .= $_;
+               }
+               close($EVL);
+               %_ = (
+                       -version        => $version,
+                       -depth          => $self->{-depth},
+                       -title          => $title,
+                       -breadcrumbs    => "breadcrumbs unimplemented",
+               );
+               print $IND eval $prm,"\n";
+       } else {
+               print STDERR "could not open ",
+                       $self->{-toppath}.'/'.$incdir.'/header.pl',
+                       " ($!), reverting to default header";
+               print $IND a({-href=>"../index.html"},"UP"),"\n",
+                       h1({-class=>'title'},$title),"\n",
+       }
 }
 
 sub endindex {
        my $self = shift;
        my $IND = $self->{-IND};
 
-       print $IND end_center,end_div,
-       # "\n",'<script type="text/javascript">init_gallery();</script>',"\n",
-       end_html,"\n";
+       print $IND end_div;
+       my $EVL;
+       if (open($EVL,$self->{-toppath}.'/'.$incdir.'/footer.pl')) {
+               my $prm;
+               while (<$EVL>) {
+                       $prm .= $_;
+               }
+               close($EVL);
+               %_ = (
+                       -version        => $version,
+                       -depth          => $self->{-depth},
+                       -title          => $self->{-title},
+                       -breadcrumbs    => "breadcrumbs unimplemented",
+               );
+               print $IND eval $prm,"\n";
+       } else {
+               print STDERR "could not open ",
+                       $self->{-toppath}.'/'.$incdir.'/footer.pl',
+                       " ($!), reverting to default empty footer";
+       }
+       print $IND end_html,"\n";
 
        close($IND) if ($IND);
        undef $self->{-IND};
@@ -610,11 +723,13 @@ sub endindex {
                                $self->{-title},
                                $self->{-numofimgs},
                                $self->{-numofsubs};
-               my $rsslink=$rssobj->{'rss'}->channel('link')."index.html";
+               my $rsslink=$rssobj->{'rss'}->channel('link').
+                       $self->{-relpath}."index.html";
                $rssobj->{'rss'}->add_item(
                        title           => $self->{-title},
                        link            => $rsslink,
                        description     => $rsstitle,
+                       pubDate         => time2str(time),
                );
        }
 }
@@ -623,7 +738,7 @@ sub startsublist {
        my $self = shift;
        my $IND = $self->{-IND};
 
-       print $IND h2("Albums"),"\n",start_table,"\n";
+       print $IND h2({-class=>"atitle"},"Albums"),"\n",start_table,"\n";
 }
 
 sub sub_entry {
@@ -650,7 +765,7 @@ sub startimglist {
        my $first = $self->{-firstimg}->{-base};
        my $slideref = sprintf(".html/%s-slide.html",$first);
 
-       print $IND h2("Images ",
+       print $IND h2({-class=>"ititle"},"Images ",
                a({-href=>$slideref,-class=>'showStart',-rel=>'i'.$first},
                        '&gt; slideshow')),"\n";
 }
@@ -690,10 +805,12 @@ sub img_entry {
                my $h=$self->{$sz}->{'dim'}->[1];
                print $IND "  ",a({-href=>$src,
                        -class=>"conceal",
+                       -rel=>$w."x".$h,
                        -title=>"Reduced to ".$w."x".$h},
                        $w."x".$h)," \n";
        }
        print $IND "  ",a({-href=>$name,
+                               -rel=>$w."x".$h,
                                -title=>'Original'},$w."x".$h),
                "\n",end_div,"\n",
                end_td,end_Tr,end_table,"\n";