From 6fd1d7aadec20c07da9bc1cea959f10c1f9e76fe Mon Sep 17 00:00:00 2001
From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Mon, 14 Oct 2024 14:13:21 -0400
Subject: [PATCH] -d works

---
 README.md                                   |   3 +-
 ytdl/__pycache__/funcmodule.cpython-312.pyc | Bin 6579 -> 7202 bytes
 ytdl/funcmodule.py                          |  38 +++++++++++++++++---
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d94755b..60e0dc8 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ downloads the audio and video and stitches it together in the current directory.
 # TODO:
 - [x] add video only
 - [x] add audio + video separate
-- [ ] add stitched together
+- [x] add stitched together
 - [x] add force replace
 - [ ] add album name
+- [ ] add force replace check for audio and video only
\ No newline at end of file
diff --git a/ytdl/__pycache__/funcmodule.cpython-312.pyc b/ytdl/__pycache__/funcmodule.cpython-312.pyc
index d4a204210f42dc90979a8808ab074e056acb1c42..f626c540c08a40ca5875a81d5178bb0b3c1d4285 100644
GIT binary patch
delta 502
zcmdmNyvTy@G%qg~0|NttbUbgmoY+Rb9~|tu_6J0+a=0z#<>X*mz`B`Va6Pl~&Kl+v
zrECobhN3Mgf+<2ZY$-xD>?y)2qA9{DA}L}i;wj3L{|YxSrKn7<7qKz|t6@x0sbXMY
zNKpWjLN!dN>Qf|Z7@=~C>HL#>MRX<~=aJ_{(KUH5kLKh(JX(`QL@gLqC;N*25U&!@
zP01`S$S=+;$;{8QDzh@Y#axnGFxgdXE)yH`<|ksW8S5YLh}_^2xFDnfBZVe7-{1ig
z0u$73@W?ITyTKzq!)$@Z0;vm<Iv}?B0;A=Y3oRFDUy#%T@hz74Z7|wyvC-nPip`FS
ziz@CHlszs;dV-`(7YHqvUnqY;!SI5l(G4Dv38fc#WM-6I<WarBBk)0*Pq?0|gZ+yf
z1E+95Unk#$@+%zjAJ`apMQ`v3OwgDSdQnJeLD)qhZLr%^pw2>dn~>Cuu!};<AmfC&
zgh8f>A)EGugR7sjlM~snD;zps*ce#Z+dUgSFHF88(Zf~Fz`(%Bz`#&!HMvOAlGBBe
LQLRXTfq?-40T!DO

delta 112
zcmZ2vvDujKG%qg~0|Ns?M+|SepU_6W9~|sDb_ZCla=0$$<>X+pV%f|uxSpAZt%f;8
zDO-bqp@@-lvVm9=qw?g<Vm~Gy5}(T?%CtFA;x!}d4Gx|!9Fv`-r*M@qFfcGOFfbHb
SPJSS5$)V1uRwTf{zyJV*Jsg4n

diff --git a/ytdl/funcmodule.py b/ytdl/funcmodule.py
index 9e68365..56c08e4 100644
--- a/ytdl/funcmodule.py
+++ b/ytdl/funcmodule.py
@@ -48,7 +48,7 @@ def download(link, mode, force=False):
     download_thumbnail(yt.thumbnail_url, thumbnail_filename)
 
     if mode == '-a' or mode == '-v':
-        download_single_stream(yt, filename,thumbnail_filename, mode)
+        download_single_stream(yt, filename, thumbnail_filename, mode)
     elif mode == '-av' or mode == '-d':
         download_double_stream(yt, filename, thumbnail_filename, mode)
 
@@ -90,7 +90,7 @@ def download_single_stream(yt, filename, thumbnail_filename, mode):
     os.remove(default_filename)
 
 
-def download_double_stream(yt, filename,thumbnail_filename, mode):
+def download_double_stream(yt, filename, thumbnail_filename, mode):
     print(f"Fetching streams 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()
@@ -123,11 +123,39 @@ def download_double_stream(yt, filename,thumbnail_filename, mode):
             ]
             subprocess.run(command)
     elif mode == '-d':
-        pass
-
+        command = [
+            'ffmpeg',
+            '-i', audio_default_filename,
+            '-i', video_default_filename,
+            '-map', '0',
+            '-map', '1',
+            '-c', 'copy',
+            '-disposition:v:1', 'attached_pic',
+            '-metadata', f'title={filename}',
+            '-metadata', f'artist={yt.author}',
+            '-metadata', f'comment={big_num_format(yt.views) + " views"}',
+            '-metadata', f'date={yt.publish_date}',
+            filename + "tmp" + ".mp4",
+            '-y'
+        ]
+        subprocess.run(command)
+
+        command = [
+            'ffmpeg',
+            '-i', filename + "tmp" + ".mp4",
+            '-i', thumbnail_filename,
+            '-map', '0',
+            '-map', '1',
+            '-c', 'copy',
+            '-disposition:v:1', 'attached_pic',
+                  filename + ".mp4",
+            '-y'
+        ]
+        subprocess.run(command)
+
+        os.remove(filename + "tmp" + ".mp4")
 
     # clean up tmp files
     os.remove(thumbnail_filename)
     os.remove(audio_default_filename)
     os.remove(video_default_filename)
-
-- 
2.54.0