From 05cf8303e46f1611a7805e93e257b0accf24401f Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 16 Aug 2020 01:12:30 +0200
Subject: [PATCH] Make use of new WritableDirProvider APIs to improve file
 sharing and simplify code.

---
 Content.Client/Parallax/ParallaxManager.cs      | 17 ++++++-----------
 Content.Client/ScreenshotHook.cs                |  2 +-
 .../GameTicking/GamePresets/PresetSuspicion.cs  |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/ParallaxManager.cs
index 0e6ff0e827..d289ef16cc 100644
--- a/Content.Client/Parallax/ParallaxManager.cs
+++ b/Content.Client/Parallax/ParallaxManager.cs
@@ -8,6 +8,7 @@ using Robust.Client.Graphics;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Shared.Interfaces.Configuration;
 using Robust.Shared.Interfaces.Log;
+using Robust.Shared.Interfaces.Resources;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Utility;
@@ -59,16 +60,11 @@ namespace Content.Client.Parallax
 
                 if (!debugParallax && _resourceCache.UserData.Exists(ParallaxConfigOld))
                 {
-                    bool match;
-                    using (var data = _resourceCache.UserData.Open(ParallaxConfigOld, FileMode.Open))
-                    using (var reader = new StreamReader(data, EncodingHelpers.UTF8))
-                    {
-                        match = reader.ReadToEnd() == contents;
-                    }
+                    var match = _resourceCache.UserData.ReadAllText(ParallaxConfigOld) == contents;
 
                     if (match)
                     {
-                        using (var stream = _resourceCache.UserData.Open(ParallaxPath, FileMode.Open))
+                        using (var stream = _resourceCache.UserData.OpenRead(ParallaxPath))
                         {
                             ParallaxTexture = Texture.LoadFromPNGStream(stream, "Parallax");
                         }
@@ -95,7 +91,7 @@ namespace Content.Client.Parallax
             ParallaxTexture = Texture.LoadFromImage(image, "Parallax");
 
             // Store it and CRC so further game starts don't need to regenerate it.
-            using (var stream = _resourceCache.UserData.Open(ParallaxPath, FileMode.Create))
+            using (var stream = _resourceCache.UserData.Create(ParallaxPath))
             {
                 image.SaveAsPng(stream);
             }
@@ -105,8 +101,7 @@ namespace Content.Client.Parallax
                 var i = 0;
                 foreach (var debugImage in debugImages)
                 {
-                    using (var stream = _resourceCache.UserData.Open(new ResourcePath($"/parallax_debug_{i}.png"),
-                        FileMode.Create))
+                    using (var stream = _resourceCache.UserData.Create(new ResourcePath($"/parallax_debug_{i}.png")))
                     {
                         debugImage.SaveAsPng(stream);
                     }
@@ -117,7 +112,7 @@ namespace Content.Client.Parallax
 
             image.Dispose();
 
-            using (var stream = _resourceCache.UserData.Open(ParallaxConfigOld, FileMode.Create))
+            using (var stream = _resourceCache.UserData.Create(ParallaxConfigOld))
             using (var writer = new StreamWriter(stream, EncodingHelpers.UTF8))
             {
                 writer.Write(contents);
diff --git a/Content.Client/ScreenshotHook.cs b/Content.Client/ScreenshotHook.cs
index 238288ab5f..d1cf81bd96 100644
--- a/Content.Client/ScreenshotHook.cs
+++ b/Content.Client/ScreenshotHook.cs
@@ -57,7 +57,7 @@ namespace Content.Client
                     }
 
                     await using var file =
-                        _resourceManager.UserData.Open(BaseScreenshotPath / $"{filename}.png", FileMode.CreateNew);
+                        _resourceManager.UserData.Open(BaseScreenshotPath / $"{filename}.png", FileMode.CreateNew, FileAccess.Read, FileShare.None);
 
                     await Task.Run(() =>
                     {
diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs
index 50365c6569..bd2f43a13d 100644
--- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs
+++ b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs
@@ -62,7 +62,7 @@ namespace Content.Server.GameTicking.GamePresets
             for (var i = 0; i < numTraitors; i++)
             {
                 IPlayerSession traitor;
-                if(prefList.Count() == 0)
+                if(prefList.Count == 0)
                 {
                     traitor = _random.PickAndTake(list);
                     Logger.InfoS("preset", "Insufficient preferred traitors, picking at random.");