diff options
author | Daniel Friesel <derf@finalrewind.org> | 2011-03-04 09:12:13 +0100 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2011-03-04 09:12:13 +0100 |
commit | b7566742ffcf86c8a6d9fac0eace013e1ffd6d04 (patch) | |
tree | 5ee7366eb78c16aec3303a6eab39941dc595b777 /lib/App/Dthumb.pm | |
parent | 04d800589cc2bbb2e6a61969547179a8b20c837e (diff) |
App::Dthumb read_directories() tests
Diffstat (limited to 'lib/App/Dthumb.pm')
-rwxr-xr-x | lib/App/Dthumb.pm | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/lib/App/Dthumb.pm b/lib/App/Dthumb.pm index b3aa1cf..f1b39b4 100755 --- a/lib/App/Dthumb.pm +++ b/lib/App/Dthumb.pm @@ -61,6 +61,18 @@ Valid hash keys are: =over +=item B<dir_images> => I<directory> + +Set base directory for image reading, data creation etc. + +Default: F<.> (current working directory) + +=item B<file_index> => I<file> + +Set name of the html index file + +Default: F<index.xhtml> + =item B<lightbox> => I<bool> Include and use javascript lightbox code @@ -115,8 +127,10 @@ sub new { $conf{title} //= (split(qr{/}, cwd()))[-1]; $conf{file_index} //= 'index.xhtml'; - $conf{dir_thumbs} //= '.thumbs'; - $conf{dir_data} //= '.dthumb'; + $conf{dir_images} //= '.'; + + $conf{dir_data} = "$conf{dir_images}/.dthumb"; + $conf{dir_thumbs} = "$conf{dir_images}/.thumbs"; # helpers to directly pass GetOptions results $conf{lightbox} //= ( $conf{'no-lightbox'} ? 0 : 1 ); @@ -148,14 +162,14 @@ F<.thumbs> which do not have a corresponding full-size image. sub read_directories { my ($self) = @_; my $thumbdir = $self->{config}->{dir_thumbs}; - my $imgdir = '.'; + my $imgdir = $self->{config}->{dir_images}; my $dh; my (@files, @old_thumbs); opendir($dh, $imgdir); for my $file (readdir($dh)) { - if (-f $file and $file =~ qr{ \. (png | jp e? g) $ }iox) { + if (-f "${imgdir}/${file}" and $file =~ qr{ \. (png | jp e? g) $ }iox) { push(@files, $file); } } @@ -164,7 +178,7 @@ sub read_directories { if (-d $thumbdir) { opendir($dh, $thumbdir); for my $file (readdir($dh)) { - if ($file =~ qr{^ [^.] }ox and not -f $file) { + if ($file =~ qr{^ [^.] }ox and not -f "${imgdir}/${file}") { push(@old_thumbs, $file); } } |