X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=gal2%2Fgal-gen;h=3c1a6e98a81752dde349b14ae5816964b4d52310;hb=3458be45556b066cd093f5c0696c1627808d71f6;hp=d8edb57e6ba7e00401ebf1595136a2e9339a08d3;hpb=b89f977dc5a5d785766118992aa90a7eff7b5d3b;p=gallery.git

diff --git a/gal2/gal-gen b/gal2/gal-gen
index d8edb57..3c1a6e9 100755
--- a/gal2/gal-gen
+++ b/gal2/gal-gen
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 
 use lib '/home/mj/web/gal2';
-use UCW::Gallery;
+use UCW::Gallery qw(%CF);
 
 use Image::Magick;
 use IO::Handle;
@@ -17,10 +17,10 @@ STDOUT->autoflush(1);
 
 UCW::Gallery::LoadConfig;
 
-my $orig_dir = $UCW::Gallery::CF{'OrigDir'};
+my $orig_dir = $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 {
@@ -41,23 +41,22 @@ 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;
 	}
@@ -69,7 +68,10 @@ for my $f (@$orig_list) {
 		'xf' => $xfrm,
 		'w' => $w,
 		'h' => $h,
+		'title' => $f->{title},
 	};
+	$meta->{photo}->{$id} = $m;
+	push @{$meta->{sequence}}, $id;
 
 	my $om = $old_meta->{photo}->{$id};
 	if ($om &&
@@ -79,7 +81,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 +122,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";