diff --git a/.gitignore b/.gitignore index 3c3c1d8..3825cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,7 @@ # Explicitly allow example files !/linklist-example.yaml !/once-example.yaml + +# Disallow swapfiles +*.swp + diff --git a/download-music.py b/download-music.py index 4a88864..36025c9 100644 --- a/download-music.py +++ b/download-music.py @@ -6,11 +6,11 @@ with open("linklist-music.yaml", "r") as yamlfile: config = yaml.safe_load(yamlfile) for entry in config: - print(f"\033[92mGrabbing '{entry['url']}':") + print(f"\033[92mGrabbing '{entry['url']}':\033[0m") - folderName = entry["folder-name"] if "folder-name" in entry else "%(uploader)s" - + folderName = entry["folder-name"] if "folder-name" in entry else "%(uploader)s" os.system(f""" + yt-dlp -c --extract-audio @@ -24,7 +24,6 @@ with open("linklist-music.yaml", "r") as yamlfile: '{entry['url']}' """.replace('\n', " ") ) - except yaml.YAMLError as exc: print("You fucked up the yaml format.") diff --git a/download-once.py b/download-once.py index 9c04c90..7ba322a 100644 --- a/download-once.py +++ b/download-once.py @@ -7,9 +7,9 @@ with open("once.yaml", "r") as yamlfile: config = yaml.safe_load(yamlfile) for entry in config: - print(f"\033[92mGrabbing {entry['type']} '{entry['url']}':") - + print(f"\033[92mGrabbing {entry['type']} '{entry['url']}':\033[1m") if entry["type"] == "music": + os.system(f""" yt-dlp -c @@ -23,7 +23,7 @@ with open("once.yaml", "r") as yamlfile: '{entry['url']}' """.replace('\n', " ") ) - + elif entry["type"] == "video" or entry["type"] == "videos": os.system(f""" yt-dlp @@ -40,3 +40,4 @@ with open("once.yaml", "r") as yamlfile: except yaml.YAMLError as exc: print("You fucked up the yaml format.") + diff --git a/download-videos.py b/download-videos.py index 6265c10..607781b 100644 --- a/download-videos.py +++ b/download-videos.py @@ -6,10 +6,10 @@ with open("linklist-videos.yaml", "r") as yamlfile: config = yaml.safe_load(yamlfile) for entry in config: - print(f"\033[92mGrabbing '{entry['url']}':") + print(f"\033[92mGrabbing '{entry['url']}':\033[0m") + + folderName = entry["folder-name"] if "folder-name" in entry else "%(uploader)s" - folderName = entry["folder-name"] if "folder-name" in entry else "%(uploader)s" - os.system(f""" yt-dlp -c @@ -22,7 +22,6 @@ with open("linklist-videos.yaml", "r") as yamlfile: '{entry['url']}' """.replace('\n', " ") ) - except yaml.YAMLError as exc: print("You fucked up the yaml format.")