Fixed some image handling

diff --git a/bin/setbg b/bin/setbg
index e36a1a7..17bdc08 100755 (executable)
--- a/bin/setbg
+++ b/bin/setbg
@@ -32,7 +32,7 @@ $Date: 2012/11/09 15:31:30 $
 
  Usage: setbg [-u|sage] [-h|elp] [-ve|rbose] [-d|ebug] [-s|leep <n>]
               [-bgdirs <bgdir> -bgdirs ...]
- 
+
  Where:
 
  -u|sage:      Displays this usage
@@ -130,12 +130,14 @@ sub fillPictures () {
   $totals{bgdirs} = 0;
 
   for (@{$opts{bgdirs}}) {
-    my ($status, @pics) = Execute "find \"$_\" -type f";
+    my ($status, @pics) = Execute "find \"$_/\" -type f";
 
     chomp @pics;
 
     push @images, grep(/jpg$|png$|gif$/i, @pics);
 
+    @pics = grep(/jpg$|png$|gif$/i, @pics);
+
     push @{$opts{bgdircnt}}, scalar @pics;
 
     $totals{bgdirs}++;
@@ -143,8 +145,11 @@ sub fillPictures () {
 
   $totals{images} = scalar @images;
 
+  displayStats;
+
   return @images;
 } # fillPictures
+
 sub writeHistory($) {
   my ($msg) = @_;
 
@@ -238,10 +243,9 @@ truncate "$ENV{HOME}/.$FindBin::Script.hist", 0;
 EnterDaemonMode unless defined $DB::OUT;
 
 my $pickNewImages = 1;
+my ($bgimage, $lockimage);
 
 while () {
-  my ($bgimage, $lockimage);
-
   if ($pickNewImages) {
     $bgimage   = escapeHTML ($images[int (rand $#images)]);
     $lockimage = escapeHTML ($images[int (rand $#images)]);
@@ -285,10 +289,10 @@ while () {
     } # if
 
     updateSetBG $bgimage, $lockimage;
-
-    displayStats;
   } # if
 
+  displayStats;
+
   $today = YMD;
 
   sleep $opts{sleep} * 60;

diff --git a/lib/Logger.pm b/lib/Logger.pm
index 27f7a8d..084fbcb 100644 (file)
--- a/lib/Logger.pm
+++ b/lib/Logger.pm
@@ -166,7 +166,7 @@ Returns:
   my $append      = $parms{append}      ? '>>'                : '>';
   my $logfile;
 
-  if ($parms{extension}) {
+  if (defined $parms{extension}) {
     $name .= ".$parms{extension}" unless $parms{extension} eq '';
   } else {
     $name .= '.log';