Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Simplify files etag calculation

Browse Source
This commit is contained in:
David Montesinos
2025-04-21 18:44:16 +02:00
parent 430f83e8e9
commit d888d83a98
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Oqtane.Server/Pages/Files.cshtml.cs
View File

@ -133,19 +133,10 @@ namespace Oqtane.Pages
} }
} }
string etag; string etag = Convert.ToString(file.ModifiedOn.Ticks ^ file.Size, 16);
string downloadName = file.Name; string downloadName = file.Name;
string filepath = _files.GetFilePath(file); string filepath = _files.GetFilePath(file);
if (Request.QueryString.HasValue)
{
etag = Utilities.GenerateSimpleHash16($"{file.ModifiedOn.Ticks}:{file.Size}:{Request.QueryString.Value}");
}
else
{
etag = Convert.ToString(file.ModifiedOn.Ticks ^ file.Size, 16);
}
var header = ""; var header = "";
if (HttpContext.Request.Headers.TryGetValue(HeaderNames.IfNoneMatch, out var ifNoneMatch)) if (HttpContext.Request.Headers.TryGetValue(HeaderNames.IfNoneMatch, out var ifNoneMatch))
{ {

13
Oqtane.Shared/Shared/Utilities.cs
View File

@ -620,19 +620,6 @@ namespace Oqtane.Shared
} }
} }
public static string GenerateSimpleHash16(string text)
{
unchecked // prevent overflow exception
{
long hash = 23;
foreach (char c in text)
{
hash = hash * 31 + c;
}
return hash.ToString("X16");
}
}
[Obsolete("ContentUrl(Alias alias, int fileId) is deprecated. Use FileUrl(Alias alias, int fileId) instead.", false)] [Obsolete("ContentUrl(Alias alias, int fileId) is deprecated. Use FileUrl(Alias alias, int fileId) instead.", false)]
public static string ContentUrl(Alias alias, int fileId) public static string ContentUrl(Alias alias, int fileId)
{ {