New upstream version 1.10.2upstream/1.10.2

1 files changed, 15 insertions, 8 deletions

diff --git a/gallery_dl/postprocessor/classify.py b/gallery_dl/postprocessor/classify.py
index 62460d3..4a9bde9 100644
--- a/gallery_dl/postprocessor/classify.py
+++ b/gallery_dl/postprocessor/classify.py
@@ -33,17 +33,24 @@ class ClassifyPP(PostProcessor):
         }
 
     def prepare(self, pathfmt):
-        ext = pathfmt.keywords.get("extension")
-
+        ext = pathfmt.extension
         if ext in self.mapping:
-            self._dir = pathfmt.realdirectory + os.sep + self.mapping[ext]
-            pathfmt.realpath = self._dir + os.sep + pathfmt.filename
-        else:
-            self._dir = None
+            # set initial paths to enable download skips
+            self._build_paths(pathfmt, self.mapping[ext])
 
     def run(self, pathfmt):
-        if self._dir:
-            os.makedirs(self._dir, exist_ok=True)
+        ext = pathfmt.extension
+        if ext in self.mapping:
+            # rebuild paths in case the filename extension changed
+            path = self._build_paths(pathfmt, self.mapping[ext])
+            os.makedirs(path, exist_ok=True)
+
+    @staticmethod
+    def _build_paths(pathfmt, extra):
+        path = pathfmt.realdirectory + extra
+        pathfmt.realpath = path + os.sep + pathfmt.filename
+        pathfmt.path = pathfmt.directory + extra + os.sep + pathfmt.filename
+        return path
 
 
 __postprocessor__ = ClassifyPP