mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2025-12-30 18:50:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

added 5.1 and 7.1 options to add audio track

Browse Source 
increased plugin versions to 0.6.1
fixed issue with replace original returning -11 instead of -1
fixed copy flie when on external node
This commit is contained in:
John Andrews
2022-05-15 11:32:18 +12:00
parent 4bab6ea879
commit 36316832aa
35 changed files with 399 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Apprise/Apprise.csproj
View File

Binary file not shown.

14
Apprise/Communication/Apprise.cs
View File

@@ -13,16 +13,16 @@ public class Apprise: Node
[Required]
[TextVariable(1)]
public string Message { get; set; }
public string Message { get; set; } = string.Empty;
[StringArray(2)]
public string[] Tag { get; set; }
public string[] Tag { get; set; } = new string[] { };
[DefaultValue("info")]
[Select(nameof(MessageTypeOptions), 3)]
public string MessageType { get; set; }
public string MessageType { get; set; } = string.Empty;
private static List<ListOption> _MessageTypeOptions;
private static List<ListOption> _MessageTypeOptions = new List<ListOption>();
public static List<ListOption> MessageTypeOptions
{
get
@@ -78,7 +78,11 @@ public class Apprise: Node
type = this.MessageType?.EmptyAsNull() ?? "info"
};
var content = new StringContent(JsonSerializer.Serialize(data), Encoding.UTF8, "application/json");
#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
var json = JsonSerializer.Serialize(data);
#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
var content = new StringContent(json, Encoding.UTF8, "application/json");
using var httpClient = new HttpClient();
var response = httpClient.PostAsync(url, content).Result;

37
Apprise/PluginSettings.cs
View File

@@ -1,18 +1,25 @@
namespace FileFlows.Apprise
namespace FileFlows.Apprise;
using FileFlows.Plugin;
using FileFlows.Plugin.Attributes;
using System.ComponentModel.DataAnnotations;
/// <summary>
/// The plugin settings for Apprise
/// </summary>
public class PluginSettings:IPluginSettings
{
using FileFlows.Plugin;
using FileFlows.Plugin.Attributes;
using System;
using System.ComponentModel.DataAnnotations;
/// <summary>
/// Gets or sets the URL of the Apprise server
/// </summary>
[Text(1)]
[Required]
public string ServerUrl { get; set; } = string.Empty;
public class PluginSettings:IPluginSettings
{
[Text(1)]
[Required]
public string ServerUrl { get; set; }
[Text(2)]
[Required]
public string Endpoint { get; set; }
}
/// <summary>
/// Gets or sets the endpoint of the Apprise server
/// </summary>
[Text(2)]
[Required]
public string Endpoint { get; set; } = string.Empty;
}

BIN
BasicNodes/BasicNodes.csproj
View File

Binary file not shown.

10
BasicNodes/File/CopyFile.cs
View File

@@ -80,11 +80,11 @@ namespace FileFlows.BasicNodes.File
dest = Path.Combine(destDir!, destFile);
}
bool copied = args.CopyFile(dest);
bool copied = args.CopyFile(args.WorkingFile, dest, updateWorkingFile: true);
if (!copied)
return -1;
var srcDir = AdditionalFilesFromOriginal ? new FileInfo(args.FileName).DirectoryName : new FileInfo(args.WorkingFile).DirectoryName;
var srcDir = AdditionalFilesFromOriginal ? new FileInfo(args.MapPath(args.FileName)).DirectoryName : new FileInfo(args.MapPath(args.WorkingFile)).DirectoryName;
if (AdditionalFiles?.Any() == true)
{
@@ -98,11 +98,11 @@ namespace FileFlows.BasicNodes.File
try
{
string addFileDest = Path.Combine(destDir, addFile.Name);
System.IO.File.Copy(addFile.FullName, addFileDest, true);
args.CopyFile(addFile.FullName, addFileDest, updateWorkingFile: false);
FileHelper.ChangeOwner(args.Logger, addFileDest, file: true);
args.Logger?.ILog("Copyied file: \"" + addFile.FullName + "\" to \"" + addFileDest + "\"");
args.Logger?.ILog("Copied file: \"" + addFile.FullName + "\" to \"" + addFileDest + "\"");
}
catch (Exception ex)
{

2
BasicNodes/File/ReplaceOriginal.cs
View File

@@ -29,7 +29,7 @@
if(moved == false)
{
args.Logger?.ELog("Failed to move file to: "+ args.FileName);
return -11;
return -1;
}
}
else

4
BasicNodes/Tools/Executor.cs
View File

@@ -45,10 +45,12 @@
private NodeParameters args;
public override async Task Cancel()
public override Task Cancel()
{
args?.Process?.Cancel();
return Task.CompletedTask;
}
public override int Execute(NodeParameters args)
{
this.args = args;

BIN
ChecksumNodes/ChecksumNodes.csproj
View File

Binary file not shown.

BIN
CollectionNodes/CollectionNodes.csproj
View File

Binary file not shown.

BIN
DiscordNodes/DiscordNodes.csproj
View File

Binary file not shown.

BIN
EmailNodes/EmailNodes.csproj
View File

Binary file not shown.

BIN
Emby/Emby.csproj
View File

Binary file not shown.

BIN
FileFlows.Plugin.dll
View File

Binary file not shown.

BIN
FileFlows.Plugin.pdb
View File

Binary file not shown.

BIN
Gotify/Gotify.csproj
View File

Binary file not shown.

BIN
ImageNodes/ImageNodes.csproj
View File

Binary file not shown.

BIN
MetaNodes/MetaNodes.csproj
View File

Binary file not shown.

BIN
MusicNodes/MusicNodes.csproj
View File

Binary file not shown.

2
Plex/MediaManagement/PlexAnalyze.cs
View File

@@ -9,7 +9,7 @@ public class PlexAnalyze : PlexNode
protected override int ExecuteActual(NodeParameters args, PlexDirectory directory, string baseUrl, string mappedPath, string accessToken)
{
string filename = new FileInfo(args.WorkingFile).Name;
string mappedFile = mappedPath + (mappedPath.IndexOf("/") >= 0 ? "/" : "\\") + filename;
string mappedFile = mappedPath + (mappedPath.IndexOf("/") >= 0 ? "/" : @"\") + filename;
using var httpClient = new HttpClient();
string itemId = GetItemId(httpClient, args, baseUrl, $"library/sections/{directory.Key}/all?includeCollections=1&includeAdvanced=1", accessToken, mappedFile);

BIN
Plex/Plex.csproj
View File

Binary file not shown.

4
VideoNodes/FfmpegBuilderNodes/Audio/FfmpegBuilderAudioAddTrack.cs
View File

@@ -52,7 +52,9 @@ public class FfmpegBuilderAudioAddTrack : FfmpegBuilderNode
{
new ListOption { Label = "Same as source", Value = 0},
new ListOption { Label = "Mono", Value = 1f},
new ListOption { Label = "Stereo", Value = 2f}
new ListOption { Label = "Stereo", Value = 2f},
new ListOption { Label = "5.1", Value = 6},
new ListOption { Label = "7.1", Value = 8}
};
}
return _ChannelsOptions;

BIN
VideoNodes/VideoNodes.csproj
View File

Binary file not shown.

2
VideoNodes/VideoNodes.en.json
View File

@@ -191,7 +191,7 @@
"Index": "Index",
"Index-Help": "The index where to insert the new audio track. 0 based, so to insert the new audio track as the first track set this to 0.",
"Channels": "Channels",
"Channels-Help": "The number of channels to convert this audio track to.",
"Channels-Help": "The number of channels this new audio track will be.\nIf you specify more channels than the source, FFMPEG will automatically upmix it.\nIf you specify fewer channels than the source, FFMPEG will automatically down mix it.",
"Bitrate": "Bitrate",
"Bitrate-Help": "Bitrate of the new audio track",
"Language": "Language",

2
build/buildplugins.ps1
View File

@@ -23,7 +23,7 @@ $output = $output | Resolve-Path
Remove-Item Builds -Recurse -ErrorAction SilentlyContinue
$revision = (git rev-list --count --first-parent HEAD) -join "`n"
$version = "0.6.0.$revision"
$version = "0.6.1.$revision"
$json = "[`n"

BIN
build/utils/PluginInfoGenerator/FileFlows.Plugin.dll
View File

Binary file not shown.

BIN
build/utils/PluginInfoGenerator/FileFlows.Plugin.pdb
View File

Binary file not shown.

BIN
build/utils/PluginInfoGenerator/FileFlows.ServerShared.dll
View File

Binary file not shown.

BIN
build/utils/PluginInfoGenerator/FileFlows.ServerShared.pdb
View File

Binary file not shown.

146
build/utils/PluginInfoGenerator/FileFlows.ServerShared.xml
View File

@@ -4,6 +4,107 @@
<name>FileFlows.ServerShared</name>
</assembly>
<members>
<member name="T:FileFlows.ServerShared.Globals">
<summary>
Globals variables
</summary>
</member>
<member name="F:FileFlows.ServerShared.Globals.Version">
<summary>
Gets the version of FileFlows
</summary>
</member>
<member name="P:FileFlows.ServerShared.Globals.IsWindows">
<summary>
Gets if this is running on Windows
</summary>
</member>
<member name="P:FileFlows.ServerShared.Globals.IsLinux">
<summary>
Gets if this is running on linux
</summary>
</member>
<member name="P:FileFlows.ServerShared.Globals.IsMac">
<summary>
Gets if this is running on Mac
</summary>
</member>
<member name="P:FileFlows.ServerShared.Globals.IsDocker">
<summary>
Gets or sets if this node is running inside a docker container
</summary>
</member>
<member name="T:FileFlows.ServerShared.Helpers.DirectoryHelper">
<summary>
A helper class to manage the directories used by FileFlows Server and Node
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.IsDocker">
<summary>
Gets if this is a Docker instance or not
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.IsNode">
<summary>
Gets if this is a Node or Server
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.BaseDirectory">
<summary>
Gets the base directory of FileFlows
eg %appdata%\FileFlows
</summary>
</member>
<member name="M:FileFlows.ServerShared.Helpers.DirectoryHelper.InitLoggingDirectory">
<summary>
Inits the logging directory and moves any files if they need to be moved
</summary>
</member>
<member name="M:FileFlows.ServerShared.Helpers.DirectoryHelper.InitDataDirectory">
<summary>
Inits the data directory and moves any files if they need to be moved
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.LoggingDirectory">
<summary>
Gets the logging directory
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.LibraryFilesLoggingDirectory">
<summary>
Gets the directory where library file logs are stored
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.DataDirectory">
<summary>
Gets the data directory
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.DatabaseDirectory">
<summary>
Gets the directory the database is saved in
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.FlowRunnerDirectory">
<summary>
Gets the flow runner directory
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.PluginsDirectory">
<summary>
Gets the logging directory
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.EncryptionKeyFile">
<summary>
Gets the location of the encryption key file
</summary>
</member>
<member name="P:FileFlows.ServerShared.Helpers.DirectoryHelper.NodeConfigFile">
<summary>
Gets the location of the node configuration file
</summary>
</member>
<member name="M:FileFlows.ServerShared.Helpers.FileHelper.RemoveIllegalCharacters(System.String)">
<summary>
Removes illegal file/path characters from a string
@@ -161,5 +262,50 @@
<param name="version">the current version of the node</param>
<returns>if there is a node update available, returns the update</returns>
</member>
<member name="T:FileFlows.ServerShared.Workers.UpdaterWorker">
<summary>
Worker that will automatically update the system
</summary>
</member>
<member name="P:FileFlows.ServerShared.Workers.UpdaterWorker.UpdatePending">
<summary>
Gets if there is an updated pending installation
</summary>
</member>
<member name="M:FileFlows.ServerShared.Workers.UpdaterWorker.#ctor(System.String,System.Int32)">
<summary>
Constructs an instance of a Update Worker
</summary>
<param name="upgradeScriptPrefix">The script to execute in the upgrade zip file</param>
<param name="minutes">how many minute between checks</param>
</member>
<member name="M:FileFlows.ServerShared.Workers.UpdaterWorker.CanUpdate">
<summary>
Gets if the update can run
</summary>
</member>
<member name="M:FileFlows.ServerShared.Workers.UpdaterWorker.QuitApplication">
<summary>
Quits the current application
</summary>
</member>
<member name="M:FileFlows.ServerShared.Workers.UpdaterWorker.RunCheck">
<summary>
Runs a check for update and if found will download it
</summary>
<returns>A update has been downloaded</returns>
</member>
<member name="M:FileFlows.ServerShared.Workers.UpdaterWorker.DownloadUpdateBinary">
<summary>
Downloads an update
</summary>
<returns>The update file</returns>
</member>
<member name="M:FileFlows.ServerShared.Workers.UpdaterWorker.GetAutoUpdatesEnabled">
<summary>
Gets if auto updates are enabled
</summary>
<returns>if auto updates are enabled</returns>
</member>
</members>
</doc>

BIN
build/utils/PluginInfoGenerator/FileFlows.Shared.dll
View File

Binary file not shown.

BIN
build/utils/PluginInfoGenerator/FileFlows.Shared.pdb
View File

Binary file not shown.

204
build/utils/PluginInfoGenerator/FileFlows.Shared.xml
View File

@@ -4,6 +4,41 @@
<name>FileFlows.Shared</name>
</assembly>
<members>
<member name="T:FileFlows.Shared.ExtensionMethods">
<summary>
Extension methods used by FileFlows
</summary>
</member>
<member name="M:FileFlows.Shared.ExtensionMethods.ToJson(System.Object)">
<summary>
Converts an object to a json string
</summary>
<param name="o">the object to convert</param>
<returns>the object as json, or empty if object was null</returns>
</member>
<member name="M:FileFlows.Shared.ExtensionMethods.EmptyAsNull(System.String)">
<summary>
Returns an empty string as null, otherwise returns the original string
</summary>
<param name="str">the input string</param>
<returns>the string or null if empty</returns>
</member>
<member name="M:FileFlows.Shared.ExtensionMethods.TryMatch(System.Text.RegularExpressions.Regex,System.String,System.Text.RegularExpressions.Match@)">
<summary>
Tries to find a match
</summary>
<param name="regex">The regex to use to find the match</param>
<param name="input">The input string to find the match in</param>
<param name="match">The match if found</param>
<returns>true if found, false otherwise</returns>
</member>
<member name="M:FileFlows.Shared.ExtensionMethods.ToLowerExplicit(System.String)">
<summary>
Lower cases UPPER case characters, but does not touch umlauts etc
</summary>
<param name="input">the string to lowercase</param>
<returns>the lowercased string</returns>
</member>
<member name="T:FileFlows.Shared.Helpers.ObjectCloner">
<summary>
Clones an object
@@ -84,6 +119,175 @@
Gets or sets a list of nodes that were executed against this library file
</summary>
</member>
<member name="T:FileFlows.Shared.Models.NextLibraryFileArgs">
<summary>
Arguments for hte Next Library File request
</summary>
</member>
<member name="P:FileFlows.Shared.Models.NextLibraryFileArgs.NodeName">
<summary>
Gets or sets the name of the node
</summary>
</member>
<member name="P:FileFlows.Shared.Models.NextLibraryFileArgs.NodeUid">
<summary>
Gets or sets the Uid of the node
</summary>
</member>
<member name="P:FileFlows.Shared.Models.NextLibraryFileArgs.NodeVersion">
<summary>
Gets or sets the Version of the node
</summary>
</member>
<member name="P:FileFlows.Shared.Models.NextLibraryFileArgs.WorkerUid">
<summary>
Gets or sets the worker UID
</summary>
</member>
<member name="T:FileFlows.Shared.Models.ProcessingNode">
<summary>
A processing node used by FileFlows to process Library Files
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.TempPath">
<summary>
Gets or sets the temporary path used by this node
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.Address">
<summary>
Gets or sets the address this node is located at, hostname or ip address
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.Enabled">
<summary>
Gets or sets if this node is enabled
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.OperatingSystem">
<summary>
Gets or sets the type of operating system this node is running on
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.Version">
<summary>
Gets or sets the FileFlows version of this node
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.FlowRunners">
<summary>
Gets or sets the number of flow runners this node can run simultaneously
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.SignalrUrl">
<summary>
Gets or sets the SignalrUrl this node uses
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.Mappings">
<summary>
Gets or sets the mappings for this node
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.Schedule">
<summary>
Gets or sets the schedule for this node
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.DontChangeOwner">
<summary>
Gets or sets if the owner should not be changed
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.DontSetPermissions">
<summary>
Gets or sets if permissions should not be set
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.Permissions">
<summary>
Gets or sets the permissions to set
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.AllLibraries">
<summary>
Gets or sets if this node can process all libraries
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.Libraries">
<summary>
Gets or sets the libraries this node can process
</summary>
</member>
<member name="P:FileFlows.Shared.Models.ProcessingNode.MaxFileSizeMb">
<summary>
Gets or sets the maximum file size this node can process
</summary>
</member>
<member name="F:FileFlows.Shared.Models.ProcessingNode.DirectorySeperatorChar">
<summary>
The directory separator used by this node
</summary>
</member>
<member name="M:FileFlows.Shared.Models.ProcessingNode.Map(System.String)">
<summary>
Maps a path locally for this node
</summary>
<param name="path">The path to map</param>
<returns>The path mapped locally for this node</returns>
</member>
<member name="M:FileFlows.Shared.Models.ProcessingNode.UnMap(System.String)">
<summary>
Unmaps a path for this node
</summary>
<param name="path">The mapped path</param>
<returns>The unmapped path</returns>
</member>
<member name="P:FileFlows.Shared.Models.Settings.AutoUpdatePlugins">
<summary>
Gets or sets if plugins should automatically be updated when new version are available online
</summary>
</member>
<member name="P:FileFlows.Shared.Models.Settings.AutoUpdate">
<summary>
Gets or sets if the server should automatically update when a new version is available online
</summary>
</member>
<member name="P:FileFlows.Shared.Models.Settings.AutoUpdateNodes">
<summary>
Gets or sets if nodes should be automatically updated when the server is updated
</summary>
</member>
<member name="P:FileFlows.Shared.Models.Settings.DisableTelemetry">
<summary>
Gets or sets if telemetry should be disabled
</summary>
</member>
<member name="P:FileFlows.Shared.Models.Settings.CompressLibraryFileLogs">
<summary>
Gets or sets if the library file logs should be saved in a compressed format to reduce file size
</summary>
</member>
<member name="P:FileFlows.Shared.Models.Settings.PluginRepositoryUrls">
<summary>
Gets or sets a list of available URLs to additional plugin repositories
</summary>
</member>
<member name="P:FileFlows.Shared.Models.Settings.IsWindows">
<summary>
Gets or sets if this is running on Windows
</summary>
</member>
<member name="P:FileFlows.Shared.Models.Settings.IsDocker">
<summary>
Gets or sets if this is running inside Docker
</summary>
</member>
<member name="P:FileFlows.Shared.Models.Settings.Version">
<summary>
Gets or sets the FileFlows version number
</summary>
</member>
<member name="T:FileFlows.Shared.Validators.DefaultValidator">
<summary>
Used instead of null

BIN
build/utils/PluginInfoGenerator/PluginInfoGenerator.dll
View File

Binary file not shown.

BIN
build/utils/PluginInfoGenerator/PluginInfoGenerator.pdb
View File

Binary file not shown.

4
build/utils/spellcheck/ignoredwords.txt
View File

@@ -84,4 +84,6 @@ revenz
Fenrus
Plex-Token
analyze
px
px
upmix
downmix