vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(be8059eff) Use RestSharp to download the existing preview image when editing published workshop items. WebClient doesn't seem to work in the Mac build

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-23 15:18:31 +03:00
parent c6f2125b4f
commit feb32943c7
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Networking/SteamManager.cs
+21 -5
View File
@@ -1,11 +1,11 @@
using Barotrauma.Networking; using Barotrauma.Networking;
using Facepunch.Steamworks; using Facepunch.Steamworks;
using RestSharp;
using RestSharp.Extensions.MonoHttp; using RestSharp.Extensions.MonoHttp;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net;
namespace Barotrauma.Steam namespace Barotrauma.Steam
{ {
@@ -467,13 +467,29 @@ namespace Barotrauma.Steam
string previewImagePath = Path.GetFullPath(Path.Combine(itemEditor.Folder, PreviewImageName)); string previewImagePath = Path.GetFullPath(Path.Combine(itemEditor.Folder, PreviewImageName));
itemEditor.PreviewImage = previewImagePath; itemEditor.PreviewImage = previewImagePath;
using (WebClient client = new WebClient()) try
{ {
if (File.Exists(previewImagePath)) if (File.Exists(previewImagePath)) { File.Delete(previewImagePath); }
Uri baseAddress = new Uri(existingItem.PreviewImageUrl);
Uri directory = new Uri(baseAddress, "."); // "." == current dir, like MS-DOS
string fileName = Path.GetFileName(baseAddress.LocalPath);
IRestClient client = new RestClient(directory);
var request = new RestRequest(fileName, Method.GET);
var response = client.Execute(request);
if (response.ResponseStatus == ResponseStatus.Completed)
{ {
File.Delete(previewImagePath); File.WriteAllBytes(previewImagePath, response.RawBytes);
} }
client.DownloadFile(new Uri(existingItem.PreviewImageUrl), previewImagePath); }
catch (Exception e)
{
string errorMsg = "Failed to save workshop item preview image to \"" + previewImagePath + "\" when creating workshop item staging folder.";
GameAnalyticsManager.AddErrorEventOnce("SteamManager.CreateWorkshopItemStaging:WriteAllBytesFailed" + previewImagePath,
GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg + "\n" + e.Message);
} }
ContentPackage tempContentPackage = new ContentPackage(Path.Combine(existingItem.Directory.FullName, MetadataFileName)); ContentPackage tempContentPackage = new ContentPackage(Path.Combine(existingItem.Directory.FullName, MetadataFileName));