From c09a9f00dd83017d486cd77650347bc2a397ad55 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sun, 8 Sep 2019 19:44:00 -0400 Subject: New upstream version 1.10.4 --- gallery_dl/postprocessor/ugoira.py | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'gallery_dl/postprocessor') diff --git a/gallery_dl/postprocessor/ugoira.py b/gallery_dl/postprocessor/ugoira.py index 0dbb796..162eb9e 100644 --- a/gallery_dl/postprocessor/ugoira.py +++ b/gallery_dl/postprocessor/ugoira.py @@ -103,20 +103,26 @@ class UgoiraPP(PostProcessor): # invoke ffmpeg pathfmt.set_extension(self.extension) - if self.twopass: - if "-f" not in args: - args += ["-f", self.extension] - args += ["-passlogfile", tempdir + "/ffmpeg2pass", "-pass"] - self._exec(args + ["1", "-y", os.devnull]) - self._exec(args + ["2", pathfmt.realpath]) + try: + if self.twopass: + if "-f" not in args: + args += ["-f", self.extension] + args += ["-passlogfile", tempdir + "/ffmpeg2pass", "-pass"] + self._exec(args + ["1", "-y", os.devnull]) + self._exec(args + ["2", pathfmt.realpath]) + else: + args.append(pathfmt.realpath) + self._exec(args) + except OSError as exc: + print() + self.log.error("Unable to invoke FFmpeg (%s: %s)", + exc.__class__.__name__, exc) + pathfmt.realpath = pathfmt.temppath else: - args.append(pathfmt.realpath) - self._exec(args) - - if self.delete: - pathfmt.delete = True - else: - pathfmt.set_extension("zip") + if self.delete: + pathfmt.delete = True + else: + pathfmt.set_extension("zip") def _exec(self, args): out = None if self.output else subprocess.DEVNULL -- cgit v1.2.3