Compare commits

..

14 Commits

Author SHA1 Message Date
Tsubasahane
9971b14177 Share Location 2025-12-27 19:52:28 +08:00
d39a922482 Merge pull request 'Trying a different method of setting access time.' (#48) from cache-test-fix into master
Reviewed-on: #48
2025-12-23 17:14:08 +00:00
6216664e18 Merge branch 'master' into cache-test-fix 2025-12-23 17:12:45 +00:00
54992234d5 Merge pull request 'disable-chat-groups' (#45) from disable-chat-groups into master
Reviewed-on: #45
2025-12-23 16:55:33 +00:00
90e81fb955 Merge branch 'master' into disable-chat-groups 2025-12-23 16:55:21 +00:00
defnotken
4012b33f98 Trying a different method of setting access time. 2025-12-23 10:36:38 -06:00
33fb6ba2eb Merge pull request 'Done same for user' (#47) from fix-profile-hide into master
Reviewed-on: #47
2025-12-22 20:31:36 +00:00
5b5f8edc3b Merge pull request 'Removed code that would prevent changes on disabled profile.' (#46) from fix-profile-hide into master
Reviewed-on: #46
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>
2025-12-22 14:53:52 +00:00
defnotken
4ec6169ebd fix context 2025-12-21 21:02:59 -06:00
defnotken
ec26abaeb5 Revert "Merge pull request 'revert ce9b94a534c1239b4b89c4ccf05354c477da49d9' (#44) from defnotken-patch-1 into master"
This reverts commit 76bdbe28da, reversing
changes made to ce9b94a534.
2025-12-21 21:00:53 -06:00
3350f2ebf6 Merge branch 'master' into disable-chat-groups 2025-12-22 02:57:55 +00:00
defnotken
670e0e01f1 Merge branch 'disable-chat-groups' of https://git.lightless-sync.org/Lightless-Sync/LightlessServer into disable-chat-groups 2025-12-21 20:48:22 -06:00
defnotken
12d51dc689 Generate migration 2025-12-21 20:48:07 -06:00
defnotken
860bc955a4 Generate migration 2025-12-21 20:43:24 -06:00
19 changed files with 1617 additions and 46 deletions

3
.gitignore vendored
View File

@@ -350,4 +350,5 @@ MigrationBackup/
.ionide/
# docker run data
Docker/run/data/
Docker/run/data/
*.idea

View File

@@ -41,8 +41,10 @@ public partial class LightlessHub
var groupInfos = await DbContext.Groups
.AsNoTracking()
.Where(g => g.OwnerUID == userUid
.Where(g => g.ChatEnabled
&& (g.OwnerUID == userUid
|| DbContext.GroupPairs.Any(p => p.GroupGID == g.GID && p.GroupUserUID == userUid))
)
.ToListAsync()
.ConfigureAwait(false);
@@ -162,6 +164,13 @@ public partial class LightlessHub
throw new HubException("Unsupported chat channel.");
}
if (!group.ChatEnabled)
{
TryInvokeChatService(() => _chatChannelService.RemovePresence(UserUID, channel), "removing chat presence", channel);
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Warning, "This Syncshell chat is disabled.").ConfigureAwait(false);
return;
}
var isMember = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal)
|| await DbContext.GroupPairs
.AsNoTracking()
@@ -207,6 +216,23 @@ public partial class LightlessHub
var channel = request.Channel.WithNormalizedCustomKey();
if (channel.Type == ChatChannelType.Group)
{
var groupId = channel.CustomKey ?? string.Empty;
var chatEnabled = !string.IsNullOrEmpty(groupId) && await DbContext.Groups
.AsNoTracking()
.Where(g => g.GID == groupId)
.Select(g => g.ChatEnabled)
.SingleOrDefaultAsync(RequestAbortedToken)
.ConfigureAwait(false);
if (!chatEnabled)
{
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Warning, "This Syncshell chat is disabled.").ConfigureAwait(false);
return;
}
}
if (await HandleIfChatBannedAsync(UserUID).ConfigureAwait(false))
{
throw new HubException("Chat access has been revoked.");

View File

@@ -40,5 +40,6 @@ namespace LightlessSyncServer.Hubs
public Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
public Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
public Task Client_ChatReceive(ChatMessageDto message) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
public Task Client_SendLocationToClient(LocationDto locationDto) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
}
}

View File

@@ -585,6 +585,11 @@ public partial class LightlessHub
return await result.Distinct().AsNoTracking().ToListAsync().ConfigureAwait(false);
}
private async Task CleanVisibilityCacheFromRedis()
{
await _redis.RemoveAsync($"Visibility:{UserUID}", CommandFlags.FireAndForget).ConfigureAwait(false);
}
public record UserInfo(
string Alias,

View File

@@ -1,6 +1,7 @@
using LightlessSync.API.Data;
using LightlessSync.API.Data.Enum;
using LightlessSync.API.Data.Extensions;
using LightlessSync.API.Dto.Chat;
using LightlessSync.API.Dto.Group;
using LightlessSync.API.Dto.User;
using LightlessSyncServer.Models;
@@ -11,10 +12,8 @@ using LightlessSyncShared.Utils;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.SignalR;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json.Linq;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
using System.Reflection;
using System.Collections.Concurrent;
using System.Security.Cryptography;
namespace LightlessSyncServer.Hubs;
@@ -52,6 +51,8 @@ public partial class LightlessHub
_logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
}
private static readonly ConcurrentDictionary<string, DateTime> GroupChatToggleCooldowns = new(StringComparer.Ordinal);
[Authorize(Policy = "Identified")]
public async Task GroupChangeGroupPermissionState(GroupPermissionDto dto)
{
@@ -60,15 +61,73 @@ public partial class LightlessHub
var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
if (!hasRights) return;
group.InvitesEnabled = !dto.Permissions.HasFlag(GroupPermissions.DisableInvites);
group.PreferDisableSounds = dto.Permissions.HasFlag(GroupPermissions.PreferDisableSounds);
group.PreferDisableAnimations = dto.Permissions.HasFlag(GroupPermissions.PreferDisableAnimations);
group.PreferDisableVFX = dto.Permissions.HasFlag(GroupPermissions.PreferDisableVFX);
var permissions = dto.Permissions;
var isOwner = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal);
var chatEnabled = group.ChatEnabled;
var chatChanged = false;
if (!isOwner)
{
permissions.SetDisableChat(!group.ChatEnabled);
}
else
{
var requestedChatEnabled = !permissions.IsDisableChat();
if (requestedChatEnabled != group.ChatEnabled)
{
var now = DateTime.UtcNow;
if (GroupChatToggleCooldowns.TryGetValue(group.GID, out var lockedUntil) && lockedUntil > now)
{
var remaining = lockedUntil - now;
var minutes = Math.Max(1, (int)Math.Ceiling(remaining.TotalMinutes));
await Clients.Caller.Client_ReceiveServerMessage(
MessageSeverity.Warning,
$"Syncshell chat can be toggled again in {minutes} minute{(minutes == 1 ? string.Empty : "s")}."
).ConfigureAwait(false);
permissions.SetDisableChat(!group.ChatEnabled);
}
else
{
chatEnabled = requestedChatEnabled;
group.ChatEnabled = chatEnabled;
GroupChatToggleCooldowns[group.GID] = now.AddMinutes(5);
chatChanged = true;
}
}
}
group.InvitesEnabled = !permissions.HasFlag(GroupPermissions.DisableInvites);
group.PreferDisableSounds = permissions.HasFlag(GroupPermissions.PreferDisableSounds);
group.PreferDisableAnimations = permissions.HasFlag(GroupPermissions.PreferDisableAnimations);
group.PreferDisableVFX = permissions.HasFlag(GroupPermissions.PreferDisableVFX);
await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
var groupPairs = DbContext.GroupPairs.Where(p => p.GroupGID == dto.Group.GID).Select(p => p.GroupUserUID).ToList();
await Clients.Users(groupPairs).Client_GroupChangePermissions(new GroupPermissionDto(dto.Group, dto.Permissions)).ConfigureAwait(false);
await Clients.Users(groupPairs).Client_GroupChangePermissions(new GroupPermissionDto(dto.Group, permissions)).ConfigureAwait(false);
if (isOwner && chatChanged && !chatEnabled)
{
var groupDisplayName = string.IsNullOrWhiteSpace(group.Alias) ? group.GID : group.Alias;
var descriptor = new ChatChannelDescriptor
{
Type = ChatChannelType.Group,
WorldId = 0,
ZoneId = 0,
CustomKey = group.GID
};
foreach (var uid in groupPairs)
{
TryInvokeChatService(() => _chatChannelService.RemovePresence(uid, descriptor), "removing group chat presence", descriptor, uid);
}
await Clients.Users(groupPairs)
.Client_ReceiveServerMessage(
MessageSeverity.Information,
$"Syncshell chat for '{groupDisplayName}' has been disabled.")
.ConfigureAwait(false);
}
}
[Authorize(Policy = "Identified")]
@@ -235,6 +294,7 @@ public partial class LightlessHub
PreferDisableAnimations = defaultPermissions.DisableGroupAnimations,
PreferDisableSounds = defaultPermissions.DisableGroupSounds,
PreferDisableVFX = defaultPermissions.DisableGroupVFX,
ChatEnabled = true,
CreatedDate = currentTime,
};
@@ -444,6 +504,7 @@ public partial class LightlessHub
preferredPermissions.DisableVFX = dto.GroupUserPreferredPermissions.IsDisableVFX();
preferredPermissions.DisableAnimations = dto.GroupUserPreferredPermissions.IsDisableAnimations();
preferredPermissions.IsPaused = false;
preferredPermissions.ShareLocation = dto.GroupUserPreferredPermissions.IsSharingLocation();
DbContext.Update(preferredPermissions);
}
@@ -489,7 +550,8 @@ public partial class LightlessHub
DisableSounds = preferredPermissions.DisableSounds,
DisableVFX = preferredPermissions.DisableVFX,
IsPaused = preferredPermissions.IsPaused,
Sticky = false
Sticky = false,
ShareLocation = preferredPermissions.ShareLocation,
};
await DbContext.Permissions.AddAsync(ownPermissionsToOther).ConfigureAwait(false);
@@ -501,6 +563,7 @@ public partial class LightlessHub
existingPermissionsOnDb.DisableVFX = preferredPermissions.DisableVFX;
existingPermissionsOnDb.IsPaused = false;
existingPermissionsOnDb.Sticky = false;
existingPermissionsOnDb.ShareLocation = preferredPermissions.ShareLocation;
DbContext.Update(existingPermissionsOnDb);
@@ -516,6 +579,7 @@ public partial class LightlessHub
ownPermissionsToOther.DisableVFX = preferredPermissions.DisableVFX;
ownPermissionsToOther.DisableSounds = preferredPermissions.DisableSounds;
ownPermissionsToOther.IsPaused = false;
ownPermissionsToOther.ShareLocation = preferredPermissions.ShareLocation;
DbContext.Update(ownPermissionsToOther);
}
@@ -537,7 +601,8 @@ public partial class LightlessHub
DisableSounds = otherPreferred.DisableSounds,
DisableVFX = otherPreferred.DisableVFX,
IsPaused = otherPreferred.IsPaused,
Sticky = false
Sticky = false,
ShareLocation = otherPreferred.ShareLocation,
};
await DbContext.AddAsync(otherExistingPermsOnDb).ConfigureAwait(false);
@@ -549,6 +614,7 @@ public partial class LightlessHub
otherExistingPermsOnDb.DisableSounds = otherPreferred.DisableSounds;
otherExistingPermsOnDb.DisableVFX = otherPreferred.DisableVFX;
otherExistingPermsOnDb.IsPaused = otherPreferred.IsPaused;
otherExistingPermsOnDb.ShareLocation = otherPreferred.ShareLocation;
DbContext.Update(otherExistingPermsOnDb);
}
@@ -562,6 +628,7 @@ public partial class LightlessHub
otherPermissionToSelf.DisableSounds = otherPreferred.DisableSounds;
otherPermissionToSelf.DisableVFX = otherPreferred.DisableVFX;
otherPermissionToSelf.IsPaused = otherPreferred.IsPaused;
otherPermissionToSelf.ShareLocation = otherPreferred.ShareLocation;
DbContext.Update(otherPermissionToSelf);
}

View File

@@ -66,6 +66,7 @@ public partial class LightlessHub
prevPermissions.DisableSounds = newPerm.IsDisableSounds();
prevPermissions.DisableVFX = newPerm.IsDisableVFX();
prevPermissions.Sticky = newPerm.IsSticky() || setSticky;
prevPermissions.ShareLocation = newPerm.IsSharingLocation();
DbContext.Update(prevPermissions);
// send updated data to pair
@@ -112,6 +113,7 @@ public partial class LightlessHub
groupPreferredPermissions.DisableAnimations = group.Value.IsDisableAnimations();
groupPreferredPermissions.IsPaused = group.Value.IsPaused();
groupPreferredPermissions.DisableVFX = group.Value.IsDisableVFX();
groupPreferredPermissions.ShareLocation = group.Value.IsSharingLocation();
var nonStickyPairs = allUsers.Where(u => !u.Value.OwnPermissions.Sticky).ToList();
var affectedGroupPairs = nonStickyPairs.Where(u => u.Value.GIDs.Contains(group.Key, StringComparer.Ordinal)).ToList();
@@ -126,6 +128,7 @@ public partial class LightlessHub
perm.DisableAnimations = groupPreferredPermissions.DisableAnimations;
perm.IsPaused = groupPreferredPermissions.IsPaused;
perm.DisableVFX = groupPreferredPermissions.DisableVFX;
perm.ShareLocation = groupPreferredPermissions.ShareLocation;
}
UserPermissions permissions = UserPermissions.NoneSet;
@@ -133,6 +136,7 @@ public partial class LightlessHub
permissions.SetDisableAnimations(groupPreferredPermissions.DisableAnimations);
permissions.SetDisableSounds(groupPreferredPermissions.DisableSounds);
permissions.SetDisableVFX(groupPreferredPermissions.DisableVFX);
permissions.SetShareLocation(groupPreferredPermissions.ShareLocation);
await Clients.Users(affectedGroupPairs
.Select(k => k.Key))

View File

@@ -86,7 +86,8 @@ public partial class LightlessHub
DisableSounds = ownDefaultPermissions.DisableIndividualSounds,
DisableVFX = ownDefaultPermissions.DisableIndividualVFX,
IsPaused = false,
Sticky = true
Sticky = true,
ShareLocation = false,
};
var existingDbPerms = await DbContext.Permissions.SingleOrDefaultAsync(u => u.UserUID == UserUID && u.OtherUserUID == otherUser.UID, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
@@ -101,6 +102,7 @@ public partial class LightlessHub
existingDbPerms.DisableVFX = permissions.DisableVFX;
existingDbPerms.IsPaused = false;
existingDbPerms.Sticky = true;
existingDbPerms.ShareLocation = permissions.ShareLocation;
DbContext.Permissions.Update(existingDbPerms);
}
@@ -1232,6 +1234,84 @@ public partial class LightlessHub
errorMessage = string.Empty;
return true;
}
[Authorize(Policy = "Identified")]
public async Task UpdateLocation(LocationDto dto, bool offline = false)
{
_logger.LogCallInfo(LightlessHubLogger.Args(UserUID,dto));
if (string.IsNullOrEmpty(dto.user.UID))
{
_logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with no userinfo :",UserUID, dto));
return;
}
if (!string.Equals(UserUID, dto.user.UID, StringComparison.Ordinal))
{
_logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with another UID :",UserUID, dto));
return;
}
var visibilityCacheKey = $"Visibility:{UserUID}";
var allUsers = await _redis.GetAsync<List<string>>(visibilityCacheKey).ConfigureAwait(false);
if (allUsers == null)
{
var permissibleGroupGIDsQuery = DbContext.GroupPairPreferredPermissions.AsNoTracking()
.Where(gpp => gpp.UserUID == dto.user.UID && !gpp.IsPaused && gpp.ShareLocation == true)
.Select(gpp => gpp.GroupGID);
var groupUserUIDsQuery = DbContext.GroupPairs.AsNoTracking()
.Where(gp => permissibleGroupGIDsQuery.Contains(gp.GroupGID))
.Select(gp => gp.GroupUserUID);
var directlySharedUserUIDsQuery = DbContext.Permissions.AsNoTracking()
.Where(p => p.UserUID == dto.user.UID && !p.IsPaused && p.ShareLocation == true)
.Select(p => p.OtherUserUID);
allUsers = await directlySharedUserUIDsQuery
.Union(groupUserUIDsQuery)
.Distinct()
.ToListAsync().ConfigureAwait(false);
await _redis.AddAsync(
visibilityCacheKey,
allUsers,
TimeSpan.FromMinutes(30),
StackExchange.Redis.When.Always,
StackExchange.Redis.CommandFlags.FireAndForget
).ConfigureAwait(false);
}
var key = $"Location:{UserUID}";
if (offline)
{
await _redis.RemoveAsync(key, StackExchange.Redis.CommandFlags.FireAndForget).ConfigureAwait(false);
await Clients.Users(allUsers).Client_SendLocationToClient(dto).ConfigureAwait(false);
}
else
{
var currentLocation = await _redis.GetAsync<LocationDto>(key).ConfigureAwait(false);
await _redis.AddAsync(key, dto).ConfigureAwait(false);
if (allUsers.Count != 0 && currentLocation != dto)
{
await Clients.Users(allUsers).Client_SendLocationToClient(dto).ConfigureAwait(false);
}
}
}
[Authorize(Policy = "Identified")]
public async Task<List<LocationDto>> RequestAllLocationInfo()
{
_logger.LogCallInfo();
var uids = DbContext.Permissions.AsNoTracking().Where(x => x.OtherUserUID == UserUID && x.ShareLocation == true)
.Select(x => x.UserUID).ToList();
var data =await _redis.GetAllAsync<LocationDto>(uids.Select(x => $"Location:{x}").ToHashSet(StringComparer.Ordinal))
.ConfigureAwait(false);
return data.Where(x => x.Value is not null).Select(x => x.Value).ToList();
}
[GeneratedRegex(@"^([a-z0-9_ '+&,\.\-\{\}]+\/)+([a-z0-9_ '+&,\.\-\{\}]+\.[a-z]{3,4})$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ECMAScript)]
private static partial Regex GamePathRegex();

View File

@@ -16,6 +16,8 @@ using Microsoft.AspNetCore.SignalR;
using Microsoft.EntityFrameworkCore;
using StackExchange.Redis.Extensions.Core.Abstractions;
using System.Collections.Concurrent;
using LightlessSync.API.Dto.CharaData;
using LightlessSync.API.Dto.User;
using LightlessSyncServer.Services.Interfaces;
namespace LightlessSyncServer.Hubs;
@@ -219,6 +221,9 @@ public partial class LightlessHub : Hub<ILightlessHub>, ILightlessHub
_lightlessCensus.ClearStatistics(UserUID);
await SendOfflineToAllPairedUsers().ConfigureAwait(false);
await UpdateLocation(new LocationDto(new UserData(UserUID), new LocationInfo()), offline: true).ConfigureAwait(false);
await CleanVisibilityCacheFromRedis().ConfigureAwait(false);
DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));
await DbContext.SaveChangesAsync().ConfigureAwait(false);

View File

@@ -67,6 +67,7 @@ public class PairService
DisableVFX = defaultPerms.DisableIndividualVFX,
IsPaused = false,
Sticky = true,
ShareLocation = false,
});
modified = true;
}
@@ -88,6 +89,7 @@ public class PairService
DisableVFX = defaultPerms.DisableIndividualVFX,
IsPaused = false,
Sticky = true,
ShareLocation = false,
});
modified = true;
}

View File

@@ -118,6 +118,7 @@ public static class Extensions
permissions.SetPreferDisableSounds(group.PreferDisableSounds);
permissions.SetPreferDisableVFX(group.PreferDisableVFX);
permissions.SetDisableInvites(!group.InvitesEnabled);
permissions.SetDisableChat(!group.ChatEnabled);
return permissions;
}
@@ -128,6 +129,7 @@ public static class Extensions
permissions.SetDisableSounds(groupPair.DisableSounds);
permissions.SetPaused(groupPair.IsPaused);
permissions.SetDisableVFX(groupPair.DisableVFX);
permissions.SetShareLocation(groupPair.ShareLocation);
return permissions;
}
@@ -148,6 +150,7 @@ public static class Extensions
perm.SetDisableAnimations(permissions.DisableAnimations);
perm.SetDisableSounds(permissions.DisableSounds);
perm.SetDisableVFX(permissions.DisableVFX);
perm.SetShareLocation(permissions.ShareLocation);
if (setSticky)
perm.SetSticky(permissions.Sticky);
return perm;

View File

@@ -80,6 +80,9 @@ public class LightlessDbContext : DbContext
.WithOne(p => p.Group)
.HasForeignKey<GroupProfile>(p => p.GroupGID)
.IsRequired(false);
mb.Entity<Group>()
.Property(g => g.ChatEnabled)
.HasDefaultValue(true);
mb.Entity<GroupPair>().ToTable("group_pairs");
mb.Entity<GroupPair>().HasKey(u => new { u.GroupGID, u.GroupUserUID });
mb.Entity<GroupPair>().HasIndex(c => c.GroupUserUID);

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace LightlessSyncServer.Migrations
{
/// <inheritdoc />
public partial class DisableChatGroups : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "chat_enabled",
table: "groups",
type: "boolean",
nullable: false,
defaultValue: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "chat_enabled",
table: "groups");
}
}
}

View File

@@ -438,6 +438,12 @@ namespace LightlessSyncServer.Migrations
.HasColumnType("boolean")
.HasColumnName("auto_prune_enabled");
b.Property<bool>("ChatEnabled")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(true)
.HasColumnName("chat_enabled");
b.Property<DateTime>("CreatedDate")
.ValueGeneratedOnAdd()
.HasColumnType("timestamp with time zone")

View File

@@ -19,5 +19,6 @@ public class Group
public bool PreferDisableSounds { get; set; }
public bool PreferDisableAnimations { get; set; }
public bool PreferDisableVFX { get; set; }
public bool ChatEnabled { get; set; } = true;
public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
}

View File

@@ -10,4 +10,5 @@ public class GroupPairPreferredPermission
public bool DisableAnimations { get; set; }
public bool DisableSounds { get; set; }
public bool DisableVFX { get; set; }
public bool ShareLocation { get; set; }
}

View File

@@ -15,4 +15,5 @@ public class UserPermissionSet
public bool DisableAnimations { get; set; } = false;
public bool DisableVFX { get; set; } = false;
public bool DisableSounds { get; set; } = false;
public bool ShareLocation { get; set; } = false;
}

View File

@@ -102,36 +102,37 @@ public sealed class CachedFileProvider : IDisposable
private bool TryCopyFromColdStorage(string hash, string destinationFilePath)
{
if (!_configuration.GetValueOrDefault(nameof(StaticFilesServerConfiguration.UseColdStorage), false)) return false;
if (!_configuration.GetValueOrDefault(nameof(StaticFilesServerConfiguration.UseColdStorage), false)) return false;
string coldStorageDir = _configuration.GetValueOrDefault(nameof(StaticFilesServerConfiguration.ColdStorageDirectory), string.Empty);
if (string.IsNullOrEmpty(coldStorageDir)) return false;
string coldStorageDir = _configuration.GetValueOrDefault(nameof(StaticFilesServerConfiguration.ColdStorageDirectory), string.Empty);
if (string.IsNullOrEmpty(coldStorageDir)) return false;
var coldStorageFilePath = FilePathUtil.GetFileInfoForHash(coldStorageDir, hash);
if (coldStorageFilePath == null) return false;
var coldStorageFilePath = FilePathUtil.GetFileInfoForHash(coldStorageDir, hash);
if (coldStorageFilePath == null) return false;
try
{
_logger.LogDebug("Copying {hash} from cold storage: {path}", hash, coldStorageFilePath);
var tempFileName = destinationFilePath + ".dl";
File.Copy(coldStorageFilePath.FullName, tempFileName, true);
File.Move(tempFileName, destinationFilePath, true);
coldStorageFilePath.LastAccessTimeUtc = DateTime.UtcNow;
var destinationFile = new FileInfo(destinationFilePath);
destinationFile.LastAccessTimeUtc = DateTime.UtcNow;
destinationFile.CreationTimeUtc = DateTime.UtcNow;
destinationFile.LastWriteTimeUtc = DateTime.UtcNow;
_metrics.IncGauge(MetricsAPI.GaugeFilesTotal);
_metrics.IncGauge(MetricsAPI.GaugeFilesTotalSize, new FileInfo(destinationFilePath).Length);
return true;
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Could not copy {coldStoragePath} from cold storage", coldStorageFilePath);
}
try
{
_logger.LogDebug("Copying {hash} from cold storage: {path}", hash, coldStorageFilePath);
var tempFileName = destinationFilePath + ".dl";
File.Copy(coldStorageFilePath.FullName, tempFileName, true);
File.Move(tempFileName, destinationFilePath, true);
return false;
}
File.SetLastAccessTimeUtc(coldStorageFilePath.FullName, DateTime.UtcNow);
File.SetLastAccessTimeUtc(destinationFilePath, DateTime.UtcNow);
File.SetCreationTimeUtc(destinationFilePath, DateTime.UtcNow);
File.SetLastWriteTimeUtc(destinationFilePath, DateTime.UtcNow);
_metrics.IncGauge(MetricsAPI.GaugeFilesTotal);
_metrics.IncGauge(MetricsAPI.GaugeFilesTotalSize, new FileInfo(destinationFilePath).Length);
return true;
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Could not copy {coldStoragePath} from cold storage", coldStorageFilePath);
}
return false;
}
public async Task DownloadFileWhenRequired(string hash)
{
@@ -170,15 +171,22 @@ public sealed class CachedFileProvider : IDisposable
public FileInfo? GetLocalFilePath(string hash)
{
var fi = FilePathUtil.GetFileInfoForHash(_hotStoragePath, hash);
if (fi == null) return null;
var fi = FilePathUtil.GetFileInfoForHash(_hotStoragePath, hash);
if (fi == null) return null;
fi.LastAccessTimeUtc = DateTime.UtcNow;
try
{
File.SetLastAccessTimeUtc(fi.FullName, DateTime.UtcNow);
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Failed to update LastAccessTimeUtc for file {hash}", hash);
}
_fileStatisticsService.LogFile(hash, fi.Length);
_fileStatisticsService.LogFile(hash, fi.Length);
return new FileInfo(fi.FullName);
}
return new FileInfo(fi.FullName);
}
public async Task<FileInfo?> DownloadAndGetLocalFileInfo(string hash)
{