moved from youtube-dl to youtube-dlc

Author: kasper9n

README.md

@@ -3,7 +3,7 @@
 </p>
 
 # vidl
-vidl is a script designed to easily download video/audio from anywere, using youtube-dl. It automatically embeds thumbnails to mp3/mp4/m4a files.
+vidl is a script designed to easily download video/audio from anywere, using youtube-dlc. It automatically embeds thumbnails to mp3/mp4/m4a files.
 
 vidl will add metadata to mp3 files if it's found. The `--no-md` option turns this off.
 `title`, `artist` and `year` metadata is added, but if the URL is a playlist, it also adds `album`, `album artist`, `track number`, `track count`.
@@ -18,7 +18,7 @@ If you're on macOS, I recommend [setting up shortcuts for vidl](#macos-shortcut-
 
 # Updating
 vidl is updated by running `pip3 install vidl --upgrade --upgrade-strategy eager`.
-If vidl is unable to download a URL, it might be because youtube-dl is outdated. The `--upgrade-strategy eager` part updates youtube-dl.
+If vidl is unable to download a URL, it might be because youtube-dlc is outdated. The `--upgrade-strategy eager` part updates youtube-dlc.
 
 # Uninstall
 Run `pip3 uninstall vidl`.

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vidl"
-version = "3.5.1"
+version = "3.5.0"
 description = "Downloads video/audio from anywhere, adding thumbnails and mp3 metadata if applicable"
 authors = ["kasper.space"]
 readme = "README.md"
@@ -9,7 +9,7 @@ keywords = ['youtube', 'download', 'video', 'audio', 'music']
 
 [tool.poetry.dependencies]
 python = "^3.5"
-youtube-dl = ">2020"
+youtube-dlc = ">2020"
 colorama = "^0.3.9"
 colorboy = "^1.0.1"
 mutagen = "^1.42"

pyproject.toml

@@ -15,9 +15,9 @@ def user_md_parser(smart_md, md, video_info, url_info):
   #   Same as "md", except this will never include smart metadata (artist/title
   #   parsed from title).
   # video_info:
-  #   Object containing metadata from youtube-dl about the current video.
+  #   Object containing metadata from youtube-dlc about the current video.
   # playlist_info:
-  #   An object containing playlist metadata from youtube-dl.
+  #   An object containing playlist metadata from youtube-dlc.
   #   If the URL isn't a playlist, playlist_info is the same as video_info.
   #   If the URL is a playlist, it has an "entries" property with video_info objects.
   # callback: Callback function. Takes a metadata object as argument.

vidl/default_user_md_parser.py

@@ -1,6 +1,6 @@
 import sys, os, copy, logging
 from urllib.parse import urlparse
-import youtube_dl
+import youtube_dlc
 from colorboy import cyan, green, red
 from deep_filter import deep_filter
 from shlex import quote
@@ -68,12 +68,12 @@ def download(options):
         'outtmpl': ytdl_output_template,
         'quiet': False if options['verbose'] else True,
     }
-    with youtube_dl.YoutubeDL(ytdl_get_info_options) as ytdl:
+    with youtube_dlc.YoutubeDL(ytdl_get_info_options) as ytdl:
         try:
             info_result = ytdl.extract_info(options['url'], download=False)
         except Exception as err:
             if options['verbose']: logging.exception(err)
-            log.fatal('youtube-dl failed to get URL info')
+            log.fatal('youtube-dlc failed to get URL info')
         if options['verbose']: log.pretty(info_result)
 
     # delete None properties/indexes
@@ -127,8 +127,8 @@ def callback(value):
         filename_split[len(filename_split)-1] = options['file_format']
         filename = '.'.join(filename_split)
         if options['verbose']:
-            # print youtube-dl command:
-            command = green('youtube-dl command: ')+'youtube-dl '
+            # print youtube-dlc command:
+            command = green('youtube-dlc command: ')+'youtube-dlc '
             for arg in ytdl_args+[video['webpage_url']]:
                 command += quote(arg)+' '
             log(command)
@@ -138,7 +138,7 @@ def callback(value):
 
         # download
         try:
-            youtube_dl.main(ytdl_args+[video['webpage_url']])
+            youtube_dlc.main(ytdl_args+[video['webpage_url']])
         except (Exception, SystemExit) as err:
             if type(err) == SystemExit and err.code == 0:
                 # don't treat sys.exit(0) as error