From 08b97b640b2184c6ff286bd7e5a8989bd807c49e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Thu, 29 Apr 2010 11:36:49 +0000
Subject: check for Deleted stanza in rdimport output ignore non-existent or
 unreadable files in m3u ignore directories in m3u

git-svn-id: https://svn.helsinki.at/rhimport/trunk@58 7c65635b-ec39-4f67-a626-873dbafdd612

diff --git a/TODO b/TODO
index 605de62..bcc4fc3 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
-* check last line of rdimport output (Deleted <filename>)
 * multi-cart-show - upload a single file..
+* multi-cart/pool - check size of pool vs length of m3u
 * add "show log" button after import
-* m3u file ignore directories (files only)
\ No newline at end of file
+
+
diff --git a/rhimport.pm b/rhimport.pm
index b9a430a..6597fb4 100644
--- a/rhimport.pm
+++ b/rhimport.pm
@@ -159,12 +159,16 @@ sub import_playlist
     next if($entry =~ /^#/);
     next if($entry =~ /^\s/);
     $entry =~ s/\n$//;
+    next if(-d $entry);
+    next if(!-r $entry);
     push @entries, $entry;    
   }
   close(FILE);
   my $num_entries = scalar(@entries);
   print " ($num_entries Files in list)\n";
   
+
+  return (0, "");
   my $cnt = 0;
   my $ret = 0;
   my $log = "";
@@ -268,11 +272,17 @@ sub import_file
   my ($volume, $directories, $remote_file) = File::Spec->splitpath($file);
   $remote_file = "$ssh_dir/$user/$remote_file"; 
   my ($out ,$error) = ssh_exec_command("$rdimport_wrapper --path \"$dropbox\" --file \"$remote_file\"");
-  if($error ne "") {
+  my $lastline = $1 if $out =~ /\n(.*)$/;
+  if($error ne "" || $lastline !~ /^[0-9:\- ]+:\s+Deleted file/) {
     print "Import Error\n";
     delete_file($remote_file);
     if($error_cb) {
-      return $error_cb->("Import Fehler: $error");
+      if($error) {
+        return $error_cb->("Import Fehler: $error");
+      }
+      else {
+        return $error_cb->("Import Fehler: \n$out");
+      }
     }
     return 0;
   }
-- 
cgit v0.10.2