Search path

src/OpenHdWebUi.Server/Configuration/ServiceConfiguration.cs

@@ -7,7 +7,7 @@ namespace OpenHdWebUi.Server.Configuration;
 [UsedImplicitly]
 public class ServiceConfiguration
 {
-    public string FilesFolder { get; set; }
+    public List<string> FilesFolders { get; set; }
 
     public List<SystemCommandConfiguration> SystemCommands { get; set; }
 

src/OpenHdWebUi.Server/Program.cs

@@ -44,17 +44,18 @@ public static async Task Main(string[] args)
         app.UseDefaultFiles();
         app.MapStaticAssets();
 
-        var config = app.Services.GetRequiredService<IOptions<ServiceConfiguration>>().Value;
-        var absoluteMediaPath = Path.GetFullPath(config.FilesFolder);
-        FileSystemHelpers.EnsureFolderCreated(absoluteMediaPath);
-
-        app.UseStaticFiles(new StaticFileOptions
+        var mediaService = app.Services.GetRequiredService<MediaService>();
+        var absoluteMediaPath = mediaService.MediaDirectoryFullPath;
+        if (absoluteMediaPath != null)
         {
-            FileProvider = new PhysicalFileProvider(absoluteMediaPath),
-            RequestPath = "/media",
-            ServeUnknownFileTypes = true,
-            ContentTypeProvider = new FileExtensionContentTypeProvider(new Dictionary<string, string>{{".mkv", "video/x-matroska" } })
-        });
+            app.UseStaticFiles(new StaticFileOptions
+            {
+                FileProvider = new PhysicalFileProvider(absoluteMediaPath),
+                RequestPath = "/media",
+                ServeUnknownFileTypes = true,
+                ContentTypeProvider = new FileExtensionContentTypeProvider(new Dictionary<string, string> { { ".mkv", "video/x-matroska" } })
+            });
+        }
 
         //app.UseRouting();
         app.MapControllers();

src/OpenHdWebUi.Server/Services/Media/MediaService.cs

@@ -12,13 +12,18 @@ public MediaService(
         ILogger<MediaService> logger)
     {
         _logger = logger;
-        MediaDirectoryFullPath = Path.GetFullPath(configuration.Value.FilesFolder);
+        MediaDirectoryFullPath = GetVideoFolderPath(configuration.Value.FilesFolders);
     }
 
-    public string MediaDirectoryFullPath { get; }
+    public string? MediaDirectoryFullPath { get; }
 
     public string[] GetMediaFilesPaths()
     {
+        if (MediaDirectoryFullPath == null)
+        {
+            return [];
+        }
+
         return Directory.GetFiles(MediaDirectoryFullPath, "*.mkv")
             .Concat(Directory.GetFiles(MediaDirectoryFullPath, "*.mp4"))
             .Concat(Directory.GetFiles(MediaDirectoryFullPath, "*.avi"))
@@ -27,10 +32,30 @@ public string[] GetMediaFilesPaths()
 
     public void DeleteFile(string fileName)
     {
+        _logger.LogInformation("Deleting file {FileName}", fileName);
+        if (MediaDirectoryFullPath == null)
+        {
+            return;
+        }
+
         var fullFilePath = Path.Combine(MediaDirectoryFullPath, fileName);
         if (Path.Exists(fullFilePath))
         {
             File.Delete(fullFilePath);
         }
     }
+
+    private static string? GetVideoFolderPath(List<string> configFilesFolder)
+    {
+        foreach (var path in configFilesFolder)
+        {
+            var fullPath = Path.GetFullPath(path);
+            if (Directory.Exists(fullPath))
+            {
+                return fullPath;
+            }
+        }
+
+        return null;
+    }
 }

src/OpenHdWebUi.Server/appsettings.Development.json

@@ -7,5 +7,9 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "FilesFolder": "C:\\testData\\media"
+  "FilesFolders": [
+    "/home/openhd/Videos/",
+    "/Videos",
+    "C:\\testData\\media"
+  ]
 }

src/OpenHdWebUi.Server/appsettings.json

@@ -7,7 +7,10 @@
     }
   },
   "AllowedHosts": "*",
-  "FilesFolder": "/home/openhd/Videos/",
+  "FilesFolders": [
+    "/home/openhd/Videos/",
+    "/Videos"
+  ],
   "SystemCommands": [
     {
       "Id": "sys-res-opendh",