From 5fdf1cd16d8960e9e7a9404a29c16e96af29436a Mon Sep 17 00:00:00 2001 From: John Andrews Date: Sat, 23 Apr 2022 21:13:28 +1200 Subject: [PATCH] Aded help links to FFMPEG Builder nodes. commented out FFMPEG Builder Metadata node as its incomplete --- BasicNodes/BasicNodes.csproj | Bin 3778 -> 3778 bytes ChecksumNodes/ChecksumNodes.csproj | Bin 2872 -> 2872 bytes CollectionNodes/CollectionNodes.csproj | Bin 3256 -> 3256 bytes DiscordNodes/DiscordNodes.csproj | Bin 2870 -> 2870 bytes EmailNodes/EmailNodes.csproj | Bin 3386 -> 3386 bytes Emby/Emby.csproj | Bin 2844 -> 2844 bytes Gotify/Gotify.csproj | Bin 2752 -> 2752 bytes MetaNodes/MetaNodes.csproj | Bin 4504 -> 4504 bytes MusicNodes/MusicNodes.csproj | Bin 4228 -> 4228 bytes Plex/Plex.csproj | Bin 2844 -> 2844 bytes .../FfmpegBuilderNodes/FfmpegBuilderNode.cs | 1 + .../Metadata/FfmpegBuilderAutoChapters.cs | 1 + .../Metadata/FfmpegBuilderVideoMetadata.cs | 110 +++++++++--------- .../Video/FfmpegBuilderCropBlackBars.cs | 3 + .../Video/FfmpegBuilderHdrToSdr.cs | 3 + .../Video/FfmpegBuilderVideo10Bit.cs | 3 + .../Video/FfmpegBuilderVideoCodec.cs | 2 + VideoNodes/VideoNodes.csproj | Bin 4098 -> 4098 bytes VideoNodes/VideoNodes/AutoChapters.cs | 1 + 19 files changed, 69 insertions(+), 55 deletions(-) diff --git a/BasicNodes/BasicNodes.csproj b/BasicNodes/BasicNodes.csproj index 9edd52802b1708648044572389404ee0ea4faa89..030305f69ffbba0ba60bd10440c9d9431fbb9c17 100644 GIT binary patch delta 20 ccmX>kdq{S}8%9Qp$!{4W87(%uGgb2d09D}!D*ylh delta 20 ccmX>kdq{S}8%9R+$!{4W8O=AlGgb2d09DTiDF6Tf diff --git a/ChecksumNodes/ChecksumNodes.csproj b/ChecksumNodes/ChecksumNodes.csproj index 30f616e9aa0d74252f5e2cac9d024d0a556144c0..04d76dc810ca6da328373bf434ce050b75e0eb8f 100644 GIT binary patch delta 35 rcmdlXwnJ>gDJE761{((b$qShzC*R}ZnykjcH;Gw+(PFbAvp5F;!Mq7X delta 35 rcmdlXwnJ>gDJE8P1{((b$qShzC*R}ZnykjcH;Gw+(R{Navp5F;!J7#} diff --git a/CollectionNodes/CollectionNodes.csproj b/CollectionNodes/CollectionNodes.csproj index b1ffc7ae4b612905b16fe658f0273569c85348af..27d22a010ada03fd202a39affe891c2f8048bab6 100644 GIT binary patch delta 36 scmdlXxkGZpEk;%g1{((b$r~9ZC&%${P2R)IH(7v5fze{KAyYdS0M4Nb5C8xG delta 36 scmdlXxkGZpEk;&z1{((b$r~9ZC&%${P2R)IH(7v5fzf=kAyYdS0M3634gdfE diff --git a/DiscordNodes/DiscordNodes.csproj b/DiscordNodes/DiscordNodes.csproj index a61cf95c1028e4a21c1999a4ba7480127c0bb336..16a6afddaf9043b629ba37cfe306c18cb59bf9de 100644 GIT binary patch delta 20 ccmdlcwoPoqBqm0S$&;Ca87($HXY%I&08Cy6y#N3J delta 20 ccmdlcwoPoqBqm1l$&;Ca8O=98XY%I&08C5gdO&o83lpmagAIfJWN9YJ$$OYMCTB6}FgdO&o83lpn3gAIfJWN9YJ$$OYMCTB6}F`93l$)wH!0Fn#{OaK4? diff --git a/MetaNodes/MetaNodes.csproj b/MetaNodes/MetaNodes.csproj index d82787b3fc4f184fe72c917ab0270bb4c69f70da..b7d5b6bb7ee32815df2fd6f633949b37ed8b714a 100644 GIT binary patch delta 20 ccmbQCJVSZI9VSML$#6i+@?)k*MvKk1%6jB@?)k*M)S?K% 1; public override string Icon => "far fa-file-video"; public override FlowElementType Type => FlowElementType.BuildPart; + public override string HelpUrl => "https://github.com/revenz/FileFlows/wiki/FFMPEG-Builder"; protected void Init(NodeParameters args) { diff --git a/VideoNodes/FfmpegBuilderNodes/Metadata/FfmpegBuilderAutoChapters.cs b/VideoNodes/FfmpegBuilderNodes/Metadata/FfmpegBuilderAutoChapters.cs index 5490d232..a2354274 100644 --- a/VideoNodes/FfmpegBuilderNodes/Metadata/FfmpegBuilderAutoChapters.cs +++ b/VideoNodes/FfmpegBuilderNodes/Metadata/FfmpegBuilderAutoChapters.cs @@ -3,6 +3,7 @@ public class FfmpegBuilderAutoChapters : FfmpegBuilderNode { public override int Outputs => 2; + public override string HelpUrl => "https://github.com/revenz/FileFlows/wiki/FFMPEG-Builder:-Auto-Chapters"; [NumberInt(1)] [DefaultValue(60)] diff --git a/VideoNodes/FfmpegBuilderNodes/Metadata/FfmpegBuilderVideoMetadata.cs b/VideoNodes/FfmpegBuilderNodes/Metadata/FfmpegBuilderVideoMetadata.cs index e166a0b1..9c7e8878 100644 --- a/VideoNodes/FfmpegBuilderNodes/Metadata/FfmpegBuilderVideoMetadata.cs +++ b/VideoNodes/FfmpegBuilderNodes/Metadata/FfmpegBuilderVideoMetadata.cs @@ -1,64 +1,64 @@ -namespace FileFlows.VideoNodes.FfmpegBuilderNodes -{ - public class FfmpegBuilderVideoMetadata : FfmpegBuilderNode - { - public override int Outputs => 2; +//namespace FileFlows.VideoNodes.FfmpegBuilderNodes +//{ +// public class FfmpegBuilderVideoMetadata : FfmpegBuilderNode +// { +// public override int Outputs => 2; - public override int Execute(NodeParameters args) - { - base.Init(args); +// public override int Execute(NodeParameters args) +// { +// base.Init(args); - if (args?.Variables?.ContainsKey("VideoMetadata") != true) - { - args.Logger?.ILog("VideoMetadata not found in variables"); - return 2; - } - var md = VideoMetadata.Convert(args.Variables["VideoMetadata"]); - if (string.IsNullOrEmpty(md?.Title)) - { - args.Logger?.ILog("Failed to load VideoMetadata"); - return 2; - } +// if (args?.Variables?.ContainsKey("VideoMetadata") != true) +// { +// args.Logger?.ILog("VideoMetadata not found in variables"); +// return 2; +// } +// var md = VideoMetadata.Convert(args.Variables["VideoMetadata"]); +// if (string.IsNullOrEmpty(md?.Title)) +// { +// args.Logger?.ILog("Failed to load VideoMetadata"); +// return 2; +// } - if (md.Year > 1920 && md.Year < 2100) - Model.MetadataParameters.AddRange(new[] { "-metadata", "year=" + md.Year }); - if (md.ReleaseDate > new DateTime(1920, 1, 1) && md.ReleaseDate < new DateTime(2100, 1, 1)) - Model.MetadataParameters.AddRange(new[] { "-metadata", "date=" + md.ReleaseDate.ToString("yyyy-MM-dd HH:mm:ss") }); +// if (md.Year > 1920 && md.Year < 2100) +// Model.MetadataParameters.AddRange(new[] { "-metadata", "year=" + md.Year }); +// if (md.ReleaseDate > new DateTime(1920, 1, 1) && md.ReleaseDate < new DateTime(2100, 1, 1)) +// Model.MetadataParameters.AddRange(new[] { "-metadata", "date=" + md.ReleaseDate.ToString("yyyy-MM-dd HH:mm:ss") }); - if (string.IsNullOrEmpty(md.Description) == false) - Model.MetadataParameters.AddRange(new[] { "-metadata", "description=" + md.Description }); +// if (string.IsNullOrEmpty(md.Description) == false) +// Model.MetadataParameters.AddRange(new[] { "-metadata", "description=" + md.Description }); - if (string.IsNullOrEmpty(md?.ArtJpeg) == false) - Model.MetadataParameters.AddRange(new[] { "-attach", md.ArtJpeg, "-metadata:s:t:0", "mimetype=image/jpg", "-metadata:s:t:0", "filename=cover.jpg" }); +// if (string.IsNullOrEmpty(md?.ArtJpeg) == false) +// Model.MetadataParameters.AddRange(new[] { "-attach", md.ArtJpeg, "-metadata:s:t:0", "mimetype=image/jpg", "-metadata:s:t:0", "filename=cover.jpg" }); - if (md.Genres?.Any() == true) - Model.MetadataParameters.AddRange(new[] { "-metadata", "genre=" + string.Join(", ", md.Genres) }); - if (md.Directors?.Any() == true) - Model.MetadataParameters.AddRange(new[] { "-metadata", "directors=" + string.Join(", ", md.Directors) }); - if (md.Writers?.Any() == true) - Model.MetadataParameters.AddRange(new[] { "-metadata", "writers=" + string.Join(", ", md.Writers) }); - if (md.Actors?.Any() == true) - Model.MetadataParameters.AddRange(new[] { "-metadata", "cast=" + string.Join(", ", md.Actors) }); +// if (md.Genres?.Any() == true) +// Model.MetadataParameters.AddRange(new[] { "-metadata", "genre=" + string.Join(", ", md.Genres) }); +// if (md.Directors?.Any() == true) +// Model.MetadataParameters.AddRange(new[] { "-metadata", "directors=" + string.Join(", ", md.Directors) }); +// if (md.Writers?.Any() == true) +// Model.MetadataParameters.AddRange(new[] { "-metadata", "writers=" + string.Join(", ", md.Writers) }); +// if (md.Actors?.Any() == true) +// Model.MetadataParameters.AddRange(new[] { "-metadata", "cast=" + string.Join(", ", md.Actors) }); - if (md.Season != null && md.Season >= 0 && md.Episode != null && md.Episode > 0) - { - Model.MetadataParameters.AddRange(new[] { "-metadata", "show=" + md.Title }); - Model.MetadataParameters.AddRange(new[] { "-metadata", "season_number=" + md.Season }); - Model.MetadataParameters.AddRange(new[] { "-metadata", "episode_id=" + md.Episode }); - Model.MetadataParameters.AddRange(new[] { "-metadata", "title=" + md.Subtitle}); - Model.MetadataParameters.AddRange(new[] { "-metadata", "album=Season " + md.Season }); - } - else - { - // movie - Model.MetadataParameters.AddRange(new[] { "-metadata", "title=" + md.Title }); +// if (md.Season != null && md.Season >= 0 && md.Episode != null && md.Episode > 0) +// { +// Model.MetadataParameters.AddRange(new[] { "-metadata", "show=" + md.Title }); +// Model.MetadataParameters.AddRange(new[] { "-metadata", "season_number=" + md.Season }); +// Model.MetadataParameters.AddRange(new[] { "-metadata", "episode_id=" + md.Episode }); +// Model.MetadataParameters.AddRange(new[] { "-metadata", "title=" + md.Subtitle}); +// Model.MetadataParameters.AddRange(new[] { "-metadata", "album=Season " + md.Season }); +// } +// else +// { +// // movie +// Model.MetadataParameters.AddRange(new[] { "-metadata", "title=" + md.Title }); - } - Model.MetadataParameters.AddRange(new[] { "-metadata", "encoder=FileFlows" }); +// } +// Model.MetadataParameters.AddRange(new[] { "-metadata", "encoder=FileFlows" }); - //Model.MetadataParameters.Add(""); - //Model.MetadataParameters.AddRange(new[] { "-map_metadata", (Model.InputFiles.Count - 1).ToString() }); - return 1; - } - } -} +// //Model.MetadataParameters.Add(""); +// //Model.MetadataParameters.AddRange(new[] { "-map_metadata", (Model.InputFiles.Count - 1).ToString() }); +// return 1; +// } +// } +//} diff --git a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderCropBlackBars.cs b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderCropBlackBars.cs index ea1d8dac..4837756b 100644 --- a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderCropBlackBars.cs +++ b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderCropBlackBars.cs @@ -6,6 +6,9 @@ [DefaultValue(10)] public int CroppingThreshold { get; set; } public override int Outputs => 2; + + public override string HelpUrl => "https://github.com/revenz/FileFlows/wiki/FFMPEG-Builder:-Crop-Black-Bars"; + public override int Execute(NodeParameters args) { base.Init(args); diff --git a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderHdrToSdr.cs b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderHdrToSdr.cs index 1625a8a4..4220e66a 100644 --- a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderHdrToSdr.cs +++ b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderHdrToSdr.cs @@ -3,6 +3,9 @@ public class FfmpegBuilderHdrToSdr : FfmpegBuilderNode { public override int Outputs => 2; + + public override string HelpUrl => "https://github.com/revenz/FileFlows/wiki/FFMPEG-Builder:-HDR-to-SDR"; + public override int Execute(NodeParameters args) { base.Init(args); diff --git a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideo10Bit.cs b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideo10Bit.cs index a023521c..7a58a763 100644 --- a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideo10Bit.cs +++ b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideo10Bit.cs @@ -3,6 +3,9 @@ public class FfmpegBuilderVideo10Bit : FfmpegBuilderNode { public override int Outputs => 1; + + public override string HelpUrl => "https://github.com/revenz/FileFlows/wiki/FFMPEG-Builder:-Video-10-Bit"; + public override int Execute(NodeParameters args) { base.Init(args); diff --git a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoCodec.cs b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoCodec.cs index 81a3a8b3..bb7ee08e 100644 --- a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoCodec.cs +++ b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoCodec.cs @@ -4,6 +4,8 @@ { public override int Outputs => 2; + public override string HelpUrl => "https://github.com/revenz/FileFlows/wiki/FFMPEG-Builder:-Video-Codec"; + [DefaultValue("hevc")] [TextVariable(1)] public string VideoCodec { get; set; } diff --git a/VideoNodes/VideoNodes.csproj b/VideoNodes/VideoNodes.csproj index 421faa493683f560832859ad2031b286efb057dd..bf57204efa478766dbb75aa7fbd7d6876dc0ea92 100644 GIT binary patch delta 20 bcmZotXj0hlh>6i+@?)k*MvKk1%tv_uOj!ot delta 20 bcmZotXj0hlh>6jB@?)k*M)S?K%tv_uOh*RZ diff --git a/VideoNodes/VideoNodes/AutoChapters.cs b/VideoNodes/VideoNodes/AutoChapters.cs index 29f949b0..2107feee 100644 --- a/VideoNodes/VideoNodes/AutoChapters.cs +++ b/VideoNodes/VideoNodes/AutoChapters.cs @@ -14,6 +14,7 @@ { public override int Outputs => 2; + [NumberInt(1)] [DefaultValue(60)] public int MinimumLength { get; set; } = 60;