From: Skullheadx <94652084+Skullheadx@users.noreply.github.com> Date: Mon, 14 Oct 2024 05:07:00 +0000 (-0400) Subject: stuff X-Git-Url: http://git.skullheadx.com/nixos/static/gitweb.js?a=commitdiff_plain;h=bd659cfa83e6ec652f5f1e7cde36e18f1cc9475c;p=youtube-downloader.git stuff --- diff --git a/Diamond is unbreakable - Main Theme.mp4 b/Diamond is unbreakable - Main Theme.mp4 deleted file mode 100644 index e4e8445..0000000 Binary files a/Diamond is unbreakable - Main Theme.mp4 and /dev/null differ diff --git a/ytdl.egg-info/SOURCES.txt b/ytdl.egg-info/SOURCES.txt index 11a7a88..3a3b6f7 100644 --- a/ytdl.egg-info/SOURCES.txt +++ b/ytdl.egg-info/SOURCES.txt @@ -3,9 +3,7 @@ README.md setup.py ytdl/__init__.py ytdl/__main__.py -ytdl/classmodule.py ytdl/funcmodule.py -ytdl/main.py ytdl.egg-info/PKG-INFO ytdl.egg-info/SOURCES.txt ytdl.egg-info/dependency_links.txt diff --git a/ytdl/__pycache__/__init__.cpython-312.pyc b/ytdl/__pycache__/__init__.cpython-312.pyc index fdc5d88..a2889eb 100644 Binary files a/ytdl/__pycache__/__init__.cpython-312.pyc and b/ytdl/__pycache__/__init__.cpython-312.pyc differ diff --git a/ytdl/__pycache__/__main__.cpython-312.pyc b/ytdl/__pycache__/__main__.cpython-312.pyc index d52e7da..446f645 100644 Binary files a/ytdl/__pycache__/__main__.cpython-312.pyc and b/ytdl/__pycache__/__main__.cpython-312.pyc differ diff --git a/ytdl/__pycache__/funcmodule.cpython-312.pyc b/ytdl/__pycache__/funcmodule.cpython-312.pyc index ad1302f..ca8b44a 100644 Binary files a/ytdl/__pycache__/funcmodule.cpython-312.pyc and b/ytdl/__pycache__/funcmodule.cpython-312.pyc differ diff --git a/ytdl/funcmodule.py b/ytdl/funcmodule.py index 124283c..bb45b47 100644 --- a/ytdl/funcmodule.py +++ b/ytdl/funcmodule.py @@ -1,8 +1,9 @@ -from pytubefix import YouTube, Playlist -import requests -import subprocess -import os import glob +import os +import subprocess + +import requests +from pytubefix import YouTube, Playlist def check_playlist(links): @@ -31,40 +32,46 @@ def fix_filename(filename): def get_and_download(link): yt = YouTube(link) - if fix_filename(yt.title) + '.mp4' in glob.glob("*.mp4"): - print(f"{yt.title} is already downloaded") - return - - yt.check_availability() - print(f"Fetching stream for {yt.title}") - - assert len(yt.streams.filter(only_audio=True)) > 0, "No available audio streams" - audio_stream = yt.streams.filter(only_audio=True).order_by("abr").last() - - print(f"Downloading audio stream for {yt.title}") - audio_stream.download(filename=fix_filename(audio_stream.default_filename), skip_existing=True) + # if fix_filename(yt.title) + '.mp4' in glob.glob("*.mp4"): + # print(f"{yt.title} is already downloaded") + # return - # create thumbnail file - data = requests.get(yt.thumbnail_url).content - thumbnail_filename = f'{fix_filename(audio_stream.title)}.jpg' - with open(thumbnail_filename, 'wb') as f: - f.write(data) + # yt.check_availability() + # print(f"Fetching stream for {yt.title}") + # + # assert len(yt.streams.filter(only_audio=True)) > 0, "No available audio streams" + # audio_stream = yt.streams.filter(only_audio=True).order_by("abr").last() - command = [ - 'ffmpeg', - '-i', fix_filename(audio_stream.default_filename), - '-i', thumbnail_filename, - '-map', '0', - '-map', '1', - '-metadata', f'title={fix_filename(audio_stream.title)}', - '-metadata', f'artist={yt.author}', - '-metadata', f'date={yt.publish_date}', - '-metadata', f'comment={big_num_format(yt.views) + " views"}', - fix_filename(audio_stream.title) + ".mp4", - '-n' - ] - subprocess.run(command) - # clean up tmp files - os.remove(thumbnail_filename) - os.remove(fix_filename(audio_stream.default_filename)) + # hierarchy: + caption_hierarchy = ["ko", "ja", "zh", "en", "a.ko", "a.en"] + if len(yt.captions) > 0: + for caption in yt.captions: + print(yt.title, caption.lang_code) + # print(f"Downloading audio stream for {yt.title}") + # audio_stream.download(filename=fix_filename(audio_stream.default_filename), skip_existing=True) + # + # # create thumbnail file + # data = requests.get(yt.thumbnail_url).content + # thumbnail_filename = f'{fix_filename(audio_stream.title)}.jpg' + # with open(thumbnail_filename, 'wb') as f: + # f.write(data) + # + # command = [ + # 'ffmpeg', + # '-i', fix_filename(audio_stream.default_filename), + # '-i', thumbnail_filename, + # '-map', '0', + # '-map', '1', + # '-metadata', f'title={fix_filename(audio_stream.title)}', + # '-metadata', f'artist={yt.author}', + # '-metadata', f'date={yt.publish_date}', + # '-metadata', f'comment={big_num_format(yt.views) + " views"}', + # fix_filename(audio_stream.title) + ".mp4", + # '-y' + # ] + # subprocess.run(command) + # + # # clean up tmp files + # os.remove(thumbnail_filename) + # os.remove(fix_filename(audio_stream.default_filename))