Gallery2: More renames

[gallery.git] / gal2 / gal-gen

diff --git a/gal2/gal-gen b/gal2/gal-gen
index d8edb57e6ba7e00401ebf1595136a2e9339a08d3..96bd65f36942725f14113e2b9d592e2662bdfc34 100755 (executable)
--- a/gal2/gal-gen
+++ b/gal2/gal-gen
@@ -5,8 +5,9 @@
 use strict;
 use warnings;
 
-use lib '/home/mj/web/gal2';
-use UCW::Gallery;
+use FindBin;
+use lib $FindBin::Bin;
+use UCW::Gallery qw(%CF);
 
 use Image::Magick;
 use IO::Handle;
@@ -17,10 +18,9 @@ STDOUT->autoflush(1);
 
 UCW::Gallery::LoadConfig;
 
-my $orig_dir = $UCW::Gallery::CF{'OrigDir'};
 my $orig_list = UCW::Gallery::ReadList('gallery.list') or die "Cannot read gallery.list: $!\n";
 
-my $photo_dir = $UCW::Gallery::CF{'PhotoDir'};
+my $photo_dir = $CF{'PhotoDir'};
 if (-d $photo_dir) {
        print "Using existing output directory: $photo_dir\n";
 } else {
@@ -35,29 +35,28 @@ if (-f $photo_meta) {
        $old_meta = UCW::Gallery::ReadMeta($photo_meta);
        # use Data::Dumper; print "Read old meta: ", Dumper($old_meta), "\n";
 }
-my $meta = { 'photo' => {}, 'sequence' => [] };
+my $meta = { 'photo' => {} };
 
 for my $f (@$orig_list) {
        my $id = $f->{id};
        my $rotate = $f->{orientation};
        my $xfrm = $f->{xfrm};
-       push @{$meta->{sequence}}, $id;
        print "$id: ";
 
        my $p = new Image::Magick;
-       my $orig = File::Spec->rel2abs($f->{file}, $UCW::Gallery::CF{'OrigDir'});
+       my $orig = File::Spec->rel2abs($f->{file}, $CF{'OrigDir'});
        my ($orig_w, $orig_h, $orig_size, $orig_format) = $p->PingImage($orig) or die "Error reading $orig\n";
        print "${orig_w}x${orig_h} ";
 
        my ($w0, $h0) = ($rotate eq "l" || $rotate eq "r") ? ($orig_h, $orig_w) : ($orig_w, $orig_h);
        my ($w, $h) = ($w0, $h0);
-       if ($w > $UCW::Gallery::CF{'PhotoMaxWidth'}) {
-               my $s = $UCW::Gallery::CF{'PhotoMaxWidth'} / $w;
+       if ($w > $CF{'PhotoMaxWidth'}) {
+               my $s = $CF{'PhotoMaxWidth'} / $w;
                $w = $w * $s;
                $h = $h * $s;
        }
-       if ($h > $UCW::Gallery::CF{'PhotoMaxHeight'}) {
-               my $s = $UCW::Gallery::CF{'PhotoMaxHeight'} / $h;
+       if ($h > $CF{'PhotoMaxHeight'}) {
+               my $s = $CF{'PhotoMaxHeight'} / $h;
                $w = $w * $s;
                $h = $h * $s;
        }
@@ -70,6 +69,7 @@ for my $f (@$orig_list) {
                'w' => $w,
                'h' => $h,
        };
+       $meta->{photo}->{$id} = $m;
 
        my $om = $old_meta->{photo}->{$id};
        if ($om &&
@@ -79,7 +79,6 @@ for my $f (@$orig_list) {
            $om->{h} eq $m->{h}) {
                # FIXME: Remove old images?
                print "... uptodate\n";
-               $meta->{photo}->{$id} = $om;
                next;
        }
 
@@ -121,7 +120,6 @@ for my $f (@$orig_list) {
        rename $tmp, $photo or die "Cannot rename $tmp to $photo: $!\n";
 
        print "... OK\n";
-       $meta->{photo}->{$id} = $m;
 }
 
 print "Writing meta-data\n";