Merge pull request #195 from TechnologyEnhancedLearning/Develop/Fixes/TD-3881

TD-3881 stream audio or video file content within html resource

Author: OluwatobiAwe

LearningHub.Nhs.WebUI/Controllers/ResourceController.cs

@@ -486,15 +486,24 @@ public async Task<IActionResult> HtmlResourceContent(int resourceReferenceId, st
                 contentType = "text/html";
             }
 
-            var file = await this.fileService.DownloadFileAsync(contentFilePath, path);
-            if (file != null)
+            if (contentType.Contains("video") || contentType.Contains("audio"))
             {
-                return this.File(file.Content, contentType);
+                var stream = await this.fileService.StreamFileAsync(contentFilePath, path);
+                if (stream != null)
+                {
+                    return this.File(stream, contentType, enableRangeProcessing: true);
+                }
             }
             else
             {
-                return this.Ok(this.Content("No file found"));
+                var file = await this.fileService.DownloadFileAsync(contentFilePath, path);
+                if (file != null)
+                {
+                    return this.File(file.Content, contentType);
+                }
             }
+
+            return this.Ok(this.Content("No file found"));
         }
     }
 }

LearningHub.Nhs.WebUI/Interfaces/IFileService.cs

@@ -29,6 +29,14 @@ public interface IFileService
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
         Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName);
 
+        /// <summary>
+        /// The StreamFileAsync.
+        /// </summary>
+        /// <param name="filePath">The filePath.</param>
+        /// <param name="fileName">The fileName.</param>
+        /// <returns>The <see cref="Task{Stream}"/>.</returns>
+        Task<Stream> StreamFileAsync(string filePath, string fileName);
+
         /// <summary>
         /// The ProcessFile.
         /// </summary>

LearningHub.Nhs.WebUI/Services/FileService.cs

@@ -98,6 +98,29 @@ public async Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, stri
             return null;
         }
 
+        /// <summary>
+        /// The StreamFileAsync.
+        /// </summary>
+        /// <param name="filePath">The filePath.</param>
+        /// <param name="fileName">The fileName.</param>
+        /// <returns>The <see cref="Task{Stream}"/>.</returns>
+        public async Task<Stream> StreamFileAsync(string filePath, string fileName)
+        {
+            var directory = this.ShareClient.GetDirectoryClient(filePath);
+
+            if (await directory.ExistsAsync())
+            {
+                var file = directory.GetFileClient(fileName);
+
+                if (await file.ExistsAsync())
+                {
+                    return await file.OpenReadAsync();
+                }
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// The ProcessFile.
         /// </summary>