From 6251508a88fd41a43a948e66f73f694ca44d121b Mon Sep 17 00:00:00 2001
From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Mon, 14 Oct 2024 14:41:38 -0400
Subject: [PATCH] abstract the ffmpeg command

---
 README.md                                   |   6 +-
 ytdl/__pycache__/funcmodule.cpython-312.pyc | Bin 7426 -> 7165 bytes
 ytdl/funcmodule.py                          |  94 ++++++--------------
 3 files changed, 30 insertions(+), 70 deletions(-)

diff --git a/README.md b/README.md
index ff1d3c4..4117e44 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,5 @@ downloads the audio and video and stitches it together in the current directory.
 - `-f` - force replace if file exists
 
 # TODO:
-- [x] add video only
-- [x] add audio + video separate
-- [x] add stitched together
-- [x] add force replace
 - [ ] add album name
-- [x] add force replace check for audio and video only
\ No newline at end of file
+- [ ] figure out why -av takes so long compared to -a and -v
\ No newline at end of file
diff --git a/ytdl/__pycache__/funcmodule.cpython-312.pyc b/ytdl/__pycache__/funcmodule.cpython-312.pyc
index 465528fb0122506ee47a790457731db06b157330..1852a604a6d2653655055b823cec7fd62ec731fc 100644
GIT binary patch
delta 1582
zcmZp&`fJX2nwOW0fq{WxLMm^%r|?8R3C4_x>VERvDeNtbQQRp!DI6_~Q9LP}Eeuh-
zDO@cKQGAt*n!Fo(Iyl|gK>DCqoPmLXnSp`f^9Ke7hUp9`j44bt3@J=Cj48}DEVCI>
zm}^*PGo-Mju%@tqSaX?D*i$%CIBS@*7$$!d5ohH{;i_St%qS!wkiwC|UBU`AmZ64u
z@&`7N$^2rRf;?3W3=Fdw<}#&lr0~`-XK_saC?Y0R!<51Yl1SlC7q4Y2;f86<;+b41
zE<8C(oV&h~K~uo*7F$|cZb52#6_aje6^m|eVnG#?Zt^Xb<otrlDt_IR%;JLl;>?oF
z{5-2Nt6MyYB_)Z;8L27p1)0fJoVvNGC5b7CC5csRC7C5TskT+@iA5!u#U-{?9Lf2)
zxv6<2wpDBjWtpkv#Z{~+i6yDFMP>{P3{_0Jm72`#MOKq5_|4Qc*>ACB<`tBd7(!{I
zTWtBIB?YA=MNSM147Zqa4R0~!8cn{%FBNl3Bso8?EVZa4J~1UF9%g+}FaraF0|Ns?
z@k|B=h6aWQ90E5ucskOc1m6Us2`V=@pcF`)OLB(N43P^Qatruwa0pK*n~^j>W9H-#
zK^H5&31Xf6H#m4cNb~WtHMoC~V_@ZP_iOZ<V1AWFx=4V5fgza%7M2VQ44}9M$FCLh
z<oALmo8!3xn0QJUVJcDtCjS>ywGxH#YglWTY8Y!6RzuBTWI$3YxEiXDk)Z^XZa|tQ
z@rq8?7w6?b<{#zdXB3)zmG_3>FJZ@&l+3(z1z12Rl;kV?k_bx8%`XE9m!#$v<QF9t
zRVt)q=A;&{<ejX~?;`*Xty@g_#YLP93=EoVlXvpVs-%NL59AvKFeu_<U|=Y+gAt(c
zEzaD`BB07>@Pvi)0+0LxrsW(9Ic8K{;L^InqJ4)&;)0~+1#R0M6(@wQu=s$~aH(8j
zQN6>$HhH(8CN~ExA4IThelNHIC5-qc{})uLuVGH%&(>gIC{juhs9{TEN)fDKPh(1B
za$$%SV_=A3VqmD{sO2m{1SKapC^<lh963OHBv=^ov}%}Bgute$BI#hOVXt9K5r*hU
zVM!5LBf1*oWd;TYMkfX&g^Vd;U`4p&N}R~JibRb&`5JbFMz|YgkfS>s=EM{UkQ)%n
zD;X*oG$sA2MBP$Lk~2WjTU=6<nwVRxkd|Mh5K<HhiYz7&5e_0EKtv>nhz1cclh26T
zvBiRz@sqhF)J-fwS&O+Ox1dM}lnR)N0zh(spxnt`l3SpcTVPU@01^Ua*rG&`8m`GJ
zB{DfPK`8}PHcnQQlw{8W@mQHQJ4)&>ih`mYJ!#ySoF}D_aEC`>f!GC2>m3m%*e=@o
zT?h!e$`kyNnL)mk@c}3A1d%S8I~+0>WQ{MFdY_265D|OPH}*n&;)S&I3pu%0Ir8ps
z$jpdX!Ff^E@Pe`Hfr<-(!B;p!K(@gXnW~JU`xO?|8|>U2B~3MVIJo*bJ2@w4%m}?G
zq_iOHqLB7g4xJCo3>+fhJgmv+rpW~Mco8VXH2I6HL0-)O5#E#IWy~3aCr^@5;VK3t
f4Ui9QCm)b86!~l<z$o)cO@vY5vz|1gF4!ml&4zrO

delta 1791
zcmexs-ekphnwOW0fq{X+H<35pS$ra&1Y^QPbw6>g6!sRzDDD)F7KSLE6wVfgDBem&
zP410TIyl8xK<c4boPmLXnSp`f^Rmrfd0LrtQUp>2YgkhRYnW1mQiM~4QbbZjQ^Zol
zQzTL(Q>1DbXEV%YN|8*Fu3^X$ncT=F&L^27QvxysY+lV|egV<R32YofDY8`z3=B}!
zay1NDQj;6G#H4B%Q{+JsDGKT0wQMD_U|kFh3|VrM4aMcT72$lP$sa|9C;#T>K^Nm^
zUCjtl#mG>}ps6_7MBqmKEw;3@+=A5fUrf50zgTp06ANxJ8s1_w_{F4~e2XPHzo7D$
zfNn}=aY24@W=Up#o>iHZ!7ZM|l9I&ajMS9)g3RP!oVvNGC5b7CC5gY-N-|4wQf+^+
zCl-}t7MIxm;z-WV%}vcKvHiuSP?nimUi^zSC9x#cw#bZuf#DaEE_3Bdp~<#_K9g5)
z8*|@c$}cYBWME*>WS=}!P*ymVfq~%`JII8@yp&>g1_lO&$@>LG*&G-c7>ZACz9p#2
zsQrPBfm84X2hRmQIWVbkgM)7ZGnC-zNV~xyHN)=)hwy~58Ivn`T-XFAm|f(MoP3Z+
zl;aAE^cOY;R`$vI!kXL?u-II{I{6!q$>!<8HB3P@%qe`?8Vn3Y)hYZnY-vm>0yXSu
zOleFm46*qP3^7a$47D7!oGF4SLN%NzLN!b&!YLvt!pPB{A`OjrsT3J_#7m{fVvTq?
zQ2c@;UMfW%7V!!-j5Qn}i4+AeshBQa%Y_pCA4P@Txe!s?Q^>-Qx3h*hMG5TmEnw%d
zr3lrqgPjI)A}CcVgHk0`oR^{kb{HP#c_TRw>>NfEJ&=$S1&1EgX*G;+@A6}MR~*T_
z610@BjAAw-SkTpB<PgkUBr-W)oQtKBK~r_|esL*zR|W=#A|?>w4kA22geQpb1`$4!
ze~8;L`cAfyP_Op~2?T(MKoAiGB7#9g2#5#;5n&)A97IHbh)56-1tOwBL=1?C1reZp
zQWOVbSu!v%RH5fZ!&}THxdlb>piIME<OEWu$}oApM52BUh@A_{DcqopqW}j*d>|Qn
z7y-&;#ca%*H6?Wz86Ql}l2WLDARuu=Kx9JN4FQo0Vj4FD#AYx<39z8j0>2vq(lg2y
zWGslfAZq|(moF$<Ub(PxLG}e%BM`r04c~^M?G+m<E^9a(u(+t<eL>ylf~+q{s&qln
z^7w`E7gS6y$eP^{keFe1Q9yBl+eHDb8v-I9r1`}8>O0)O$T9GW_xpAF%`m^pqx?~k
zLB5pngAxN5-vp5^nFl-~H+Tdt2x-7bp$X16c)*0f1hpGHatruw@QBYaTcEK(>Vl*W
zh;6>WXu0J=%LUpOB=taiizR*=jJ8{Bw79Hdv!mjoiu(m+j|-BXASu%Y^+L<#7s_8y
zFuWjXbc07^Lg_^wnHgmlc~o!k2z-#{6Xxn*|02i0DcsN3$v2_=3Wxj$HU?hN8$1FN
zG-iZe6jE9cc2P(h>^2psvrye8BsC-KqL4DkG+{2VX=2ExJ(1$z>gVj_L^kaThYqBu
zdL^YOd6h-ANB|V!jBc8IMb@B*%mxvelY^wqC-+G!aFsJKFo25sVynqJqzwf>87VO;
OeD-2=VPsST>jVIUJ<Nar

diff --git a/ytdl/funcmodule.py b/ytdl/funcmodule.py
index 155396e..acd2018 100644
--- a/ytdl/funcmodule.py
+++ b/ytdl/funcmodule.py
@@ -61,6 +61,25 @@ def download(link, mode, force=False):
         download_double_stream(yt, filename, thumbnail_filename, mode)
 
 
+def convert_add_metadata(input1, input2, output, yt, m1=1, m2=0):
+    command = [
+        'ffmpeg',
+        '-i', input1,
+        '-i', input2,
+        '-map', f'{m1}',
+        '-map', f'{m2}',
+        '-c', 'copy',
+        f'-disposition:v:{m2}', 'attached_pic',
+        '-metadata', f'title={yt.title}',
+        '-metadata', f'artist={yt.author}',
+        '-metadata', f'comment={big_num_format(yt.views) + " views"}',
+        '-metadata', f'date={yt.publish_date}',
+        output + ".mp4",
+        '-y'
+    ]
+    subprocess.run(command)
+
+
 def download_single_stream(yt, filename, thumbnail_filename, mode):
     print(f"Fetching stream for {yt.title}")
     stream = None
@@ -76,24 +95,10 @@ def download_single_stream(yt, filename, thumbnail_filename, mode):
     default_filename = "default " + fix_filename(stream.default_filename)
     stream.download(filename=default_filename, skip_existing=True)
 
-    command = [
-        'ffmpeg',
-        '-i', default_filename,
-        '-i', thumbnail_filename,
-        '-map', '1',
-        '-map', '0',
-        '-c', 'copy',
-        '-disposition:v:0', '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 + ".mp4",
-        '-y'
-    ]
-    subprocess.run(command)
+    print(f"Adding metadata to {yt.title}")
+    convert_add_metadata(default_filename, thumbnail_filename, filename, yt)
 
-    # clean up tmp files
+    print("Removing temporary files")
     os.remove(thumbnail_filename)
     os.remove(default_filename)
 
@@ -112,58 +117,17 @@ def download_double_stream(yt, filename, thumbnail_filename, mode):
     audio_stream.download(filename=audio_default_filename, skip_existing=True)
     video_stream.download(filename=video_default_filename, skip_existing=True)
 
+    print(f"Adding metadata to {yt.title}")
     if mode == '-av':
         for suffix, stream in [(" (audio only)", audio_default_filename), (" (video only)", video_default_filename)]:
-            command = [
-                'ffmpeg',
-                '-i', stream,
-                '-i', thumbnail_filename,
-                '-map', '1',
-                '-map', '0',
-                '-c', 'copy',
-                '-disposition:v:0', '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 + suffix + ".mp4",
-                '-y'
-            ]
-            subprocess.run(command)
+            convert_add_metadata(stream, thumbnail_filename, filename + suffix, yt)
     elif mode == '-d':
-        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)
+        convert_add_metadata(audio_default_filename, video_default_filename, filename + "tmp", yt, m1=0, m2=1)
+        convert_add_metadata(filename + "tmp.mp4", thumbnail_filename, filename, yt)
 
-        os.remove(filename + "tmp" + ".mp4")
-
-    # clean up tmp files
+    print("Removing temporary files")
     os.remove(thumbnail_filename)
     os.remove(audio_default_filename)
     os.remove(video_default_filename)
+    if mode == '-d':
+        os.remove(filename + "tmp" + ".mp4")
-- 
2.54.0