Fax machines can print from text file (#23262)

* added

* checks tweaking

* fixed what sloth wanted

* fixed?

* dialog diposing fix

* checks tweaking

* more changes

* dispose streamreader

* Update Content.Client/Fax/UI/FaxBoundUi.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update Content.Server/Fax/FaxSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* fix minor typo

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs
index ef6661b3ef61eead4b62a9a55a8f96403ad623ce..9b57595d7b492b185f28ea6621bf23cbe4840e37 100644 (file)
--- a/Content.Client/Fax/UI/FaxBoundUi.cs
+++ b/Content.Client/Fax/UI/FaxBoundUi.cs
@@ -1,15 +1,22 @@
+using System.IO;
+using System.Threading.Tasks;
 using Content.Shared.Fax;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Fax.UI;
 
 [UsedImplicitly]
 public sealed class FaxBoundUi : BoundUserInterface
 {
+    [Dependency] private readonly IFileDialogManager _fileDialogManager = default!;
+
     [ViewVariables]
     private FaxWindow? _window;
 
+    private bool _dialogIsOpen = false;
+
     public FaxBoundUi(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -22,12 +29,33 @@ public sealed class FaxBoundUi : BoundUserInterface
         _window.OpenCentered();
 
         _window.OnClose += Close;
+        _window.FileButtonPressed += OnFileButtonPressed;
         _window.CopyButtonPressed += OnCopyButtonPressed;
         _window.SendButtonPressed += OnSendButtonPressed;
         _window.RefreshButtonPressed += OnRefreshButtonPressed;
         _window.PeerSelected += OnPeerSelected;
     }
 
+    private async void OnFileButtonPressed()
+    {
+        if (_dialogIsOpen)
+            return;
+            
+        _dialogIsOpen = true;
+        var filters = new FileDialogFilters(new FileDialogFilters.Group("txt"));
+        await using var file = await _fileDialogManager.OpenFile(filters);
+        _dialogIsOpen = false;
+
+        if (_window == null || _window.Disposed || file == null)
+        {
+            return;
+        }
+
+        using var reader = new StreamReader(file);
+        var content = await reader.ReadToEndAsync();
+        SendMessage(new FaxFileMessage(content[..Math.Min(content.Length, FaxFileMessageValidation.MaxContentSize)], _window.OfficePaper));
+    }
+
     private void OnSendButtonPressed()
     {
         SendMessage(new FaxSendMessage());

diff --git a/Content.Client/Fax/UI/FaxWindow.xaml b/Content.Client/Fax/UI/FaxWindow.xaml
index 1e6ef233765f043f78edaee0292f96bec169e76d..ce22b0e412c3b151a72d5d799030cf62e618e5b0 100644 (file)
--- a/Content.Client/Fax/UI/FaxWindow.xaml
+++ b/Content.Client/Fax/UI/FaxWindow.xaml
@@ -19,6 +19,14 @@
             <OptionButton Name="PeerSelector" HorizontalExpand="True" />
         </BoxContainer>
         <Control HorizontalExpand="True" MinHeight="20" />
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <Button Name="FileButton"
+                    Text="{Loc 'fax-machine-ui-file-button'}"
+                    HorizontalExpand="False"/>
+            <Button Name="PaperButton"
+                    Text="{Loc 'fax-machine-ui-paper-button-normal'}"
+                    HorizontalExpand="False"/>
+        </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Button Name="CopyButton"
                     Text="{Loc 'fax-machine-ui-copy-button'}"

diff --git a/Content.Client/Fax/UI/FaxWindow.xaml.cs b/Content.Client/Fax/UI/FaxWindow.xaml.cs
index ecc3f4778fbeb91b637cf29df0011bc76c9964bb..b809af7f4aec61dd9e610a98dfd74706b95ebe8e 100644 (file)
--- a/Content.Client/Fax/UI/FaxWindow.xaml.cs
+++ b/Content.Client/Fax/UI/FaxWindow.xaml.cs
@@ -3,21 +3,30 @@ using Content.Shared.Fax;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Fax.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class FaxWindow : DefaultWindow
 {
+    public event Action? FileButtonPressed;
+    public event Action? PaperButtonPressed;
     public event Action? CopyButtonPressed;
     public event Action? SendButtonPressed;
     public event Action? RefreshButtonPressed;
     public event Action<string>? PeerSelected;
 
+    public bool OfficePaper = false;
+
     public FaxWindow()
     {
         RobustXamlLoader.Load(this);
 
+        PaperButtonPressed += OnPaperButtonPressed;
+
+        FileButton.OnPressed += _ => FileButtonPressed?.Invoke(); 
+        PaperButton.OnPressed += _ => PaperButtonPressed?.Invoke(); 
         CopyButton.OnPressed += _ => CopyButtonPressed?.Invoke();
         SendButton.OnPressed += _ => SendButtonPressed?.Invoke();
         RefreshButton.OnPressed += _ => RefreshButtonPressed?.Invoke();
@@ -80,4 +89,14 @@ public sealed partial class FaxWindow : DefaultWindow
         PeerSelector.SetItemMetadata(PeerSelector.ItemCount - 1, address);
         return PeerSelector.ItemCount - 1;
     }
+
+    private void OnPaperButtonPressed()
+    {
+        OfficePaper = !OfficePaper;
+
+        if(OfficePaper)
+            PaperButton.Text = Loc.GetString("fax-machine-ui-paper-button-office");
+        else
+            PaperButton.Text = Loc.GetString("fax-machine-ui-paper-button-normal");
+    }
 }

diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index 5fee750c1d93a2dcfe704401a768fbfe3c909b9e..265a20ce1c9337703ca1feb033dbd5413436986d 100644 (file)
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -51,6 +51,9 @@ public sealed class FaxSystem : EntitySystem
     /// </summary>
     [ValidatePrototypeId<EntityPrototype>]
     private const string DefaultPaperPrototypeId = "Paper";
+    
+    [ValidatePrototypeId<EntityPrototype>]
+    private const string OfficePaperPrototypeId = "PaperOffice";
 
     public override void Initialize()
     {
@@ -72,6 +75,7 @@ public sealed class FaxSystem : EntitySystem
 
         // UI
         SubscribeLocalEvent<FaxMachineComponent, AfterActivatableUIOpenEvent>(OnToggleInterface);
+        SubscribeLocalEvent<FaxMachineComponent, FaxFileMessage>(OnFileButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxCopyMessage>(OnCopyButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxSendMessage>(OnSendButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxRefreshMessage>(OnRefreshButtonPressed);
@@ -301,6 +305,12 @@ public sealed class FaxSystem : EntitySystem
         UpdateUserInterface(uid, component);
     }
 
+    private void OnFileButtonPressed(EntityUid uid, FaxMachineComponent component, FaxFileMessage args)
+    {
+        args.Content = args.Content[..Math.Min(args.Content.Length, FaxFileMessageValidation.MaxContentSize)];
+        PrintFile(uid, component, args);
+    }
+
     private void OnCopyButtonPressed(EntityUid uid, FaxMachineComponent component, FaxCopyMessage args)
     {
         Copy(uid, component);
@@ -387,6 +397,27 @@ public sealed class FaxSystem : EntitySystem
         _deviceNetworkSystem.QueuePacket(uid, null, payload);
     }
 
+    /// <summary>
+    ///     Makes fax print from a file from the computer. A timeout is set after copying,
+    ///     which is shared by the send button.
+    /// </summary>
+    public void PrintFile(EntityUid uid, FaxMachineComponent component, FaxFileMessage args)
+    {
+        string prototype;
+        if (args.OfficePaper)
+            prototype = OfficePaperPrototypeId;
+        else
+            prototype = DefaultPaperPrototypeId;
+
+        var name  = Loc.GetString("fax-machine-printed-paper-name");
+        
+        var printout = new FaxPrintout(args.Content, name, prototype);
+        component.PrintingQueue.Enqueue(printout);
+        component.SendTimeoutRemaining += component.SendTimeout;
+
+        UpdateUserInterface(uid, component);
+    }
+
     /// <summary>
     ///     Copies the paper in the fax. A timeout is set after copying,
     ///     which is shared by the send button.

diff --git a/Content.Shared/Fax/SharedFax.cs b/Content.Shared/Fax/SharedFax.cs
index ccb998925f1ad107bb68e288224b96a2ed74e87a..15674aef7e59863b8234555fb74edd199b38969f 100644 (file)
--- a/Content.Shared/Fax/SharedFax.cs
+++ b/Content.Shared/Fax/SharedFax.cs
@@ -34,6 +34,24 @@ public sealed class FaxUiState : BoundUserInterfaceState
     }
 }
 
+[Serializable, NetSerializable]
+public sealed class FaxFileMessage : BoundUserInterfaceMessage
+{
+    public string Content;
+    public bool OfficePaper;
+
+    public FaxFileMessage(string content, bool officePaper)
+    {
+        Content = content;
+        OfficePaper = officePaper;
+    }
+}
+
+public static class FaxFileMessageValidation
+{
+    public const int MaxContentSize = 10000;
+}
+
 [Serializable, NetSerializable]
 public sealed class FaxCopyMessage : BoundUserInterfaceMessage
 {

diff --git a/Resources/Locale/en-US/fax/fax.ftl b/Resources/Locale/en-US/fax/fax.ftl
index 76d477f9421322560ce01ae47962f2cf7a2a5f74..1f1881a05d6ee9b5a3e2854b5d731fc8ea305f2c 100644 (file)
--- a/Resources/Locale/en-US/fax/fax.ftl
+++ b/Resources/Locale/en-US/fax/fax.ftl
@@ -8,6 +8,9 @@ fax-machine-dialog-rename = Rename
 fax-machine-dialog-field-name = Name
 
 fax-machine-ui-window = Fax Machine
+fax-machine-ui-file-button = Print File
+fax-machine-ui-paper-button-normal = Normal Paper
+fax-machine-ui-paper-button-office = Office Paper
 fax-machine-ui-copy-button = Copy
 fax-machine-ui-send-button = Send
 fax-machine-ui-refresh-button = Refresh
@@ -19,3 +22,5 @@ fax-machine-ui-paper-inserted = Paper in tray
 fax-machine-ui-paper-not-inserted = No paper
 
 fax-machine-chat-notify = Received new fax message from "{$fax}" fax
+
+fax-machine-printed-paper-name = printed paper