Fix one more occurence and incorrect if/else order

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Mar 6, 2016 · 87286f1 · 87286f1
1 parent 24dc3ae
commit 87286f1
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/nikola/plugins/command/import_wordpress.py b/nikola/plugins/command/import_wordpress.py
@@ -466,12 +466,12 @@ def import_attachment(self, item, wordpress_namespace):
         path = urlparse(url).path
         dst_path = os.path.join(*([self.output_folder, 'files'] + list(path.split('/'))))
         if self.no_downloads:
+            LOGGER.info("Skipping downloading {0} => {1}".format(url, dst_path))
+        else:
             dst_dir = os.path.dirname(dst_path)
             utils.makedirs(dst_dir)
             LOGGER.info("Downloading {0} => {1}".format(url, dst_path))
             self.download_url_content_to_file(url, dst_path)
-        else:
-            LOGGER.info("Skipping downloading {0} => {1}".format(url, dst_path))
         dst_url = '/'.join(dst_path.split(os.sep)[2:])
         links[link] = '/' + dst_url
         links[url] = '/' + dst_url
@@ -567,10 +567,13 @@ def add(our_key, wp_key, is_int=False, ignore_zero=False, is_float=False):
 
                         path = urlparse(url).path
                         dst_path = os.path.join(*([self.output_folder, 'files'] + list(path.split('/'))))
-                        dst_dir = os.path.dirname(dst_path)
-                        utils.makedirs(dst_dir)
-                        LOGGER.info("Downloading {0} => {1}".format(url, dst_path))
-                        self.download_url_content_to_file(url, dst_path)
+                        if self.no_downloads:
+                            LOGGER.info("Skipping downloading {0} => {1}".format(url, dst_path))
+                        else:
+                            dst_dir = os.path.dirname(dst_path)
+                            utils.makedirs(dst_dir)
+                            LOGGER.info("Downloading {0} => {1}".format(url, dst_path))
+                            self.download_url_content_to_file(url, dst_path)
                         dst_url = '/'.join(dst_path.split(os.sep)[2:])
                         links[url] = '/' + dst_url