aboutsummaryrefslogtreecommitdiffstats
path: root/gallery_dl/postprocessor/exec.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2019-11-10 22:14:10 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2019-11-10 22:14:10 -0500
commit3f168e82fc6b60ff8878a7539ad49aa2336025cc (patch)
tree08a09e527edf46f238e816aa316144bd7ef5c246 /gallery_dl/postprocessor/exec.py
parent82eae732c8dec3e14cfae90fe34987f9a3aa984d (diff)
parent0c73e982fa596da07f23b377621ab894a9e64884 (diff)
Update upstream source from tag 'upstream/1.11.1'
Update to upstream version '1.11.1' with Debian dir f73a42d5b98e3bf9f053d0329cbfe78bf5248d2e
Diffstat (limited to 'gallery_dl/postprocessor/exec.py')
-rw-r--r--gallery_dl/postprocessor/exec.py22
1 files changed, 19 insertions, 3 deletions
diff --git a/gallery_dl/postprocessor/exec.py b/gallery_dl/postprocessor/exec.py
index 19a9b87..0a56281 100644
--- a/gallery_dl/postprocessor/exec.py
+++ b/gallery_dl/postprocessor/exec.py
@@ -26,17 +26,26 @@ class ExecPP(PostProcessor):
def __init__(self, pathfmt, options):
PostProcessor.__init__(self)
args = options["command"]
+ final = options.get("final", False)
if isinstance(args, str):
+ if final:
+ self._format = self._format_args_directory
+ else:
+ self._format = self._format_args_path
if "{}" not in args:
args += " {}"
self.args = args
self.shell = True
- self._format = self._format_args_string
else:
+ self._format = self._format_args_list
self.args = [util.Formatter(arg) for arg in args]
self.shell = False
- self._format = self._format_args_list
+
+ if final:
+ self.run_after = PostProcessor.run_after
+ else:
+ self.run_final = PostProcessor.run_final
if options.get("async", False):
self._exec = self._exec_async
@@ -44,9 +53,16 @@ class ExecPP(PostProcessor):
def run_after(self, pathfmt):
self._exec(self._format(pathfmt))
- def _format_args_string(self, pathfmt):
+ def run_final(self, pathfmt, status):
+ if status == 0:
+ self._exec(self._format(pathfmt))
+
+ def _format_args_path(self, pathfmt):
return self.args.replace("{}", quote(pathfmt.realpath))
+ def _format_args_directory(self, pathfmt):
+ return self.args.replace("{}", quote(pathfmt.realdirectory))
+
def _format_args_list(self, pathfmt):
kwdict = pathfmt.kwdict
kwdict["_directory"] = pathfmt.realdirectory