Skip to content

Commit

Permalink
- Updates for youtube-dl
Browse files Browse the repository at this point in the history
* Added msvcr100.dll to the download, as to be fully portable youtube-dl.exe needs this installed in the system or along side it
* Fixed the youtube-dl auto path check
  • Loading branch information
jessielw committed Oct 20, 2020
1 parent 020cee2 commit 6248746
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions FFMPEGAudioEncoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -4951,6 +4951,7 @@ def downloadfiles():
download_window_text.configure(text="Youtube-DL...")
try:
urlretrieve(youtubedl_url, 'Apps/youtube-dl/youtube-dl.exe') # Direct downloads youtube-dl.exe from website
urlretrieve(msvcr100dll_url, 'Apps/youtube-dl/msvcr100.dll')
app_progress_bar['value'] += 12
download_window_text2.configure(text='Done!')
sleep(1)
Expand Down Expand Up @@ -4991,10 +4992,10 @@ def downloadfiles():
fdkaac_path = pathlib.Path("Apps/fdkaac/fdkaac.exe")
qaac_path = pathlib.Path("Apps/qaac/qaac64.exe")
mpv_player_path = pathlib.Path("Apps/mpv/mpv.exe")
if shutil.which('youtube-dl') != None:
youtubedl_path = pathlib.Path(shutil.which('youtube-dl'))
elif shutil.which('youtube-dl') == None:
youtubedl_path = pathlib.Path("Apps/FFMPEG/youtube-dl.exe")
if shutil.which("youtube-dl") != None:
youtubedl_path = pathlib.Path(shutil.which("youtube-dl"))
elif shutil.which("youtube-dl") == None:
youtubedl_path = pathlib.Path("Apps/youtube-dl/youtube-dl.exe")

if ffmpeg_path.exists() and mediainfo_path.exists() and mediainfocli_path.exists() and fdkaac_path.exists() and \
qaac_path.exists() and mpv_player_path.exists() and youtubedl_path.exists():
Expand Down

0 comments on commit 6248746

Please sign in to comment.