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 0000000..10c5aac Binary files /dev/null and b/Tesses.YouTubeDownloader.PluginTemplate/res/icon.png differ diff --git a/Tesses.YouTubeDownloader.Server/src/components/personallistdescription.tcross b/Tesses.YouTubeDownloader.Server/src/components/personallistdescription.tcross index 224f4eb..51a5c9a 100644 --- a/Tesses.YouTubeDownloader.Server/src/components/personallistdescription.tcross +++ b/Tesses.YouTubeDownloader.Server/src/components/personallistdescription.tcross @@ -2,16 +2,6 @@ func Components.PersonalListDescription(tytd,name,editing) { var description = tytd.GetPersonalListDescription(name); var first=true; - var description_with_br = ""; - each(var txt : description.Split("\n")) - { - if(!first) - { - description_with_br +=
; - } - 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 = [