FFMpeg path configuration removed. (Must be in the path variable now)…

… Json settings for core tests.
TheNetStriker · Dec 10, 2019 · 29f8e81 · 29f8e81
1 parent 4dcd5e4
commit 29f8e81
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 42 deletions.
diff --git a/IDBrowserServiceCore/Code/StaticFunctions.cs b/IDBrowserServiceCore/Code/StaticFunctions.cs
@@ -189,7 +189,7 @@ public static void Resize(MagickImage image, int width, int height)
             }
         }
 
-        public async static Task<string> TranscodeVideo(string filePath, string guid, string transcodeDirectory, string ffmpegPath, string videosize)
+        public async static Task<string> TranscodeVideo(string filePath, string guid, string transcodeDirectory, string videosize)
         {
             string strTranscodeDirectory = Path.Combine(transcodeDirectory, videosize, guid.Substring(0, 2));
             string strTranscodeFilePath = Path.Combine(strTranscodeDirectory, guid + ".mp4");
@@ -208,7 +208,7 @@ public async static Task<string> TranscodeVideo(string filePath, string guid, st
                     VideoSize = videoSize
                 };
 
-                var ffmpeg = new Engine(ffmpegPath);
+                var ffmpeg = new Engine();
                 await ffmpeg.ConvertAsync(inputFile, outputFile, conversionOptions);
             }
 

diff --git a/IDBrowserServiceCore/Controllers/MediaController.cs b/IDBrowserServiceCore/Controllers/MediaController.cs
@@ -29,21 +29,15 @@ public class MediaController : Controller
         private readonly IDImagerDB db;
         private readonly ILogger<ValuesController> logger;
         private readonly IDiagnosticContext diagnosticContext;
-        private readonly IConfiguration configuration;
         private readonly ServiceSettings serviceSettings;
 
-        private readonly string ffmpegPath;
-
-        public MediaController(IDImagerDB db, IConfiguration configuration, IOptions<ServiceSettings> serviceSettings,
+        public MediaController(IDImagerDB db, IOptions<ServiceSettings> serviceSettings,
             ILogger<ValuesController> logger, IDiagnosticContext diagnosticContext)
         {
             this.db = db ?? throw new ArgumentNullException(nameof(logger));
-            this.configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
             this.serviceSettings = serviceSettings.Value ?? throw new ArgumentNullException(nameof(serviceSettings));
             this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
             this.diagnosticContext = diagnosticContext ?? throw new ArgumentNullException(nameof(diagnosticContext));
-
-            this.ffmpegPath = configuration.GetValue<string>("FFMpegPath");
         }
 
         [HttpGet]
@@ -68,7 +62,7 @@ public async Task<IActionResult> Play(string guid, string videosize)
                         return BadRequest("Missing TranscodeDirectory setting");
 
                     string strTranscodeFilePath = await StaticFunctions.TranscodeVideo(strFilePath, guid,
-                        serviceSettings.TranscodeDirectory, ffmpegPath, videosize);
+                        serviceSettings.TranscodeDirectory, videosize);
 
                     strFilePath = strTranscodeFilePath;
                     mimeType = "video/mp4";

diff --git a/IDBrowserServiceCore/appsettings.Development.json b/IDBrowserServiceCore/appsettings.Development.json
@@ -1,5 +1,4 @@
 {
-  "FFMpegPath": "D:\\Temp\\Transcode\\ffmpeg.exe",
   "Sites": {
     "mad": {
       "ServiceSettings": {
@@ -9,7 +8,7 @@
             "PathReplace": "\\\\172.17.2.14\\Multimedia"
           }
         ],
-        "TranscodeDirectory": "\\\\QNAPNAS01\\Multimedia\\VideoTranscode\\mad"
+        "TranscodeDirectory": "D:\\Temp\\Transcode\\mad"
       }
     },
     "maw": {
@@ -20,7 +19,7 @@
             "PathReplace": "\\\\172.17.2.14\\Multimedia"
           }
         ],
-        "TranscodeDirectory": "\\\\QNAPNAS01\\Multimedia\\VideoTranscode\\maw"
+        "TranscodeDirectory": "D:\\Temp\\Transcode\\maw"
       }
     }
   },

diff --git a/IDBrowserServiceCore/appsettings.json b/IDBrowserServiceCore/appsettings.json
@@ -1,6 +1,5 @@
 {
   "urls": "http://172.17.2.17:5000",
-  "FFMpegPath": "/usr/bin/ffmpeg",
   "Sites": {
     "mad": {
       "ConnectionStrings": {

diff --git a/IDBrowserServiceCoreTest/IDBrowserServiceCoreTest.csproj b/IDBrowserServiceCoreTest/IDBrowserServiceCoreTest.csproj
@@ -6,11 +6,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="appsettings.Development.json" />
-    <None Remove="appsettings.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="appsettings.Development.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/IDBrowserServiceCoreTest/Properties/launchSettings.json b/IDBrowserServiceCoreTest/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "IDBrowserServiceCoreTest": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/IDBrowserServiceCoreTest/UnitTest1.cs b/IDBrowserServiceCoreTest/UnitTest1.cs
@@ -63,29 +63,52 @@ public UnitTest1()
             }
         }
 
+        private IConfiguration configuration;
+        public IConfiguration Configuration
+        {
+            get
+            {
+                if (configuration == null)
+                {
+                    configuration = new ConfigurationBuilder()
+                        .SetBasePath(Directory.GetCurrentDirectory())
+                        .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                        .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true)
+                        .AddEnvironmentVariables()
+                        .Build();
+                }
+
+                return configuration;
+            }
+        }
+
+        private IConfigurationSection settingsSection;
+        public IConfigurationSection SettingsSection
+        {
+            get
+            {
+                if (settingsSection == null)
+                {
+                    settingsSection = Configuration
+                        .GetSection("Sites")
+                        .GetChildren()
+                        .First()
+                        .GetSection("ServiceSettings");
+                }
+
+                return settingsSection;
+            }
+        }
+
         private ServiceSettings settings;
         public ServiceSettings Settings
         {
             get
             {
                 if (settings == null)
                 {
-                    settings = new ServiceSettings()
-                    {
-                        CreateThumbnails = true,
-                        MThumbmailWidth = 1680,
-                        MThumbnailHeight = 1260,
-                        KeepAspectRatio = true,
-                        SetGenericVideoThumbnailOnError = true,
-                    };
-
-                    FilePathReplaceSettings filePathReplaceSettings = new FilePathReplaceSettings()
-                    {
-                        PathMatch = "\\\\QNAPNAS01\\Multimedia",
-                        PathReplace = "\\\\172.17.2.14\\Multimedia"
-                    };
-
-                    settings.FilePathReplace.Add(filePathReplaceSettings);
+                    settings = new ServiceSettings();
+                    SettingsSection.Bind(settings);
                 }
 
                 return settings;
@@ -204,13 +227,12 @@ public ServiceProvider ServiceProvider
                            .ReplaceService<ISqlGenerationHelper, PostgresSqlGenerationHelper>())
                        .AddDbContextPool<IDImagerThumbsDB>(options => options.UseNpgsql(DbThumbsConnectionString)
                            .ReplaceService<ISqlGenerationHelper, PostgresSqlGenerationHelper>())
-                       .AddSingleton<IOptions<ServiceSettings>>(Options.Create<ServiceSettings>(Settings))
+                       .Configure<ServiceSettings>(SettingsSection)
                        .AddSingleton<ILoggerFactory>(services => new SerilogLoggerFactory(Logger, false))
                        .AddSingleton<ILogger<ValuesController>>(loggerFactory.CreateLogger<ValuesController>())
                        .AddSingleton<ILogger<MediaController>>(loggerFactory.CreateLogger<MediaController>())
                        .AddSingleton(diagnosticContext)
                        .AddSingleton<IDiagnosticContext>(diagnosticContext)
-                       .AddSingleton<IConfiguration>(Configuration)
                        .AddTransient<ValuesController, ValuesController>()
                        .AddTransient<MediaController, MediaController>();
 
@@ -388,5 +410,14 @@ public async void MediaControllerPlayTest()
             else
                 stream.FileStream.Close();
         }
+
+        [Fact]
+        public async void MediaControllerPlayTranscodeTest()
+        {
+            if (!(await MediaController.Play(idCatalogItemFirstVideo.GUID, "Hd480") is FileStreamResult stream))
+                throw new Exception("No stream received");
+            else
+                stream.FileStream.Close();
+        }
     }
 }
diff --git a/IDBrowserServiceCoreTest/appsettings.Development.json b/IDBrowserServiceCoreTest/appsettings.Development.json
@@ -1,5 +1,4 @@
 {
-  "FFMpegPath": "D:\\Temp\\Transcode\\ffmpeg.exe",
   "Sites": {
     "mad": {
       "ServiceSettings": {
@@ -9,7 +8,7 @@
             "PathReplace": "\\\\172.17.2.14\\Multimedia"
           }
         ],
-        "TranscodeDirectory": "\\\\QNAPNAS01\\Multimedia\\VideoTranscode\\mad"
+        "TranscodeDirectory": "D:\\Temp\\Transcode\\mad"
       }
     },
     "maw": {
@@ -20,7 +19,7 @@
             "PathReplace": "\\\\172.17.2.14\\Multimedia"
           }
         ],
-        "TranscodeDirectory": "\\\\QNAPNAS01\\Multimedia\\VideoTranscode\\maw"
+        "TranscodeDirectory": "D:\\Temp\\Transcode\\maw"
       }
     }
   },

diff --git a/IDBrowserServiceCoreTest/appsettings.json b/IDBrowserServiceCoreTest/appsettings.json
@@ -1,6 +1,5 @@
 {
   "urls": "http://172.17.2.17:5000",
-  "FFMpegPath": "/usr/bin/ffmpeg",
   "Sites": {
     "mad": {
       "ConnectionStrings": {

diff --git a/ManagementConsole/Program.cs b/ManagementConsole/Program.cs
@@ -46,7 +46,7 @@ static void Main(string[] args)
             {
                 String strFilePath = StaticFunctions.GetImageFilePath(catalogItem, null);
                 string strTranscodedFile = StaticFunctions.TranscodeVideo(strFilePath, catalogItem.GUID,
-                    strTranscodeDirectory, null, strVideoSize).Result;
+                    strTranscodeDirectory, strVideoSize).Result;
 
                 intCounter++;