From d4c4fb3208caa6a12a54f670afa7b0e2d96aa3ad Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 26 Jun 2018 17:36:20 +0200
Subject: support recursive thumbnail generation on directory trees

---
 t/20-app-dthumb.t             |   4 ++--
 t/21-app-dthumb.files.t       |  23 ++++++++++++-----------
 t/cmp/index.names             |   4 ++--
 t/cmp/index.no-names          |   4 ++--
 t/imgdir/.thumbs/invalid.png  |   0
 t/imgdir/no_image             |   0
 t/imgdir/one.png              | Bin 6525 -> 0 bytes
 t/imgdir/two.png              | Bin 13552 -> 0 bytes
 t/out/.thumbnails/invalid.png |   0
 t/out/no_image                |   0
 t/out/one.png                 | Bin 0 -> 6525 bytes
 t/out/two.png                 | Bin 0 -> 13552 bytes
 12 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 t/imgdir/.thumbs/invalid.png
 delete mode 100644 t/imgdir/no_image
 delete mode 100644 t/imgdir/one.png
 delete mode 100644 t/imgdir/two.png
 create mode 100644 t/out/.thumbnails/invalid.png
 create mode 100644 t/out/no_image
 create mode 100644 t/out/one.png
 create mode 100644 t/out/two.png

(limited to 't')

diff --git a/t/20-app-dthumb.t b/t/20-app-dthumb.t
index 9be60de..74288a8 100755
--- a/t/20-app-dthumb.t
+++ b/t/20-app-dthumb.t
@@ -16,8 +16,8 @@ isa_ok($dthumb->{data}, 'App::Dthumb::Data');
 
 is($dthumb->{config}->{dir_data}, './.dthumb', 'Data directory is .dthumb');
 is($dthumb->{config}->{dir_images}, '.', 'Image directory is .');
-is($dthumb->{config}->{dir_thumbs}, './.thumbs',
-	'Thumbnail directory is dthumbs');
+is($dthumb->{config}->{suffix_thumbs}, '.thumbnails',
+	'Thumbnail suffix is .thumbnails');
 is($dthumb->{config}->{file_index}, 'index.html', 'index is index.html');
 
 is($dthumb->{config}->{names}   ,   1, 'Show image names');
diff --git a/t/21-app-dthumb.files.t b/t/21-app-dthumb.files.t
index 7c91580..60283a6 100755
--- a/t/21-app-dthumb.files.t
+++ b/t/21-app-dthumb.files.t
@@ -14,8 +14,8 @@ plan tests => 9;
 use_ok('App::Dthumb');
 
 my %conf = (
-	file_index => 't/out/index',
-	dir_images => 't/imgdir',
+	file_index => 'index',
+	dir_images => 't/out',
 );
 my @created_files;
 my @indep_files = ('main.css');
@@ -23,10 +23,10 @@ my @indep_files = ('main.css');
 my $dthumb = App::Dthumb->new(%conf);
 isa_ok($dthumb, 'App::Dthumb');
 
-mkdir('t/out');
+$dthumb->read_directories;
 
 for my $file (qw(one.png two.png)) {
-	$dthumb->create_thumbnail_html($file);
+	$dthumb->create_thumbnail_html("t/out/$file");
 }
 $dthumb->write_out_html();
 
@@ -40,8 +40,10 @@ unlink('t/out/index');
 $conf{names} = 0;
 $dthumb = App::Dthumb->new(%conf);
 
+$dthumb->read_directories;
+
 for my $file (qw(one.png two.png)) {
-	$dthumb->create_thumbnail_html($file);
+	$dthumb->create_thumbnail_html("t/out/$file");
 }
 $dthumb->write_out_html();
 
@@ -53,9 +55,10 @@ unlink('t/out/index');
 
 
 $dthumb = App::Dthumb->new(dir_images => 't/out');
-$dthumb->create_files();
+$dthumb->read_directories;
+$dthumb->create_files;
 
-ok(-d 't/out/.thumbs', 'create_files: Creates thumb dir');
+ok(-d 't/out/.thumbnails', 'create_files: Creates thumb dir');
 ok(-d 't/out/.dthumb', 'create_files: Creates data dir');
 
 for my $file ($dthumb->{data}->list_archived()) {
@@ -64,11 +67,9 @@ for my $file ($dthumb->{data}->list_archived()) {
 		unlink("t/out/.dthumb/${file}");
 	}
 }
-rmdir('t/out/.thumbs');
 rmdir('t/out/.dthumb/css');
 rmdir('t/out/.dthumb/js');
 rmdir('t/out/.dthumb');
-rmdir('t/out');
 
 is_deeply([sort $dthumb->{data}->list_archived()], [sort @created_files],
 	'create_files: All files created');
@@ -78,5 +79,5 @@ $dthumb = App::Dthumb->new(%conf);
 
 $dthumb->read_directories();
 
-is_deeply($dthumb->{old_thumbnails}, ['invalid.png'], '{old_thumbnails}');
-is_deeply($dthumb->{files}, ['one.png', 'two.png'], '{files}');
+is_deeply($dthumb->{old_thumbnails}, ['t/out/invalid.png'], '{old_thumbnails}');
+is_deeply($dthumb->{files}, ['t/out/one.png', 't/out/two.png'], '{files}');
diff --git a/t/cmp/index.names b/t/cmp/index.names
index d714ab5..fcfb547 100644
--- a/t/cmp/index.names
+++ b/t/cmp/index.names
@@ -18,13 +18,13 @@
 <body><div>
 <div class="image-container">
 	<a class="fancybox" href="one.png" title="one.png" data-fancybox-group="gallery">
-		<img src="t/imgdir/.thumbs/one.png" alt="one.png" /></a>
+		<img src=".thumbnails/one.png" alt="one.png" /></a>
 	<br />
 	<a style="text-decoration: none;" href="one.png">one.png</a>
 </div>
 <div class="image-container">
 	<a class="fancybox" href="two.png" title="two.png" data-fancybox-group="gallery">
-		<img src="t/imgdir/.thumbs/two.png" alt="two.png" /></a>
+		<img src=".thumbnails/two.png" alt="two.png" /></a>
 	<br />
 	<a style="text-decoration: none;" href="two.png">two.png</a>
 </div>
diff --git a/t/cmp/index.no-names b/t/cmp/index.no-names
index e1e9e2c..9689b00 100644
--- a/t/cmp/index.no-names
+++ b/t/cmp/index.no-names
@@ -18,11 +18,11 @@
 <body><div>
 <div class="image-container">
 	<a class="fancybox" href="one.png" title="one.png" data-fancybox-group="gallery">
-		<img src="t/imgdir/.thumbs/one.png" alt="one.png" /></a>
+		<img src=".thumbnails/one.png" alt="one.png" /></a>
 </div>
 <div class="image-container">
 	<a class="fancybox" href="two.png" title="two.png" data-fancybox-group="gallery">
-		<img src="t/imgdir/.thumbs/two.png" alt="two.png" /></a>
+		<img src=".thumbnails/two.png" alt="two.png" /></a>
 </div>
 </div>
 </body>
diff --git a/t/imgdir/.thumbs/invalid.png b/t/imgdir/.thumbs/invalid.png
deleted file mode 100644
index e69de29..0000000
diff --git a/t/imgdir/no_image b/t/imgdir/no_image
deleted file mode 100644
index e69de29..0000000
diff --git a/t/imgdir/one.png b/t/imgdir/one.png
deleted file mode 100644
index 5903c34..0000000
Binary files a/t/imgdir/one.png and /dev/null differ
diff --git a/t/imgdir/two.png b/t/imgdir/two.png
deleted file mode 100644
index f16d150..0000000
Binary files a/t/imgdir/two.png and /dev/null differ
diff --git a/t/out/.thumbnails/invalid.png b/t/out/.thumbnails/invalid.png
new file mode 100644
index 0000000..e69de29
diff --git a/t/out/no_image b/t/out/no_image
new file mode 100644
index 0000000..e69de29
diff --git a/t/out/one.png b/t/out/one.png
new file mode 100644
index 0000000..5903c34
Binary files /dev/null and b/t/out/one.png differ
diff --git a/t/out/two.png b/t/out/two.png
new file mode 100644
index 0000000..f16d150
Binary files /dev/null and b/t/out/two.png differ
-- 
cgit v1.2.3