Minor code adjustments for HugeMemoryStream and StaticFileSystem MediaList.

Minor code adjustments for HugeMemoryStream and StaticFileSystem MediaList.

Author: GitHubProUser67

BackendServices/CyberBackendLibrary/HTTP/HugeMemoryStream.cs renamed to BackendServices/CyberBackendLibrary/Extension/HugeMemoryStream.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace CyberBackendLibrary.HTTP
+namespace CyberBackendLibrary.Extension
 {
     // This class removes the 2gb limit of the classic MemoryStream (but might consume more ram).
     public class HugeMemoryStream : Stream
@@ -25,32 +25,23 @@ public class HugeMemoryStream : Stream
 
         public HugeMemoryStream(Stream st)
         {
-            st.Position = 0;
             st.CopyTo(this);
-            st.Close();
-            st.Dispose();
-            Position = 0;
         }
 
         public HugeMemoryStream(Stream st, long BufferSize)
         {
             int bytesRead = 0;
-            byte[] buffer = new byte[BufferSize];
-
-            // Read from source and write to destination in chunks
-            while ((bytesRead = st.Read(buffer, 0, buffer.Length)) > 0)
+            Span<byte> buffer = new byte[BufferSize];
+            while ((bytesRead = st.Read(buffer)) > 0)
             {
-                Write(buffer, 0, bytesRead);
+                Write(buffer[..bytesRead]);
             }
-            st.Close();
-            st.Dispose();
-            Position = 0;
+            Flush();
         }
 
         public HugeMemoryStream(Span<byte> SpanToMem)
         {
             Write(SpanToMem);
-            Position = 0;
         }
 
         public HugeMemoryStream()
@@ -62,7 +53,7 @@ private int GetPageCount(long length)
         {
             int pageCount = (int)(length / PAGE_SIZE) + 1;
 
-            if ((length % PAGE_SIZE) == 0)
+            if (length % PAGE_SIZE == 0)
                 pageCount--;
 
             return pageCount;

BackendServices/CyberBackendLibrary/FileSystem/StaticFileSystem.cs

@@ -31,8 +31,11 @@ public static IEnumerable<FileSystemInfo> AllFilesAndFoldersLinq(this DirectoryI
 
         public static IEnumerable<string>? GetMediaFilesList(string directoryPath)
         {
+            // Define a set of valid extensions for media quick lookup
+            HashSet<string> validExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".mp3", ".aac", ".ts" };
+
             return Directory.EnumerateFiles(directoryPath, "*.*")
-            .Where(s => (s.ToLower().EndsWith(".mp3") || s.ToLower().EndsWith(".aac") || s.ToLower().EndsWith(".ts")) && !File.GetAttributes(s).HasFlag(FileAttributes.Hidden));
+                            .Where(s => validExtensions.Contains(Path.GetExtension(s)) && !File.GetAttributes(s).HasFlag(FileAttributes.Hidden));
         }
 
         public static string? GetM3UStreamFromDirectory(string directoryPath, string httpdirectoryrequest)

BackendServices/CyberBackendLibrary/HTTP/HTTPProcessor.cs

@@ -12,6 +12,7 @@
 using System.Text.RegularExpressions;
 using System.Web;
 using System.Threading;
+using CyberBackendLibrary.Extension;
 
 namespace CyberBackendLibrary.HTTP
 {

WebServers/HTTPSecureServerLite/LocalFileStreamHelper.cs

@@ -4,6 +4,7 @@
 using CyberBackendLibrary.HTTP;
 using System.IO;
 using System;
+using CyberBackendLibrary.Extension;
 
 namespace HTTPSecureServerLite
 {

WebServers/HTTPServer/HttpProcessor.cs

@@ -39,6 +39,7 @@
 using Newtonsoft.Json;
 using WebAPIService.UBISOFT.gsconnect;
 using CyberBackendLibrary.Crypto;
+using CyberBackendLibrary.Extension;
 
 namespace HTTPServer
 {
@@ -962,13 +963,15 @@ public void HandleClient(TcpClient tcpClient, ushort ListenerPort)
                                                                         if (vid != null && vid.Available && vid.VideoStream != null)
                                                                         {
                                                                             using HugeMemoryStream ms = new(vid.VideoStream, HTTPServerConfiguration.BufferSize);
+                                                                            vid.VideoStream.Close();
+                                                                            vid.VideoStream.Dispose();
+                                                                            ms.Position = 0;
                                                                             response = new(request.RetrieveHeaderValue("Connection") == "keep-alive")
                                                                             {
                                                                                 HttpStatusCode = Models.HttpStatusCode.OK
                                                                             };
                                                                             response.Headers.Add("Content-Type", vid.ContentType);
                                                                             response.Headers.Add("Content-Length", ms.Length.ToString());
-                                                                            ms.Flush();
                                                                         }
                                                                         else
                                                                             response = HttpBuilder.InternalServerError();

WebServers/HTTPServer/Models/HttpResponse.cs

@@ -1,5 +1,4 @@
 // Copyright (C) 2016 by Barend Erasmus and donated to the public domain
-using CyberBackendLibrary.HTTP;
 using HTTPServer.Extensions;
 using System;
 using System.Collections.Generic;
@@ -155,7 +154,14 @@ public static HttpResponse Send(Stream? streamtosend, string mimetype = "text/pl
                 if (streamtosend.CanSeek)
                     response.ContentStream = streamtosend;
                 else
-                    response.ContentStream = new HugeMemoryStream(streamtosend, HTTPServerConfiguration.BufferSize);
+                {
+                    response.ContentStream = new CyberBackendLibrary.Extension.HugeMemoryStream(streamtosend, HTTPServerConfiguration.BufferSize)
+                    {
+                        Position = 0
+                    };
+                    streamtosend.Close();
+                    streamtosend.Dispose();
+                }
             }
             else
                 response.ContentStream = null;