From ceb544b7c6a9d5f1e134a177f804b8ecf8f889b1 Mon Sep 17 00:00:00 2001
From: Eric Torres <erictorres4@protonmail.com>
Date: Mon, 22 Oct 2018 10:45:11 -0700
Subject: [PATCH] Fixed NoneType bug and code cleanup

---
 dlaudio.py | 84 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/dlaudio.py b/dlaudio.py
index 1ae26b2..9c638c7 100755
--- a/dlaudio.py
+++ b/dlaudio.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 """Download audio using youtube-dl, passing
    a specific set of options specified by the user.
+
 =====
 Usage
 =====
@@ -11,50 +12,51 @@ import argparse
 import pathlib
 import subprocess
 
-parser = argparse.ArgumentParser()
-parser.add_argument('-b', '--batch-dl',
-                    dest='batchfile',
-                    type=str,
-                    help='provide the links from a text file')
-parser.add_argument('-f', '--format',
-                    type=str,
-                    default='opus',
-                    help='the format to use')
-parser.add_argument('-n', '--filename',
-                    type=str,
-                    help='the name of the downloaded file (without extension)')
-parser.add_argument('urls',
-                    nargs='*',
-                    help='video URLs')
-args = parser.parse_args()
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-b', '--batch-dl',
+                        dest='batchfile',
+                        type=str,
+                        help='provide the links from a text file')
+    parser.add_argument('-f', '--format',
+                        type=str,
+                        default='opus',
+                        help='the format to use')
+    parser.add_argument('-n', '--filename',
+                        type=str,
+                        help='the name of the downloaded file (without extension)')
+    parser.add_argument('urls',
+                        nargs='*',
+                        help='video URLs')
+    args = parser.parse_args()
 
-default_filename = f"{pathlib.Path.home()}/Music/%(title)s.%(ext)s"
+    default_filename = f"{pathlib.Path.home()}/Music/%(title)s.%(ext)s"
 
-dl_opts = []
-dl_opts.append('--no-part')
-dl_opts.append('--no-continue')
-dl_opts.append('--extract-audio')
-dl_opts.append(f"--audio-format={args.format}")
+    dl_opts = []
+    dl_opts.append('--no-part')
+    dl_opts.append('--no-continue')
+    dl_opts.append('--extract-audio')
+    dl_opts.append(f"--audio-format={args.format}")
 
-dl_opts.append(f"--output={args.filename}")
+    dl_opts.append(f"--output={args.filename}")
 
-# filename handling
-# -b and -n should not be used together
-if args.filename and args.batchfile:
-    print('Ignoring --batch-dl and --filename')
-    dl_opts.append(f"--output={default_filename}")
-elif args.filename:
-    dl_opts.append(f"--output={pathlib.Path.home()}/Music/{args.filename}.%(ext)s")
-else:
-    dl_opts.append(f"--output={default_filename}")
+    # filename handling
+    # -b and -n should not be used together
+    if args.filename and args.batchfile:
+        print('Ignoring --batch-dl and --filename')
+        dl_opts.append(f"--output={default_filename}")
+    elif args.filename:
+        dl_opts.append(f"--output={pathlib.Path.home()}/Music/{args.filename}.%(ext)s")
+    else:
+        dl_opts.append(f"--output={default_filename}")
 
-# URL handling
-if args.batchfile:
-    dl_opts.append(f"--batch-file={args.batchfile}")
-elif len(args.urls) == 0:
-    print("URLs are required")
-    exit(2)
-else:
-    dl_opts += args.urls
+    # URL handling
+    if args.batchfile:
+        dl_opts.append(f"--batch-file={args.batchfile}")
+    elif len(args.urls) == 0:
+        print("URLs are required")
+        exit(2)
+    else:
+        dl_opts.extend(args.urls)
 
-dl = subprocess.run(['youtube-dl'].extend(dl_opts))
+    dl = subprocess.run(['youtube-dl'] + dl_opts)