New upstream version 1.27.0.upstream/1.27.0

4 files changed, 22 insertions, 17 deletions

diff --git a/gallery_dl/postprocessor/common.py b/gallery_dl/postprocessor/common.py
index 1d2fba8..d4e1603 100644
--- a/gallery_dl/postprocessor/common.py
+++ b/gallery_dl/postprocessor/common.py
@@ -8,7 +8,7 @@
 
 """Common classes and constants used by postprocessor modules."""
 
-from .. import util, formatter
+from .. import util, formatter, archive
 
 
 class PostProcessor():
@@ -22,30 +22,31 @@ class PostProcessor():
         return self.__class__.__name__
 
     def _init_archive(self, job, options, prefix=None):
-        archive = options.get("archive")
-        if archive:
+        archive_path = options.get("archive")
+        if archive_path:
             extr = job.extractor
-            archive = util.expand_path(archive)
+            archive_path = util.expand_path(archive_path)
             if not prefix:
                 prefix = "_" + self.name.upper() + "_"
             archive_format = (
                 options.get("archive-prefix", extr.category) +
                 options.get("archive-format", prefix + extr.archive_fmt))
             try:
-                if "{" in archive:
-                    archive = formatter.parse(archive).format_map(
+                if "{" in archive_path:
+                    archive_path = formatter.parse(archive_path).format_map(
                         job.pathfmt.kwdict)
-                self.archive = util.DownloadArchive(
-                    archive, archive_format,
+                self.archive = archive.DownloadArchive(
+                    archive_path, archive_format,
                     options.get("archive-pragma"),
                     "_archive_" + self.name)
             except Exception as exc:
                 self.log.warning(
                     "Failed to open %s archive at '%s' (%s: %s)",
-                    self.name, archive, exc.__class__.__name__, exc)
+                    self.name, archive_path, exc.__class__.__name__, exc)
             else:
-                self.log.debug("Using %s archive '%s'", self.name, archive)
+                self.log.debug(
+                    "Using %s archive '%s'", self.name, archive_path)
                 return True
-        else:
-            self.archive = None
+
+        self.archive = None
         return False
diff --git a/gallery_dl/postprocessor/exec.py b/gallery_dl/postprocessor/exec.py
index e7ed2f6..7d2be2b 100644
--- a/gallery_dl/postprocessor/exec.py
+++ b/gallery_dl/postprocessor/exec.py
@@ -10,7 +10,6 @@
 
 from .common import PostProcessor
 from .. import util, formatter
-import subprocess
 import os
 import re
 
@@ -80,14 +79,14 @@ class ExecPP(PostProcessor):
 
     def _exec(self, args, shell):
         self.log.debug("Running '%s'", args)
-        retcode = subprocess.Popen(args, shell=shell).wait()
+        retcode = util.Popen(args, shell=shell).wait()
         if retcode:
             self.log.warning("'%s' returned with non-zero exit status (%d)",
                              args, retcode)
 
     def _exec_async(self, args, shell):
         self.log.debug("Running '%s'", args)
-        subprocess.Popen(args, shell=shell)
+        util.Popen(args, shell=shell)
 
     def _replace(self, match):
         name = match.group(1)
diff --git a/gallery_dl/postprocessor/mtime.py b/gallery_dl/postprocessor/mtime.py
index ea61b7b..6ded1e2 100644
--- a/gallery_dl/postprocessor/mtime.py
+++ b/gallery_dl/postprocessor/mtime.py
@@ -33,6 +33,9 @@ class MtimePP(PostProcessor):
 
     def run(self, pathfmt):
         mtime = self._get(pathfmt.kwdict)
+        if mtime is None:
+            return
+
         pathfmt.kwdict["_mtime"] = (
             util.datetime_to_timestamp(mtime)
             if isinstance(mtime, datetime) else
diff --git a/gallery_dl/postprocessor/ugoira.py b/gallery_dl/postprocessor/ugoira.py
index b713c6f..c63a3d9 100644
--- a/gallery_dl/postprocessor/ugoira.py
+++ b/gallery_dl/postprocessor/ugoira.py
@@ -155,7 +155,9 @@ class UgoiraPP(PostProcessor):
                 self.log.error("Unable to invoke FFmpeg (%s: %s)",
                                exc.__class__.__name__, exc)
                 pathfmt.realpath = pathfmt.temppath
-            except Exception:
+            except Exception as exc:
+                print()
+                self.log.error("%s: %s", exc.__class__.__name__, exc)
                 pathfmt.realpath = pathfmt.temppath
             else:
                 if self.mtime:
@@ -171,7 +173,7 @@ class UgoiraPP(PostProcessor):
     def _exec(self, args):
         self.log.debug(args)
         out = None if self.output else subprocess.DEVNULL
-        retcode = subprocess.Popen(args, stdout=out, stderr=out).wait()
+        retcode = util.Popen(args, stdout=out, stderr=out).wait()
         if retcode:
             print()
             self.log.error("Non-zero exit status when running %s (%s)",