add button to print logprobe logs (#32255)

* add EntityName at the bottom of LogProbe

* pass User into CartridgeMessageEvent

* add button to print logprobe logs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2025-02-27 13:47:16 +00:00
committed by GitHub
parent 4d0e63caeb
commit 7520d8a2c8
11 changed files with 155 additions and 17 deletions

View File

@@ -1,4 +1,5 @@
using Content.Client.UserInterface.Fragments; using Content.Client.UserInterface.Fragments;
using Content.Shared.CartridgeLoader;
using Content.Shared.CartridgeLoader.Cartridges; using Content.Shared.CartridgeLoader.Cartridges;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
@@ -13,16 +14,23 @@ public sealed partial class LogProbeUi : UIFragment
return _fragment!; return _fragment!;
} }
public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner) public override void Setup(BoundUserInterface ui, EntityUid? fragmentOwner)
{ {
_fragment = new LogProbeUiFragment(); _fragment = new LogProbeUiFragment();
_fragment.OnPrintPressed += () =>
{
var ev = new LogProbePrintMessage();
var message = new CartridgeUiMessage(ev);
ui.SendMessage(message);
};
} }
public override void UpdateState(BoundUserInterfaceState state) public override void UpdateState(BoundUserInterfaceState state)
{ {
if (state is not LogProbeUiState logProbeUiState) if (state is not LogProbeUiState cast)
return; return;
_fragment?.UpdateState(logProbeUiState.PulledLogs); _fragment?.UpdateState(cast.EntityName, cast.PulledLogs);
} }
} }

View File

@@ -18,4 +18,9 @@
<ScrollContainer VerticalExpand="True" HScrollEnabled="True"> <ScrollContainer VerticalExpand="True" HScrollEnabled="True">
<BoxContainer Orientation="Vertical" Name="ProbedDeviceContainer"/> <BoxContainer Orientation="Vertical" Name="ProbedDeviceContainer"/>
</ScrollContainer> </ScrollContainer>
<BoxContainer Orientation="Horizontal" Margin="4 8">
<Button Name="PrintButton" HorizontalAlignment="Left" Text="{Loc 'log-probe-print-button'}" Disabled="True"/>
<BoxContainer HorizontalExpand="True"/>
<Label Name="EntityName" Align="Right"/>
</BoxContainer>
</cartridges:LogProbeUiFragment> </cartridges:LogProbeUiFragment>

View File

@@ -8,17 +8,24 @@ namespace Content.Client.CartridgeLoader.Cartridges;
[GenerateTypedNameReferences] [GenerateTypedNameReferences]
public sealed partial class LogProbeUiFragment : BoxContainer public sealed partial class LogProbeUiFragment : BoxContainer
{ {
/// <summary>
/// Action invoked when the print button gets pressed.
/// </summary>
public Action? OnPrintPressed;
public LogProbeUiFragment() public LogProbeUiFragment()
{ {
RobustXamlLoader.Load(this); RobustXamlLoader.Load(this);
PrintButton.OnPressed += _ => OnPrintPressed?.Invoke();
} }
public void UpdateState(List<PulledAccessLog> logs) public void UpdateState(string name, List<PulledAccessLog> logs)
{ {
ProbedDeviceContainer.RemoveAllChildren(); EntityName.Text = name;
PrintButton.Disabled = string.IsNullOrEmpty(name);
//Reverse the list so the oldest entries appear at the bottom ProbedDeviceContainer.RemoveAllChildren();
logs.Reverse();
var count = 1; var count = 1;
foreach (var log in logs) foreach (var log in logs)

View File

@@ -427,6 +427,7 @@ public sealed class CartridgeLoaderSystem : SharedCartridgeLoaderSystem
private void OnUiMessage(EntityUid uid, CartridgeLoaderComponent component, CartridgeUiMessage args) private void OnUiMessage(EntityUid uid, CartridgeLoaderComponent component, CartridgeUiMessage args)
{ {
var cartridgeEvent = args.MessageEvent; var cartridgeEvent = args.MessageEvent;
cartridgeEvent.User = args.Actor;
cartridgeEvent.LoaderUid = GetNetEntity(uid); cartridgeEvent.LoaderUid = GetNetEntity(uid);
cartridgeEvent.Actor = args.Actor; cartridgeEvent.Actor = args.Actor;

View File

@@ -1,12 +1,21 @@
using Content.Shared.CartridgeLoader.Cartridges; using Content.Shared.CartridgeLoader.Cartridges;
using Content.Shared.Paper;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
namespace Content.Server.CartridgeLoader.Cartridges; namespace Content.Server.CartridgeLoader.Cartridges;
[RegisterComponent] [RegisterComponent, Access(typeof(LogProbeCartridgeSystem))]
[Access(typeof(LogProbeCartridgeSystem))] [AutoGenerateComponentPause]
public sealed partial class LogProbeCartridgeComponent : Component public sealed partial class LogProbeCartridgeComponent : Component
{ {
/// <summary>
/// The name of the scanned entity, sent to clients when they open the UI.
/// </summary>
[DataField]
public string EntityName = string.Empty;
/// <summary> /// <summary>
/// The list of pulled access logs /// The list of pulled access logs
/// </summary> /// </summary>
@@ -18,4 +27,25 @@ public sealed partial class LogProbeCartridgeComponent : Component
/// </summary> /// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)] [DataField, ViewVariables(VVAccess.ReadWrite)]
public SoundSpecifier SoundScan = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg"); public SoundSpecifier SoundScan = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
/// <summary>
/// Paper to spawn when printing logs.
/// </summary>
[DataField]
public EntProtoId<PaperComponent> PaperPrototype = "PaperAccessLogs";
[DataField]
public SoundSpecifier PrintSound = new SoundPathSpecifier("/Audio/Machines/diagnoser_printing.ogg");
/// <summary>
/// How long you have to wait before printing logs again.
/// </summary>
[DataField]
public TimeSpan PrintCooldown = TimeSpan.FromSeconds(5);
/// <summary>
/// When anyone is allowed to spawn another printout.
/// </summary>
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
public TimeSpan NextPrintAllowed = TimeSpan.Zero;
} }

View File

@@ -1,25 +1,40 @@
using Content.Shared.Access.Components; using Content.Shared.Access.Components;
using Content.Shared.Administration.Logs;
using Content.Shared.Audio; using Content.Shared.Audio;
using Content.Shared.CartridgeLoader; using Content.Shared.CartridgeLoader;
using Content.Shared.CartridgeLoader.Cartridges; using Content.Shared.CartridgeLoader.Cartridges;
using Content.Shared.Database;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Labels.EntitySystems;
using Content.Shared.Paper;
using Content.Shared.Popups; using Content.Shared.Popups;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Timing;
using System.Text;
namespace Content.Server.CartridgeLoader.Cartridges; namespace Content.Server.CartridgeLoader.Cartridges;
public sealed class LogProbeCartridgeSystem : EntitySystem public sealed class LogProbeCartridgeSystem : EntitySystem
{ {
[Dependency] private readonly CartridgeLoaderSystem _cartridge = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!; [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly SharedLabelSystem _label = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly PaperSystem _paper = default!;
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<LogProbeCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady); SubscribeLocalEvent<LogProbeCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
SubscribeLocalEvent<LogProbeCartridgeComponent, CartridgeAfterInteractEvent>(AfterInteract); SubscribeLocalEvent<LogProbeCartridgeComponent, CartridgeAfterInteractEvent>(AfterInteract);
SubscribeLocalEvent<LogProbeCartridgeComponent, CartridgeMessageEvent>(OnMessage);
} }
/// <summary> /// <summary>
@@ -37,9 +52,10 @@ public sealed class LogProbeCartridgeSystem : EntitySystem
return; return;
//Play scanning sound with slightly randomized pitch //Play scanning sound with slightly randomized pitch
_audioSystem.PlayEntity(ent.Comp.SoundScan, args.InteractEvent.User, target, AudioHelpers.WithVariation(0.25f, _random)); _audio.PlayEntity(ent.Comp.SoundScan, args.InteractEvent.User, target, AudioHelpers.WithVariation(0.25f, _random));
_popupSystem.PopupCursor(Loc.GetString("log-probe-scan", ("device", target)), args.InteractEvent.User); _popup.PopupCursor(Loc.GetString("log-probe-scan", ("device", target)), args.InteractEvent.User);
ent.Comp.EntityName = Name(target);
ent.Comp.PulledAccessLogs.Clear(); ent.Comp.PulledAccessLogs.Clear();
foreach (var accessRecord in accessReaderComponent.AccessLog) foreach (var accessRecord in accessReaderComponent.AccessLog)
@@ -52,6 +68,9 @@ public sealed class LogProbeCartridgeSystem : EntitySystem
ent.Comp.PulledAccessLogs.Add(log); ent.Comp.PulledAccessLogs.Add(log);
} }
// Reverse the list so the oldest is at the bottom
ent.Comp.PulledAccessLogs.Reverse();
UpdateUiState(ent, args.Loader); UpdateUiState(ent, args.Loader);
} }
@@ -63,9 +82,49 @@ public sealed class LogProbeCartridgeSystem : EntitySystem
UpdateUiState(ent, args.Loader); UpdateUiState(ent, args.Loader);
} }
private void OnMessage(Entity<LogProbeCartridgeComponent> ent, ref CartridgeMessageEvent args)
{
if (args is LogProbePrintMessage cast)
PrintLogs(ent, cast.User);
}
private void PrintLogs(Entity<LogProbeCartridgeComponent> ent, EntityUid user)
{
if (string.IsNullOrEmpty(ent.Comp.EntityName))
return;
if (_timing.CurTime < ent.Comp.NextPrintAllowed)
return;
ent.Comp.NextPrintAllowed = _timing.CurTime + ent.Comp.PrintCooldown;
var paper = Spawn(ent.Comp.PaperPrototype, _transform.GetMapCoordinates(user));
_label.Label(paper, ent.Comp.EntityName); // label it for easy identification
_audio.PlayEntity(ent.Comp.PrintSound, user, paper);
_hands.PickupOrDrop(user, paper, checkActionBlocker: false);
// generate the actual printout text
var builder = new StringBuilder();
builder.AppendLine(Loc.GetString("log-probe-printout-device", ("name", ent.Comp.EntityName)));
builder.AppendLine(Loc.GetString("log-probe-printout-header"));
var number = 1;
foreach (var log in ent.Comp.PulledAccessLogs)
{
var time = TimeSpan.FromSeconds(Math.Truncate(log.Time.TotalSeconds)).ToString();
builder.AppendLine(Loc.GetString("log-probe-printout-entry", ("number", number), ("time", time), ("accessor", log.Accessor)));
number++;
}
var paperComp = Comp<PaperComponent>(paper);
_paper.SetContent((paper, paperComp), builder.ToString());
_adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(user):user} printed out LogProbe logs ({paper}) of {ent.Comp.EntityName}");
}
private void UpdateUiState(Entity<LogProbeCartridgeComponent> ent, EntityUid loaderUid) private void UpdateUiState(Entity<LogProbeCartridgeComponent> ent, EntityUid loaderUid)
{ {
var state = new LogProbeUiState(ent.Comp.PulledAccessLogs); var state = new LogProbeUiState(ent.Comp.EntityName, ent.Comp.PulledAccessLogs);
_cartridgeLoaderSystem?.UpdateCartridgeUiState(loaderUid, state); _cartridge.UpdateCartridgeUiState(loaderUid, state);
} }
} }

View File

@@ -16,6 +16,8 @@ public sealed class CartridgeUiMessage : BoundUserInterfaceMessage
[Serializable, NetSerializable] [Serializable, NetSerializable]
public abstract class CartridgeMessageEvent : EntityEventArgs public abstract class CartridgeMessageEvent : EntityEventArgs
{ {
[NonSerialized]
public EntityUid User;
public NetEntity LoaderUid; public NetEntity LoaderUid;
[NonSerialized] [NonSerialized]

View File

@@ -0,0 +1,6 @@
using Robust.Shared.Serialization;
namespace Content.Shared.CartridgeLoader.Cartridges;
[Serializable, NetSerializable]
public sealed class LogProbePrintMessage : CartridgeMessageEvent;

View File

@@ -5,13 +5,19 @@ namespace Content.Shared.CartridgeLoader.Cartridges;
[Serializable, NetSerializable] [Serializable, NetSerializable]
public sealed class LogProbeUiState : BoundUserInterfaceState public sealed class LogProbeUiState : BoundUserInterfaceState
{ {
/// <summary>
/// The name of the scanned entity.
/// </summary>
public string EntityName;
/// <summary> /// <summary>
/// The list of probed network devices /// The list of probed network devices
/// </summary> /// </summary>
public List<PulledAccessLog> PulledLogs; public List<PulledAccessLog> PulledLogs;
public LogProbeUiState(List<PulledAccessLog> pulledLogs) public LogProbeUiState(string entityName, List<PulledAccessLog> pulledLogs)
{ {
EntityName = entityName;
PulledLogs = pulledLogs; PulledLogs = pulledLogs;
} }
} }

View File

@@ -19,6 +19,10 @@ log-probe-scan = Downloaded logs from {$device}!
log-probe-label-time = Time log-probe-label-time = Time
log-probe-label-accessor = Accessed by log-probe-label-accessor = Accessed by
log-probe-label-number = # log-probe-label-number = #
log-probe-print-button = Print Logs
log-probe-printout-device = Scanned Device: {$name}
log-probe-printout-header = Latest logs:
log-probe-printout-entry = #{$number} / {$time} / {$accessor}
astro-nav-program-name = AstroNav astro-nav-program-name = AstroNav

View File

@@ -57,3 +57,13 @@
- type: GuideHelp - type: GuideHelp
guides: guides:
- Forensics - Forensics
- type: entity
parent: ForensicReportPaper
id: PaperAccessLogs
name: access logs
description: A printout from the detective's trusty LogProbe.
components:
- type: PaperVisuals
headerImagePath: null
headerMargin: 0.0, 0.0, 0.0, 0.0