From 4b70374e9d6c041fda31d5b594f1f6605496ea92 Mon Sep 17 00:00:00 2001
From: ryuslash
Date: Fri, 19 Mar 2010 16:08:39 +0100
Subject: FAIL and print

If source and dest in copy are the same, it is no longer reported
If an image can't be read, it is counted as failed
---
 download.py | 4 ++--
 sorter.py   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/download.py b/download.py
index 3b12cc8..62a611b 100644
--- a/download.py
+++ b/download.py
@@ -35,7 +35,6 @@ def check_archive(fullpath):
     archive = conf.get_archive_location()
     filename = os.path.basename(fullpath)
     archfile = os.path.join(archive, filename)
-    #print "Path", archfile, "exists:", os.path.exists(archfile)
     return os.path.exists(archfile)
 
 class Downloader(object):
@@ -134,7 +133,8 @@ class Downloader(object):
                 else:
                     downloaded += 1
                     if self.on_downloaded is not None:
-                        self.on_downloaded(filename)
+                        if not self.on_downloaded(filename):
+                            failed += 1
             else:
                 skipped += 1
             i += 1
diff --git a/sorter.py b/sorter.py
index 482e343..c52ab9a 100644
--- a/sorter.py
+++ b/sorter.py
@@ -33,6 +33,7 @@ class Sorter:
     
     def act(self, filename):
         download_base = self.conf.get_download_location()
+        retval = True
         
         if self.check_filename(filename):
             image = None
@@ -40,8 +41,7 @@ class Sorter:
                 image = Image.open(os.path.join(download_base,
                                             filename))
             except IOError:
-                print "Cannot read image file %s, might be broken" \
-                    % filename
+                retval = False
 
             if not image == None and self.archive_check(filename):
                 for resolution in self.resolutions:
@@ -55,13 +55,13 @@ class Sorter:
                             str(image.size[1]) == resolution[1]:
                         if not os.path.exists(folderpath):
                             os.makedirs(folderpath)
-                            #print "creating", folderpath
                             
                         self.copy(filename, folderpath)
                         break
 
                     self.archive(filename)
             self.remove(filename)
+            return retval
 
     def copy(self, filename, destpath):
         download_base = self.conf.get_download_location()
@@ -73,7 +73,6 @@ class Sorter:
             shutil.copy(source, dest)
         else:
             print "\nHow can this even happen?! Copying", source, "to", dest
-        #print "\nParameters are", filename, "and", destpath
 
     def archive(self, filename):
         download_base = self.conf.get_download_location()
-- 
cgit v1.2.3-54-g00ecf