From 2eff24d67b5d644b3a7dc0d720b86f9bdd62b2a7 Mon Sep 17 00:00:00 2001 From: Mike Nolan Date: Sun, 28 Dec 2025 13:28:50 -0600 Subject: [PATCH] Fix downloader bug, use plink and add icon to plugin template --- .../.crossarchiveignore | 2 +- .../cross.json | 6 ++++-- .../res/icon.png | Bin 0 -> 1317 bytes .../components/personallistdescription.tcross | 12 +----------- .../src/pages/video/info.tcross | 2 +- Tesses.YouTubeDownloader/src/data.tcross | 0 .../src/videodownload/audioonlydownload.tcross | 2 ++ .../src/videodownload/noconvertdownload.tcross | 4 ++++ .../src/videodownload/sdvideodownload.tcross | 2 ++ .../src/videodownload/transcodeaudio.tcross | 3 ++- .../src/videodownload/transcodevideo.tcross | 2 +- .../src/videodownload/videoonlydownload.tcross | 3 +++ 12 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 Tesses.YouTubeDownloader.PluginTemplate/res/icon.png delete mode 100644 Tesses.YouTubeDownloader/src/data.tcross diff --git a/Tesses.YouTubeDownloader.PluginTemplate/.crossarchiveignore b/Tesses.YouTubeDownloader.PluginTemplate/.crossarchiveignore index 1746e32..8d4a6c0 100644 --- a/Tesses.YouTubeDownloader.PluginTemplate/.crossarchiveignore +++ b/Tesses.YouTubeDownloader.PluginTemplate/.crossarchiveignore @@ -1,2 +1,2 @@ bin -obj +obj \ No newline at end of file diff --git a/Tesses.YouTubeDownloader.PluginTemplate/cross.json b/Tesses.YouTubeDownloader.PluginTemplate/cross.json index f724b92..1430446 100644 --- a/Tesses.YouTubeDownloader.PluginTemplate/cross.json +++ b/Tesses.YouTubeDownloader.PluginTemplate/cross.json @@ -24,8 +24,10 @@ }, "template_project_dependencies": [ ], - "type": "template" + "type": "template", + "template_icon": "icon.png" }, "name": "Tesses.YouTubeDownloader.PluginTemplate", - "version": "1.0.0.0-prod" + "version": "1.0.0.0-prod", + "icon": "icon.png" } \ No newline at end of file diff --git a/Tesses.YouTubeDownloader.PluginTemplate/res/icon.png b/Tesses.YouTubeDownloader.PluginTemplate/res/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..10c5aac6facc8ef2f97593b855984e5ae526a3b5 GIT binary patch literal 1317 zcmah|YdF&j82@igqLd?XR1{-mE`@C+#(Flj#G#y(VnfsvCOb|pZK8|2a;qFu8Z%6t z^o*gl)xmUgc}iHhb+BofVRB8**7<(U?|I($cX{3q?}ztI_whccqrFud0015QA?#5V zUsl(;wW{8X4t}j7t>{DkR28cM0z(Gl@Sh7{wM-WL z7-phIyOsr)zv^qyg>p*?HC5XJ$(H+*3_Ps5vpL!)>-s`qZU{U)%_=1`BU0m(SxRdZ z7S-fyRVS0~Q?`%mI>erdQMf9VF8#N)sAnfvIueNzsifl~?%y5$yURwM1K)OkMHI}@ z`Lsy?nWiHd`V!ok&NPO~lF7 z^U(Y2SM)?XI<5`eINaxG5|;FlR&U3-aH5^CJeQ{v_~N|TG1F$zac*2Hq)4vyxSW?6 zX4|?P5!f^0yAn=}n}<3sVG}aVaGGVF&aqFB%PRpljrb*Y=V60qzdRL%-MxbvT)~$> z%@hem{jWf~i`2G|))cq3Uk2JOhl{(D`>h>j^IvohuH_{FZ^}$_F$%gx4*hG}MxtUB8~Nb}6n#Ch<&BH6$l zkN1uWfrW^eYsuG%T$GciLUaMJJFxDuunO`_ORWIV6si!| zi&3kc!1oG0!19NJJR9-@4?|QLCM;RB0G^>gDwhphvNTBT!(qj6~H#o8(P3 zhPxw92)&2QJ`E3y0s0)UPu9HHIq?YeqfK_ORnAM12S6}=2?P+bbHba^KK$ORIRpfq zm4j^bGJd`0^o0mW(3U*<`UNkdLypDgrFHJc&O-0Mh6|7(&+jibb%F-wQ79P65JYyr_uzJP^R^E+ zHya^WvHeo^mv>d^fK%m2F?ScGO5#Ws$VVcz+K{Z{n?U3Pe-4#p@2mL3t9G$oKBBiV z63;ULca;SccX^g;JmFn-w+-5$z{g!B> zetVnLreE^zlJXqY((9+wn@vh$8RoL~;PlnHVoup2b-Fe+l_okTYrr!%D8m0Himg|T z-!%3loA7DzoT0s58o4PKg?eo;x7oW^F{>R5GXhyMv#22|giTTI|DAcLIkCD=`0FOu zqu+fRX0mqjDG@Gc5jE?VSeak#mYlSwBjHnu>O@Pzc4(LIAS}_}2Z+_+ItpCeH8zT?AMb5hL!D;&l58_=*zwa98Fse{TLm>R)n9ij t;xuc{P=-$3;@S^MEGQ%p@V_XfEodg&cxsI4UaD6Q<8j{DhX;aE{sEq; - } - description_with_br += Net.Http.HtmlEncode(txt); - first=false; - } @@ -32,7 +22,7 @@ func Components.PersonalListDescription(tytd,name,editing)
-

+
diff --git a/Tesses.YouTubeDownloader.Server/src/pages/video/info.tcross b/Tesses.YouTubeDownloader.Server/src/pages/video/info.tcross index 525bc01..0fba8eb 100644 --- a/Tesses.YouTubeDownloader.Server/src/pages/video/info.tcross +++ b/Tesses.YouTubeDownloader.Server/src/pages/video/info.tcross @@ -20,7 +20,7 @@ func Pages.VideoInfo(tytd,ctx)

{vi.title}

{vi.author} -

{vi.shortDescription}

+
; diff --git a/Tesses.YouTubeDownloader/src/data.tcross b/Tesses.YouTubeDownloader/src/data.tcross deleted file mode 100644 index e69de29..0000000 diff --git a/Tesses.YouTubeDownloader/src/videodownload/audioonlydownload.tcross b/Tesses.YouTubeDownloader/src/videodownload/audioonlydownload.tcross index 6664536..6c7c4ca 100644 --- a/Tesses.YouTubeDownloader/src/videodownload/audioonlydownload.tcross +++ b/Tesses.YouTubeDownloader/src/videodownload/audioonlydownload.tcross @@ -28,6 +28,7 @@ class TYTD.AOVideoDownload : IVideoDownload { var req = this.tytd.ManifestRequest(id).playerResponse; this.info.Title = req.videoDetails.title; tytd.LOG($"Downloading: {this.info.Title} with id: {id} Highest Audio"); + Console.WriteLine($"Downloading: {this.info.Title} with id: {id} Highest Audio"); this.info.Channel = req.videoDetails.author; this.info.ChannelId = req.videoDetails.channelId; @@ -66,6 +67,7 @@ class TYTD.AOVideoDownload : IVideoDownload { } public Start() { + if(this.done) return; for(var i = 0; i < 5; i++) { var req = { diff --git a/Tesses.YouTubeDownloader/src/videodownload/noconvertdownload.tcross b/Tesses.YouTubeDownloader/src/videodownload/noconvertdownload.tcross index 8e73760..325be4e 100644 --- a/Tesses.YouTubeDownloader/src/videodownload/noconvertdownload.tcross +++ b/Tesses.YouTubeDownloader/src/videodownload/noconvertdownload.tcross @@ -7,6 +7,7 @@ class TYTD.NoConvertVideoDownload : IVideoDownload { private done=false; + public NoConvertVideoDownload(id) { this.info = { @@ -36,6 +37,7 @@ class TYTD.NoConvertVideoDownload : IVideoDownload { this.info.Title = req.videoDetails.title; tytd.LOG($"Downloading: {this.info.Title} with id: {id} Highest Video/Audio"); + Console.WriteLine($"Downloading: {this.info.Title} with id: {id} Highest Video/Audio"); this.info.Channel = req.videoDetails.author; this.info.ChannelId = req.videoDetails.channelId; @@ -220,5 +222,7 @@ class TYTD.NoConvertVideoDownload : IVideoDownload { } } this.progress(1.0); + + return; } } \ No newline at end of file diff --git a/Tesses.YouTubeDownloader/src/videodownload/sdvideodownload.tcross b/Tesses.YouTubeDownloader/src/videodownload/sdvideodownload.tcross index df92191..7d247a1 100644 --- a/Tesses.YouTubeDownloader/src/videodownload/sdvideodownload.tcross +++ b/Tesses.YouTubeDownloader/src/videodownload/sdvideodownload.tcross @@ -28,6 +28,7 @@ class TYTD.SDVideoDownload : IVideoDownload { var req = this.tytd.ManifestRequest(id).playerResponse; this.info.Title = req.videoDetails.title; tytd.LOG($"Downloading: {this.info.Title} with id: {id} LowVideo"); + Console.WriteLine($"Downloading: {this.info.Title} with id: {id} LowVideo"); this.info.Channel = req.videoDetails.author; this.info.ChannelId = req.videoDetails.channelId; @@ -48,6 +49,7 @@ class TYTD.SDVideoDownload : IVideoDownload { } public Start() { + if(this.done) return; for(var i = 0; i < 5; i++) { var req = { diff --git a/Tesses.YouTubeDownloader/src/videodownload/transcodeaudio.tcross b/Tesses.YouTubeDownloader/src/videodownload/transcodeaudio.tcross index b53165d..3063972 100644 --- a/Tesses.YouTubeDownloader/src/videodownload/transcodeaudio.tcross +++ b/Tesses.YouTubeDownloader/src/videodownload/transcodeaudio.tcross @@ -3,6 +3,7 @@ class TYTD.TranscodeAudio : IVideoDownload { private ncv; private tytd; private ext; + private done; public TranscodeAudio(id,ext) { @@ -30,7 +31,7 @@ class TYTD.TranscodeAudio : IVideoDownload { public Start() { var id = this.id; - this.ncv.Start(); + if(!this.ncv.Start()) return; var p = new Process(); p.FileName = Env.GetRealExecutablePath("ffmpeg").ToString(); diff --git a/Tesses.YouTubeDownloader/src/videodownload/transcodevideo.tcross b/Tesses.YouTubeDownloader/src/videodownload/transcodevideo.tcross index 4425bcd..f44073c 100644 --- a/Tesses.YouTubeDownloader/src/videodownload/transcodevideo.tcross +++ b/Tesses.YouTubeDownloader/src/videodownload/transcodevideo.tcross @@ -30,7 +30,7 @@ class TYTD.TranscodeVideo : IVideoDownload { public Start() { var id = this.id; - this.ncv.Start(); + this.mcv.Start(); var p = new Process(); p.FileName = Env.GetRealExecutablePath("ffmpeg").ToString(); diff --git a/Tesses.YouTubeDownloader/src/videodownload/videoonlydownload.tcross b/Tesses.YouTubeDownloader/src/videodownload/videoonlydownload.tcross index 32b948a..c20c545 100644 --- a/Tesses.YouTubeDownloader/src/videodownload/videoonlydownload.tcross +++ b/Tesses.YouTubeDownloader/src/videodownload/videoonlydownload.tcross @@ -30,6 +30,8 @@ class TYTD.VOVideoDownload : IVideoDownload { this.info.Channel = req.videoDetails.author; this.info.ChannelId = req.videoDetails.channelId; tytd.LOG($"Downloading: {this.info.Title} with id: {id} Highest Video"); + Console.WriteLine($"Downloading: {this.info.Title} with id: {id} Highest Video"); + this.tytd.PutVideoInfo(req.videoDetails); var width = 0; @@ -63,6 +65,7 @@ class TYTD.VOVideoDownload : IVideoDownload { } public Start() { + if(this.done) return; var req = { FollowRedirects = true, RequestHeaders = [