]> www.average.org Git - mkgallery.git/blobdiff - mkgallery.pl
work in progress on rss generation
[mkgallery.git] / mkgallery.pl
index e64f5975b00ec4a8c693ab9abf7fe1ed86782c25..f672b6c3895234f6665d6da8a8eda1abb566bfa2 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id$
+my $version='$Id$';
 
 # Recursively create image gallery index and slideshow wrappings.
 # Makes use of modified "slideshow" javascript by Samuel Birch
@@ -74,21 +74,14 @@ if ($rssfile && ! $haverssxml) {
 my $term = new Term::ReadLine "Edit Title";
 
 FsObj->new(getcwd)->iterate;
-
-if ($rssobj) {
-       my $itemstodel = @{$rssobj->{'rss'}->{'items'}} - 15;
-       while ($itemstodel-- > 0) {
-               pop(@{$rssobj->{'rss'}->{'items'}})
-       }
-       $rssobj->{'rss'}->save($rssobj->{'file'});
-}
+if ($rssobj) { $rssobj->{'rss'}->save($rssobj->{'file'}); }
 
 sub help {
 
        print STDERR <<__END__;
 usage: $0 [options]
  --help:        print help message and exit
- --incpath:     do not try to find .include diretory upstream, use
+ --incpath:     do not try to find .gallery2 diretory 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
@@ -108,24 +101,26 @@ 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;
                my $root=shift;
                $self = {
+                               -depth=>0,
                                -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) {
@@ -137,30 +132,51 @@ 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 $rss;
+       my $relpath;
 
        if ($incpath) {
-               return $incpath."/.include";
-       }
-
-       my $inc=".include";
-       while ( ! -d $fullpath."/".$inc ) {
-               $inc = "../".$inc;
-               last unless ($depth-- > 0);
+               $inc = $incpath."/.gallery2";
+       } else {
+               $inc=".gallery2";
+               while ( ! -d $fullpath."/".$inc ) {
+                       $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++;
+               }
+               for ($pos=length($fullpath);$dp-->0 && $pos>0;
+                                       $pos=rindex($fullpath,'/',$pos-1)) {;}
+               my $relpath = substr($fullpath,$pos);
+               $relpath =~ s%^/%%;
+               $self->{-relpath} = $relpath;
+               $self->{-toppath} = substr($fullpath,0,$pos);
+               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} = '';
        }
 }
 
-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 $depth=20;
 
+       return;
        return "" unless $rssfile;
 
        my $rss=$rssfile;
@@ -172,6 +188,11 @@ sub getrss {
                $rssobj->{'file'} = $rss;
                $rssobj->{'rss'} = new XML::RSS (version=>2);
                $rssobj->{'rss'}->parsefile($rss);
+               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 ".
@@ -366,7 +387,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";
@@ -378,7 +399,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);
@@ -401,7 +422,8 @@ sub makescaled {
                        $self->{$size}->{'dim'} = [$w, $h];
                } else {
                        $self->{$size}->{'url'} = $nref;
-                       $self->{$size}->{'dim'} = [$w*$factor, $h*$factor];
+                       $self->{$size}->{'dim'} = [int($w*$factor+.5),
+                                                       int($h*$factor+.5)];
                        if (isnewer($fn,$nfn)) {
                                doscaling($fn,$nfn,$factor,$w,$h);
                        }
@@ -454,7 +476,7 @@ sub makeaux {
        for my $refresh('static', 'slide') {
                my $fn = sprintf("%s/.html/%s-%s.html",$dn,$name,$refresh);
                if (isnewer($self->{-fullpath},$fn)) {
-                       my $imgsrc = '../'.$self->{$sizes[1]};
+                       my $imgsrc = '../'.$self->{$sizes[1]}->{'url'};
                        my $fwdref;
                        my $bakref;
                        if ($nref) {
@@ -490,27 +512,29 @@ sub makeaux {
                                        -head=>meta({-http_equiv=>'Refresh',
                                                -content=>"3; url=$fwdref"}),
                                        -style=>{-src=>$inc."gallery.css"},
-                                       ),"\n";
+                                       ),"\n",
+                                       comment("Created by ".$version),"\n";
                                                
                        } else {
                                print $F start_html(-title=>$title,
                                        -encoding=>"utf-8",
                                        -bgcolor=>"#808080",
                                        -style=>{-src=>$inc."gallery.css"},
-                                       ),"\n";
+                                       ),"\n",
+                                       comment("Created by ".$version),"\n";
                        }
-                       print $F start_center,"\n",
-                               h1($title),"\n",
-                               start_table({-class=>'navi'}),start_Tr,"\n",
+                       print $F start_table({-class=>'navi'}),start_Tr,"\n",
                                td(a({-href=>"../index.html"},"Index")),"\n",
                                td(a({-href=>$bakref},"&lt;&lt;Prev")),"\n",
                                td(a({-href=>$toggleref},$toggletext)),"\n",
                                td(a({-href=>$fwdref},"Next&gt;&gt;")),"\n",
+                               td({-class=>'title'},$title),"\n",
                                end_Tr,
                                end_table,"\n",
-                               table({-class=>'picframe'},
-                                       Tr(td(img({-src=>$imgsrc})))),"\n",
-                               end_center,"\n",
+                               center(table({-class=>'picframe'},
+                                       Tr(td(img({-src=>$imgsrc,
+                                                  -class=>'standalone',
+                                                  -alt=>$title}))))),"\n",
                                end_html,"\n";
                        close($F);
                }
@@ -527,13 +551,22 @@ sub makeaux {
                my $imgsrc = sprintf("../.%s/%s",$sizes[0],$name);
                print $F start_html(-title=>$title,
                                -encoding=>"utf-8",
-                               -style=>{-src=>$inc."gallery.css"},),"\n",
+                               -style=>{-src=>$inc."gallery.css"},
+                               -script=>[
+                                       {-src=>$inc."mootools.js"},
+                                       {-src=>$inc."urlparser.js"},
+                                       {-src=>$inc."infopage.js"},
+                               ]),"\n",
+                       comment("Created by ".$version),"\n",
                        start_center,"\n",
                        h1($title),"\n",
                        table({-class=>'ipage'},
-                               Tr(td(img({-src=>$imgsrc})),
+                               Tr(td(img({-src=>$imgsrc,
+                                          -class=>'thumbnail',
+                                          -alt=>$title})),
                                        td($self->infotable))),
-                       a({-href=>'../index.html'},'Index'),"\n",
+                       a({-href=>'../index.html',-class=>'conceal'},
+                               'Index'),"\n",
                        end_center,"\n",
                        end_html,"\n";
                close($F);
@@ -565,25 +598,65 @@ sub startindex {
        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"},
                                {-src=>$inc."urlparser.js"},
-                               {-src=>$inc."slideshow.js"},
+                               {-src=>$inc."multibox.js"},
+                               {-src=>$inc."showwin.js"},
+                               {-src=>$inc."controls.js"},
+                               {-src=>$inc."show.js"},
                                {-src=>$inc."gallery.js"},
-                               {-code=>"var incPrefix='$inc';"}
-                       ]),
-               a({-href=>"../index.html"},"UP"),"\n",
-               start_center,"\n",
-               h1($title),"\n",
+                       ]),"\n",
+               comment("Created by ".$version),"\n",
+               start_div({-class => 'indexContainer',
+                               -id => 'indexContainer'}),
                "\n";
+       my $EVL;
+       if (open($EVL,$inc.'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 $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_html,"\n";
+       print $IND end_div;
+       my $EVL;
+       if (open($EVL,$self->{-inc}.'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";
+       }
+       print $IND end_html,"\n";
 
        close($IND) if ($IND);
        undef $self->{-IND};
@@ -605,7 +678,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 {
@@ -632,28 +705,9 @@ sub startimglist {
        my $first = $self->{-firstimg}->{-base};
        my $slideref = sprintf(".html/%s-slide.html",$first);
 
-       print $IND h2("Images"),"\n",
-               a({-href=>$slideref,
-                       -onClick=>"return run_slideshow(-1);"},
-                       'Slideshow'),
-               start_div({-id=>"slideshowWindow",-class=>"slideshowWindow"}),
-               div({-id=>"slideshowContainer",
-                       -class=>"slideshowContainer"},""),
-               start_div({-id=>"slideshowControls",
-                       -class=>"slideshowControls"}),
-               a({-href=>"#",-onClick=>"show.previous();return false;"},
-                       "Prev"),
-               a({-href=>"#",-onClick=>"show.play();return false;"},
-                       "Play"),
-               a({-href=>"#",-onClick=>"show.stop();return false;"},
-                       "Stop"),
-               a({-href=>"#",-onClick=>"show.next();return false;"},
-                       "Next"),
-               a({-href=>"#",-onClick=>"stop_slideshow();return false;"},
-                       "Exit"),
-               end_div,
-               end_div,
-               "\n";
+       print $IND h2({-class=>"ititle"},"Images ",
+               a({-href=>$slideref,-class=>'showStart',-rel=>'i'.$first},
+                       '&gt; slideshow')),"\n";
 }
 
 sub img_entry {
@@ -668,42 +722,37 @@ sub img_entry {
 
        my $i=0+$self->{-parent}->{-numofimgs};
        $self->{-parent}->{-numofimgs}++;
-       print $IND start_div({-class=>'ibox',-id=>$name,
-                               -OnClick=>"HideIbox('$name');"}),"\n",
-               start_div({-class=>'iboxtitle'}),
-               span({-style=>'float: left;'},b("Info for $name")),
-               span({-style=>'float: right;'},
-                       a({-href=>"#",-OnClick=>"HideIbox('$name');"},"Close")),
-               br({-clear=>'all'}),"\n",
-               end_div,"\n",
-               $self->infotable,
-               end_div,"\n";
-
-       print $IND a({-name=>$i}),"\n",
+
+       print $IND a({-name=>$name}),"\n",
                start_table({-class=>'slide'}),start_Tr,start_td,"\n",
-               div({-class=>'slidetitle',-id=>$name},
-                       a({-href=>".html/$name-info.html",
-                               -title=>'Image Info',
-                               -onClick=>"return showIbox('$name');"},
-                               $title)),"\n",
-               div({-class=>'slideimage',-id=>$name},
-                       a({-href=>".html/$name-static.html",-title=>$title,
-                               -id=>$name,
-                               -OnClick=>"return run_slideshow(".$i.");"},
-                               img({-src=>$thumb}))),"\n",
-               start_div({-class=>'varimages',-id=>$i});
+               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",
+                               -title=>$title,
+                               -class=>'showImage',
+                               -rel=>'i'.$name},
+                               img({-src=>$thumb,
+                                    -class=>'thumbnail',
+                                    -alt=>$title})),"\n"),"\n",
+               start_div({-class=>'varimages',-id=>'i'.$name,-title=>$title}),"\n";
        foreach my $sz(@sizes) {
                my $src=$self->{$sz}->{'url'};
                my $w=$self->{$sz}->{'dim'}->[0];
                my $h=$self->{$sz}->{'dim'}->[1];
-               print $IND a({-href=>$src,-style=>"display: none;",
-                       -class=>($sz == 640)?"slideshowThumbnail":"",
+               print $IND "  ",a({-href=>$src,
+                       -class=>"conceal",
+                       -rel=>$w."x".$h,
                        -title=>"Reduced to ".$w."x".$h},
-                       $w."x".$h)," ";
+                       $w."x".$h)," \n";
        }
-       print $IND a({-href=>$name,
+       print $IND "  ",a({-href=>$name,
+                               -rel=>$w."x".$h,
                                -title=>'Original'},$w."x".$h),
-               end_div,"\n",
+               "\n",end_div,"\n",
                end_td,end_Tr,end_table,"\n";
 }