changes made to make it run better in a unraid docker

Author: reven

Client/Pages/Dashboard/Dashboard.razor

@@ -40,6 +40,10 @@
                                     <span class="label">@lblProcessingTime</span>
                                     <span class="value">@worker.ProcessingTime.ToString(@"hh\:mm\:ss")</span>
                                 </span>
+                                <span class="label-value working-file">
+                                    <span class="label">@lblWorkingFile</span>
+                                    <span class="value">@worker.WorkingFile</span>
+                                </span>
                                 <div class="actions-wrapper">
                                     <div class="actions">
                                         <RadzenButton Click="() => LogClicked(worker)" Text="@lblLog" />

Client/Pages/Dashboard/Dashboard.razor.cs

@@ -31,7 +31,7 @@ public partial class Dashboard : ComponentBase, IDisposable
 
         private IJSObjectReference jsFunctions;
 
-        private string lblLog, lblCancel, lblWaiting, lblCurrentStep, lblFile, lblOverall, lblCurrent, lblProcessingTime, lblUpcoming, lblRecentlyFinished;
+        private string lblLog, lblCancel, lblWaiting, lblCurrentStep, lblFile, lblOverall, lblCurrent, lblProcessingTime, lblUpcoming, lblRecentlyFinished, lblWorkingFile;
         private Timer AutoRefreshTimer;
         protected override async Task OnInitializedAsync()
         {
@@ -49,6 +49,7 @@ protected override async Task OnInitializedAsync()
             lblCurrent = Translater.Instant("Pages.Dashboard.Fields.Current");
             lblProcessingTime = Translater.Instant("Pages.Dashboard.Fields.ProcessingTime");
             lblUpcoming = Translater.Instant("Pages.Dashboard.Fields.Upcoming");
+            lblWorkingFile =Translater.Instant("Pages.Dashboard.Fields.WorkingFile");
             lblRecentlyFinished = Translater.Instant("Pages.Dashboard.Fields.RecentlyFinished");
             jsFunctions = await jSRuntime.InvokeAsync<IJSObjectReference>("import", "./scripts/Dashboard.js");
             await this.Refresh();

Client/Pages/Settings/Settings.razor

@@ -12,15 +12,7 @@
 
             <RadzenTemplateForm Data="@Model">
                 <Fieldset Title="Pages.Settings.Labels.Directories">
-                    <InputText @bind-Value="@Model.Source" Label="Pages.Settings.Fields.Source" />
-                    <InputText @bind-Value="@Model.Destination" Label="Pages.Settings.Fields.Destination" />
-                    <InputSwitch @bind-Value="@Model.TestMode" Label="Pages.Settings.Fields.TestMode" />
-                    <InputArray @bind-Value="@Model.Extensions" Label="Pages.Settings.Fields.Extensions"
-                        EnterOnSpace="@true" />
-                </Fieldset>
-                <Fieldset Title="Pages.Settings.Labels.Tools">
-                    <InputText @bind-Value="@Model.HandBrakeCli" Label="Pages.Settings.Fields.HandBrakeCli" />
-                    <InputText @bind-Value="@Model.FFProbeExe" Label="Pages.Settings.Fields.FFProbeExe" />
+                    <InputFile @bind-Value="@Model.TempPath" Directory="true" Label="Pages.Settings.Fields.TempPath" />
                 </Fieldset>
             </RadzenTemplateForm>
         </div>

Client/Pages/Settings/Settings.razor.cs

@@ -7,30 +7,20 @@ namespace FileFlow.Client.Pages
     using FileFlow.Client.Components;
 
     using FileFlow.Plugin;
-   public partial class Settings : ComponentBase
+    public partial class Settings : ComponentBase
     {
         [CascadingParameter] Blocker Blocker { get; set; }
 
         private bool IsSaving { get; set; }
 
-        private string lblSave, lblSaving, lblSource, lblDestination;
+        private string lblSave, lblSaving;
 
         private FileFlow.Shared.Models.Settings Model { get; set; } = new FileFlow.Shared.Models.Settings();
 
-        private ListOption[] Containers;
-
         protected override async Task OnInitializedAsync()
         {
             lblSave = Translater.Instant("Labels.Save");
             lblSaving = Translater.Instant("Labels.Saving");
-            lblSource = Translater.Instant("Pages.Settings.Fields.Source");
-            lblDestination = Translater.Instant("Pages.Settings.Fields.Destination");
-
-            Containers = new[] {
-                new ListOption { Value = "mkv", Label = "MKV"},
-                new ListOption { Value = "mp4", Label = "MP4"},
-            };
-
             Blocker.Show("Loading Settings");
 
             var response = await HttpHelper.Get<FileFlow.Shared.Models.Settings>("/api/settings");

Client/wwwroot/i18n/en.json

@@ -78,7 +78,8 @@
         "Current":"Current",
         "ProcessingTime":"Processing Time",
         "Upcoming":"Upcoming",
-        "RecentlyFinished":"Recently Finished"
+        "RecentlyFinished":"Recently Finished",
+        "WorkingFile":"Working File"
       }
     },
     "Flow": {
@@ -123,21 +124,11 @@
     "Settings": {
       "Title": "Settings",
       "Labels": {
-        "Directories": "Directories",
-        "Tools": "Tools"
+        "Directories": "Directories"
       },
       "Fields": {
-        "Source": "Source Directory",
-        "Source-Help": "The source directory containing the video files to convert.  This will be recursively searched.",
-        "Destination": "Destination Directory",
-        "Destination-Help": "The destination directory where the encode files will be placed.\nNote: If blank, the files will be saved in the same directory as the source files and the source files will be replaced.",
-        "Container": "Container",
-        "Container-Placeholder": "Select container for converted videos",
-        "Container-Help": "The container converted videos will be created with.",
-        "TestMode": "Test Mode",
-        "TestMode-Help": "When in test mode no actual encoding will be done, only the results of what would happen are shown.",
-        "Extensions": "Extensions",
-        "Extensions-Help": "A list of file extensions to be considered a video file"
+        "TempPath": "Temp Directory",
+        "TempPath-Help": "This directory will be used by flows to create temporary files as the flow is processed, this directory will be regularly cleaned up so keep nothing important here."
       }
     },
     "Tools":{

Client/wwwroot/index.html

@@ -41,7 +41,7 @@
         import { BrotliDecode } from './scripts/decode.min.js';
         Blazor.start({
           loadBootResource: function (type, name, defaultUri, integrity) {
-            if (type !== 'dotnetjs') {
+            if (type !== 'dotnetjs' && location.hostname !== 'localhost') {
               return (async function () {
                 const response = await fetch(defaultUri + '.br', { cache: 'no-cache' });
                 if (!response.ok) {

Dockerfile

@@ -4,12 +4,23 @@ FROM ubuntu:20.04
 # expose the ports we need
 EXPOSE 5000
 
+# install libssl-dev, needed for the asp.net application to run
 RUN apt-get update \
     && apt-get upgrade -y \
     && apt-get dist-upgrade -y \
     && apt-get install -fy \
     libssl-dev
 
+# install nvidia driver
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt update
+RUN apt install software-properties-common -y
+RUN add-apt-repository ppa:graphics-drivers 
+RUN apt install nvidia-driver-440 -y
+
+# install ffmpeg
+RUN apt-get install -y ffmpeg
+
 # copy the publish into the app 
 COPY /zpublish /app
 

Plugins/BasicNodes/BasicNodes.en.json

@@ -9,6 +9,14 @@
     },
     "Flow":{
         "Parts":{
+            "CopyFile":{
+                "Fields":{
+                    "DestinationPath":"Destination Path",
+                    "DestinationPath-Help":"The path where the file will be copied too",
+                    "CopyFolder":"Copy Folder",
+                    "CopyFolder-Help" :"If the relative library folder structure should be copied too"
+                }
+            },
             "Log":{
                 "Fields":{
                     "LogType":"Type",
@@ -34,10 +42,10 @@
             },
             "MoveFile":{
                 "Fields":{
-                    "Path":"Directory",
-                    "Path-Help":"The destination directory of the file",
-                    "FileName":"File Name",
-                    "FileName-Help":"Optional filename of the moved file, if blank the original filename will be used."
+                    "DestinationPath":"Destination Path",
+                    "DestinationPath-Help":"The path where the file will be moved too",
+                    "MoveFolder":"Copy Folder",
+                    "MoveFolder-Help" :"If the relative library folder structure should be copied too"
                 }
             },
             "RenameFile":{

Plugins/BasicNodes/File/CopyFile.cs

@@ -0,0 +1,100 @@
+namespace FileFlow.BasicNodes.File
+{
+    using System.ComponentModel;
+    using FileFlow.Plugin;
+    using FileFlow.Plugin.Attributes;
+
+    public class CopyFile : Node
+    {
+        public override int Inputs => 1;
+        public override int Outputs => 1;
+        public override FlowElementType Type => FlowElementType.Process;
+
+        [Folder(1)]
+        public string DestinationPath { get; set; }
+
+        [Boolean(2)]
+        public bool CopyFolder { get; set; }
+
+        private bool Canceled;
+
+        public override Task Cancel()
+        {
+            Canceled = true;
+            return base.Cancel();
+        }
+
+
+        public override int Execute(NodeParameters args)
+        {
+            Canceled = false;
+            string dest = DestinationPath;
+            if (string.IsNullOrEmpty(dest))
+            {
+                args.Logger.ELog("No destination specified");
+                args.Result = NodeResult.Failure;
+                return -1;
+            }
+            args.Result = NodeResult.Failure;
+
+            if (CopyFolder)
+                dest = Path.Combine(dest, args.RelativeFile);
+            else
+                dest = Path.Combine(dest, new FileInfo(args.FileName).Name);
+
+            var destDir = new FileInfo(dest).DirectoryName;
+            if (Directory.Exists(destDir) == false)
+                Directory.CreateDirectory(destDir);
+
+            // have to use file streams so we can report progress
+            int bufferSize = 1024 * 1024;
+
+            using (FileStream fsOut = new FileStream(dest, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite))
+            {
+                using (FileStream fsIn = new FileStream(args.WorkingFile, FileMode.Open, FileAccess.Read))
+                {
+                    try
+                    {
+                        long fileSize = fsIn.Length;
+                        fsOut.SetLength(fileSize);
+                        int bytesRead = -1;
+                        byte[] bytes = new byte[bufferSize];
+
+                        while ((bytesRead = fsIn.Read(bytes, 0, bufferSize)) > 0 && Canceled == false)
+                        {
+                            fsOut.Write(bytes, 0, bytesRead);
+                            float percent = fsOut.Position / fileSize * 100;
+                            if (percent > 100)
+                                percent = 100;
+                            args.PartPercentageUpdate(percent);
+                        }
+                        if (Canceled == false)
+                            args.PartPercentageUpdate(100);
+                    }
+                    catch (Exception ex)
+                    {
+                        args.Logger.ELog("Failed to move file: " + ex.Message + Environment.NewLine + ex.StackTrace);
+                        return -1;
+                    }
+                }
+            }
+
+            if (Canceled)
+            {
+                try
+                {
+                    System.IO.File.Delete(dest);
+                }
+                catch (Exception) { }
+                args.Logger.ELog("Action was canceled.");
+                return -1;
+            }
+            else
+            {
+                args.SetWorkingFile(dest);
+
+                return 0;
+            }
+        }
+    }
+}

Plugins/BasicNodes/File/MoveFile.cs

@@ -1,12 +1,58 @@
 namespace FileFlow.BasicNodes.File
 {
     using System.ComponentModel;
+    using System.Threading.Tasks;
     using FileFlow.Plugin;
     using FileFlow.Plugin.Attributes;
 
     public class MoveFile : Node
     {
+        public override int Inputs => 1;
         public override int Outputs => 1;
         public override FlowElementType Type => FlowElementType.Process;
+
+        [Folder(1)]
+        public string DestinationPath { get; set; }
+
+        [Boolean(2)]
+        public bool MoveFolder { get; set; }
+
+        public override int Execute(NodeParameters args)
+        {
+            string dest = DestinationPath;
+            if (string.IsNullOrEmpty(dest))
+            {
+                args.Logger.ELog("No destination specified");
+                args.Result = NodeResult.Failure;
+                return -1;
+            }
+            args.Result = NodeResult.Failure;
+
+            if (MoveFolder)
+                dest = Path.Combine(dest, args.RelativeFile);
+            else
+                dest = Path.Combine(dest, new FileInfo(args.FileName).Name);
+
+            var destDir = new FileInfo(dest).DirectoryName;
+            if (Directory.Exists(destDir) == false)
+                Directory.CreateDirectory(destDir);
+
+            long fileSize = new FileInfo(args.WorkingFile).Length;
+
+            Task task = Task.Run(() =>
+            {
+                System.IO.File.Move(args.WorkingFile, dest, true);
+            });
+
+            while (task.IsCompleted == false)
+            {
+                long currentSize = new FileInfo(dest).Length;
+                args.PartPercentageUpdate(currentSize / fileSize * 100);
+                System.Threading.Thread.Sleep(50);
+            }
+            args.PartPercentageUpdate(100);
+
+            return 0;
+        }
     }
 }