Update SiteRequest

Author: Meyn

DownloadAssistant/Base/HttpClient.cs

@@ -21,6 +21,7 @@ public static HttpClient HttpClient
                     lock (_lockObject) _httpClient ??= CreateHttpClient();
                 return _httpClient;
             }
+            set => _httpClient = value;
         }
 
         private static HttpClient CreateHttpClient()

DownloadAssistant/Base/HttpGet.cs

@@ -39,7 +39,6 @@ public LoadRange Range
         /// </summary>
         public CancellationToken Token { get; init; }
 
-
         /// <summary>
         /// Gets the exception if the HEAD request failed.
         /// </summary>
@@ -103,25 +102,55 @@ private long LoadContentLength()
             catch (Exception ex)
             {
                 HeadRequestException = new NotSupportedException("The length of the content could not be loaded, because the requested server does not support this function.", ex);
-                Debug.Assert(false, ex.Message);
+                Debug.Fail(ex.Message);
             }
             if (!Range.IsEmpty && length > 0)
                 SetRange(length);
             return length;
         }
 
         /// <summary>
-        /// Retrieves the content length from the server.
+        /// Retrieves content length with HEAD request fallback to partial GET
         /// </summary>
         /// <returns>The content length.</returns>
-        private long GetContentLength()
+        private long GetContentLength() => GetContentLengthViaHead() ?? GetContentLengthViaPartialGet() ?? 0;
+
+        /// <summary>
+        /// Gets content length using HEAD request
+        /// </summary>
+        private long? GetContentLengthViaHead()
         {
-            HttpRequestMessage msg = CloneRequestMessage(_originalMessage);
-            msg.Method = HttpMethod.Head;
-            HttpResponseMessage res = HttpClient.Send(msg, TimedTokenOrDefault());
-            if (res.IsSuccessStatusCode)
-                return res.Content.Headers.ContentLength ?? 0;
-            return 0;
+            try
+            {
+                using HttpRequestMessage msg = CloneRequestMessage(_originalMessage);
+                msg.Method = HttpMethod.Head;
+                using HttpResponseMessage response = HttpClient.Send(msg, TimedTokenOrDefault());
+                response.EnsureSuccessStatusCode();
+                return response.Content.Headers.ContentLength ?? response.Content.Headers.ContentRange?.Length;
+            }
+            catch { return null; }
+        }
+
+        /// <summary>
+        /// Gets content length using range request fallback
+        /// </summary>
+
+        private long? GetContentLengthViaPartialGet()
+        {
+            LoadRange originalRange = _range;
+            try
+            {
+                _range = new LoadRange(0, 0);
+                using HttpRequestMessage msg = CloneRequestMessage(_originalMessage);
+                msg.Headers.Range = new RangeHeaderValue(0, 0);
+
+                using HttpResponseMessage response = HttpClient.Send(msg, TimedTokenOrDefault());
+                response.EnsureSuccessStatusCode();
+
+                return response.Content.Headers.ContentRange?.Length ?? response.Content.Headers.ContentLength;
+            }
+            catch { return null; }
+            finally { _range = originalRange; }
         }
 
         /// <summary>
@@ -130,6 +159,8 @@ private long GetContentLength()
         /// <returns>The response message.</returns>
         public async Task<HttpResponseMessage> LoadResponseAsync()
         {
+            if (_disposed)
+                throw new ObjectDisposedException(GetType().FullName);
             if (!IsLengthSet(out HttpResponseMessage res))
                 return res;
 

DownloadAssistant/Base/UserAgentBuilder.cs

@@ -25,10 +25,7 @@ public static string Generate()
         /// <param name="architecture">System architecture information</param>
         /// <param name="deviceModel">Device model information (optional)</param>
         /// <returns>Complete User-Agent string with all placeholders replaced</returns>
-        private static string ComposeUserAgent(
-            PlatformTemplate template,
-            string architecture,
-            string deviceModel = "")
+        private static string ComposeUserAgent(PlatformTemplate template, string architecture, string deviceModel = "")
         {
             const string chromeVersion = "124.0.6367.79";
             const string webKitToken = "AppleWebKit/537.36 (KHTML, like Gecko)";
@@ -55,14 +52,11 @@ private static string ComposeUserAgent(
         /// <param name="format">String containing placeholders</param>
         /// <param name="values">Dictionary of placeholder-value pairs</param>
         /// <returns>Formatted string with replaced values</returns>
-        private static string ReplaceNamedPlaceholders(
-            string format,
-            IReadOnlyDictionary<string, object> values)
+        private static string ReplaceNamedPlaceholders(string format, IReadOnlyDictionary<string, object> values)
         {
             foreach (KeyValuePair<string, object> kvp in values)
-            {
                 format = format.Replace(kvp.Key, kvp.Value.ToString() ?? string.Empty);
-            }
+
             return format;
         }
 
@@ -79,9 +73,7 @@ private record PlatformTemplate(string FormatString, Version OsVersion);
         /// <param name="osPlatform">Target operating system platform</param>
         /// <param name="osVersion">Operating system version</param>
         /// <returns>Platform-specific User-Agent template</returns>
-        private static PlatformTemplate GetPlatformTemplate(
-            OSPlatform osPlatform,
-            Version osVersion)
+        private static PlatformTemplate GetPlatformTemplate(OSPlatform osPlatform, Version osVersion)
         {
             Dictionary<OSPlatform, Func<Version, PlatformTemplate>> templates = new()
             {
@@ -174,17 +166,13 @@ private static (OSPlatform Platform, Version Version) GetOSInfo()
         /// Determines if the current OS is Android
         /// </summary>
         /// <returns>True if running on Android, false otherwise</returns>
-        private static bool IsAndroid() =>
-            RuntimeInformation.OSDescription.Contains("Android", StringComparison.OrdinalIgnoreCase) ||
-            Environment.OSVersion.VersionString.Contains("Android");
+        private static bool IsAndroid() => RuntimeInformation.OSDescription.Contains("Android", StringComparison.OrdinalIgnoreCase) || Environment.OSVersion.VersionString.Contains("Android");
 
         /// <summary>
         /// Determines if the current OS is Tizen
         /// </summary>
         /// <returns>True if running on Tizen, false otherwise</returns>
-        private static bool IsTizen() =>
-            RuntimeInformation.OSDescription.Contains("Tizen", StringComparison.OrdinalIgnoreCase) ||
-            Environment.OSVersion.VersionString.Contains("Tizen");
+        private static bool IsTizen() => RuntimeInformation.OSDescription.Contains("Tizen", StringComparison.OrdinalIgnoreCase) || Environment.OSVersion.VersionString.Contains("Tizen");
 
         /// <summary>
         /// Attempts to retrieve the Android device model

DownloadAssistant/DownloadAssistant.csproj

@@ -10,7 +10,7 @@
     <PackageProjectUrl></PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <Version>1.0.9</Version>
+    <Version>1.1.0</Version>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <Description>A free to use library as a download manager.
 Includes retry, priority, cancel, etc.. function.
@@ -26,7 +26,10 @@ Features:
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Company>Shard</Company>
     <Authors>Meyn</Authors>
-    <PackageReleaseNotes>Improved handling and falback for retrieving Downloads folder path on Windows</PackageReleaseNotes>
+    <PackageReleaseNotes>Easier access to individual progress and speed reporter
+Update HttpClient and User Agent Generation
+Enhance StatusRequest to Parse Additional Data
+Update SiteRequest</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/TypNull/DownloadAssistant</RepositoryUrl>
   </PropertyGroup>
 
@@ -49,6 +52,21 @@ Features:
     <PackageReference Include="Shard.Requests" Version="2.2.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Media\MimeTypes.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>MimeTypes.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Media\MimeTypes.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>MimeTypes.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="logo.png">
       <Pack>True</Pack>

DownloadAssistant/Media/FileMetadata.cs …loadAssistant/Media/FileNameExtractor.csDownloadAssistant/Media/FileMetadata.cs renamed to DownloadAssistant/Media/FileNameExtractor.cs DownloadAssistant/Media/FileMetadata.cs renamed to DownloadAssistant/Media/FileNameExtractor.cs

@@ -6,23 +6,26 @@
 namespace DownloadAssistant.Media
 {
     /// <summary>
-    /// Provides file metadata extraction and sanitization capabilities for downloaded content.
+    /// Provides file name extraction and sanitization capabilities for downloaded content.
     /// </summary>
-    public class FileMetadata
+    public class FileNameExtractor
+
     {
         private readonly HttpContentHeaders _headers;
         private readonly Uri _uri;
 
         private static readonly string[] DispositionHeaders = { /* IETF Standard */ "Content-Disposition", "X-Content-Disposition" };
 
-        private static readonly string[] FilenameHeaders ={ 
+        private static readonly string[] FilenameHeaders =
+        { 
             /* Cloud Provider Headers */  "X-Amz-Meta-Filename", "x-ms-meta-Filename", "X-Google-Filename",   
             /* Framework Headers */ "X-Django-FileName", "X-File-Key",    
             /* CDN/Proxy Headers */ "X-Original-Filename", "X-Source-Filename",
             /* Common Industry Headers */ "X-Filename","X-File-Name", "X-Object-Name"
         };
 
-        private static readonly string[] RedirectHeaders = { 
+        private static readonly string[] RedirectHeaders =
+        { 
             /* RFC 7231 Standard */ "Location",
             /* Nginx */ "X-Accel-Redirect",
             /* Apache */ "X-Sendfile"
@@ -57,7 +60,7 @@ public class FileMetadata
         /// </summary>
         /// <param name="headers">HTTP content headers from the response.</param>
         /// <param name="uri">Source URI of the downloaded content.</param>
-        public FileMetadata(HttpContentHeaders headers, Uri uri)
+        public FileNameExtractor(HttpContentHeaders headers, Uri uri)
         {
             _headers = headers;
             _uri = uri;
@@ -68,12 +71,8 @@ public FileMetadata(HttpContentHeaders headers, Uri uri)
         /// <summary>
         /// Determines the file extension from Content-Type header or URI path.
         /// </summary>
-        private void SetExtension()
-        {
-            Extension = _headers.ContentType?.MediaType != null
-                ? MimeTypeMap.GetDefaultExtension(_headers.ContentType.MediaType)
-                : Path.GetExtension(_uri.AbsoluteUri);
-        }
+        private void SetExtension() => Extension = _headers.ContentType?.MediaType != null ? MimeTypeMap.GetDefaultExtension(_headers.ContentType.MediaType) : Path.GetExtension(_uri.AbsoluteUri);
+
 
         /// <summary>
         /// Main filename determination workflow with fallback strategies.
@@ -155,14 +154,12 @@ private void SetFilename()
         /// Coordinates multiple alternate filename discovery strategies.
         /// </summary>
         /// <returns>Valid filename or null if not found.</returns>
-        private string? GetFilenameFromAlternateSources()
-        {
-            return ExtractFromQueryParameters()
+        private string? GetFilenameFromAlternateSources() => ExtractFromQueryParameters()
                    ?? ExtractFromContentHeaders()
                    ?? ExtractFromRedirectHeaders()
                    ?? ExtractFromCustomHeaders()
                    ?? ExtractFromContentType();
-        }
+
 
         /// <summary>
         /// Extracts filename from content-related headers (Content-Location, etc.).
@@ -243,7 +240,7 @@ private void SetFilename()
                     return Path.GetFileName(decoded).Trim();
                 }
             }
-            catch { /* Log error if needed */ }
+            catch { }
             return null;
         }
 
@@ -301,9 +298,7 @@ private string SanitizeFilename(string fileName)
             string baseName = Path.GetFileNameWithoutExtension(cleanName);
 
             int allowedBaseLength = maxLength - extension.Length;
-            return allowedBaseLength <= 0
-                ? cleanName[..maxLength]
-                : $"{baseName[..allowedBaseLength]}{extension}";
+            return allowedBaseLength <= 0 ? cleanName[..maxLength] : $"{baseName[..allowedBaseLength]}{extension}";
         }
 
         /// <summary>