Author: Boro Sitnikovski <buritomath@yahoo.com>
Description: thumbnails in independent directory
Bug-Debian: http://bugs.debian.org/196310

--- a/bins	2010-01-18 09:41:35.000000000 +0100
+++ b/bins	2012-06-19 00:24:13.096183002 +0200
@@ -1145,6 +1145,26 @@
         my $albumdir2 = File::Spec->rel2abs(".");
         chdir($pwd);
 
+        if (! -d "$albumdir/thumbs") {
+            mkdir "$albumdir/thumbs", 0755
+                or die("\nCannot create $albumdir/thumbs: $?");
+        }
+
+        if (! -d "$albumdir/thumbs/Lg") {
+            mkdir "$albumdir/thumbs/Lg", 0755
+                or die("\nCannot create $albumdir/thumbs/Lg: $?");
+        }
+
+        if (! -d "$albumdir/thumbs/Med") {
+            mkdir "$albumdir/thumbs/Med", 0755
+                or die("\nCannot create $albumdir/thumbs/Med: $?");
+        }
+
+        if (! -d "$albumdir/thumbs/Sm") {
+            mkdir "$albumdir/thumbs/Sm", 0755
+                or die("\nCannot create $albumdir/thumbs/Sm: $?");
+        }
+
         #print "picdir:   $picdir2\n";
         #print "albumdir: $albumdir2\n";
 
@@ -3226,7 +3246,7 @@
         $imageData[$i]{'height'} = $height;
 
         #generate thumbnail (with dir if needed)
-        my $thumbName = "$crntImageBase"."_pre.jpg";
+        my $thumbName = "thumbs/$crntImageBase"."_pre.jpg";
         #$imageData[$i]{'thumblink'} = &getWebBase($album).$thumbName;
         $imageData[$i]{'thumblink'} = jssafe_uri_escape($thumbName);
 
@@ -3252,7 +3272,7 @@
             if (! $filling_in_sizes ) {
                 my $size = $imageConfigHash->{sizeNames}[$j];
                 $size =~ s/\.//g ;
-                $scaledImage = $crntImageBase."_".
+                $scaledImage = "thumbs/".$size."/".$crntImageBase."_".
                     $size.".jpg";
                 $maxWidth = $imageConfigHash->{scaledWidths}[$j];
                 $maxHeight = $imageConfigHash->{scaledHeights}[$j];
@@ -3369,7 +3389,7 @@
                                      $nextImageNum);
 
             $imageData[$i]{$j}{'preloadIMG'} =
-                jssafe_uri_escape($imageData[$nextImageNum]{'basename'})."_".
+                "thumbs/".$size."/".jssafe_uri_escape($imageData[$nextImageNum]{'basename'})."_".
                 $imageData[$nextImageNum]{configuration}{sizeNames}[$sizeLink].
                 ".jpg";
             $imageData[$i]{$j}{'imgNum'} = $i + 1;
@@ -3407,7 +3427,7 @@
                 #$imageData[$i]{$j}{'sizedFile'} =
                 #  &getWebBase($album).$imageData[$i]{'imagepath'}.
                 #    $scaledImage;
-                $imageData[$i]{$j}{'sizedFile'} = $scaledImage;
+                $imageData[$i]{$j}{'sizedFile'} = "thumbs/".$size."/".$scaledImage;
             }
         }
 
