Merge pull request #21 from mentaterasmus/master

[nhentai.git] / nhentai / downloader.py

diff --git a/nhentai/downloader.py b/nhentai/downloader.py
index 1a6e61cf3def9dbaa61ae5826cfbf85a556a8f41..27b27696982b9c3340f9b26a7481666e9963ca9b 100644 (file)
--- a/nhentai/downloader.py
+++ b/nhentai/downloader.py
@@ -36,6 +36,11 @@ class Downloader(Singleton):
         filename = filename if filename else os.path.basename(urlparse(url).path)
         base_filename, extension = os.path.splitext(filename)
         try:
+            if os.path.exists(os.path.join(folder, base_filename.zfill(3) + extension)):
+                logger.warning('File: {0} existed, ignore.'.format(os.path.join(folder, base_filename.zfill(3) +
+                                                                                extension)))
+                return 1, url
+
             with open(os.path.join(folder, base_filename.zfill(3) + extension), "wb") as f:
                 response = request('get', url, stream=True, timeout=self.timeout)
                 if response.status_code != 200:
@@ -75,7 +80,7 @@ class Downloader(Singleton):
             logger.log(15, '{0} download successfully'.format(data))
 
     def download(self, queue, folder=''):
-        if not isinstance(folder, (text)):
+        if not isinstance(folder, text):
             folder = str(folder)
 
         if self.path: