New upstream version 1.20.0.upstream/1.20.0

1 files changed, 23 insertions, 13 deletions

diff --git a/gallery_dl/__init__.py b/gallery_dl/__init__.py
index 2cad029..ad8286e 100644
--- a/gallery_dl/__init__.py
+++ b/gallery_dl/__init__.py
@@ -115,6 +115,13 @@ def main():
             config.load(args.cfgfiles, strict=True)
         if args.yamlfiles:
             config.load(args.yamlfiles, strict=True, fmt="yaml")
+        if args.filename:
+            if args.filename == "/O":
+                args.filename = "{filename}.{extension}"
+            config.set((), "filename", args.filename)
+        if args.directory:
+            config.set((), "base-directory", args.directory)
+            config.set((), "directory", ())
         if args.postprocessors:
             config.set((), "postprocessors", args.postprocessors)
         if args.abort:
@@ -142,20 +149,23 @@ def main():
             import os.path
             import requests
 
-            head = ""
-            try:
-                out, err = subprocess.Popen(
-                    ("git", "rev-parse", "--short", "HEAD"),
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE,
-                    cwd=os.path.dirname(os.path.abspath(__file__)),
-                ).communicate()
-                if out and not err:
-                    head = " - Git HEAD: " + out.decode().rstrip()
-            except (OSError, subprocess.SubprocessError):
-                pass
+            extra = ""
+            if getattr(sys, "frozen", False):
+                extra = " - Executable"
+            else:
+                try:
+                    out, err = subprocess.Popen(
+                        ("git", "rev-parse", "--short", "HEAD"),
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        cwd=os.path.dirname(os.path.abspath(__file__)),
+                    ).communicate()
+                    if out and not err:
+                        extra = " - Git HEAD: " + out.decode().rstrip()
+                except (OSError, subprocess.SubprocessError):
+                    pass
 
-            log.debug("Version %s%s", __version__, head)
+            log.debug("Version %s%s", __version__, extra)
             log.debug("Python %s - %s",
                       platform.python_version(), platform.platform())
             try: