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

(eb8bec90d) Use RestSharp to download workshop preview images (WebClient seems to be unreliable on Linux & Mac)

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-23 15:14:17 +03:00
parent f0ea1c628b
commit 80a3a26fcd
1 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/SteamWorkshopScreen.cs
+36 -13
View File
@@ -1,11 +1,11 @@
using Barotrauma.Steam; using Barotrauma.Steam;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using RestSharp;
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;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
@@ -357,20 +357,25 @@ namespace Barotrauma
if (!pendingPreviewImageDownloads.Contains(item.PreviewImageUrl)) if (!pendingPreviewImageDownloads.Contains(item.PreviewImageUrl))
{ {
pendingPreviewImageDownloads.Add(item.PreviewImageUrl); pendingPreviewImageDownloads.Add(item.PreviewImageUrl);
using (WebClient client = new WebClient())
if (File.Exists(imagePreviewPath))
{ {
if (File.Exists(imagePreviewPath)) File.Delete(imagePreviewPath);
{
File.Delete(imagePreviewPath);
}
Directory.CreateDirectory(SteamManager.WorkshopItemPreviewImageFolder);
client.DownloadFileAsync(new Uri(item.PreviewImageUrl), imagePreviewPath);
CoroutineManager.StartCoroutine(WaitForItemPreviewDownloaded(item, listBox, imagePreviewPath));
client.DownloadFileCompleted += (sender, args) =>
{
pendingPreviewImageDownloads.Remove(item.PreviewImageUrl);
};
} }
Directory.CreateDirectory(SteamManager.WorkshopItemPreviewImageFolder);
Uri baseAddress = new Uri(item.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);
client.ExecuteAsync(request, response =>
{
pendingPreviewImageDownloads.Remove(item.PreviewImageUrl);
OnPreviewImageDownloaded(response, imagePreviewPath);
CoroutineManager.StartCoroutine(WaitForItemPreviewDownloaded(item, listBox, imagePreviewPath));
});
} }
else else
{ {
@@ -539,6 +544,24 @@ namespace Barotrauma
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.4f), innerFrame.RectTransform), contentPackage.Name, textAlignment: Alignment.CenterLeft); new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.4f), innerFrame.RectTransform), contentPackage.Name, textAlignment: Alignment.CenterLeft);
} }
private void OnPreviewImageDownloaded(IRestResponse response, string previewImagePath)
{
if (response.ResponseStatus == ResponseStatus.Completed)
{
try
{
File.WriteAllBytes(previewImagePath, response.RawBytes);
}
catch (Exception e)
{
string errorMsg = "Failed to save workshop item preview image to \"" + previewImagePath + "\".";
GameAnalyticsManager.AddErrorEventOnce("SteamWorkshopScreen.OnItemPreviewDownloaded:WriteAllBytesFailed" + previewImagePath,
GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg + "\n" + e.Message);
return;
}
}
}
private IEnumerable<object> WaitForItemPreviewDownloaded(Facepunch.Steamworks.Workshop.Item item, GUIListBox listBox, string previewImagePath) private IEnumerable<object> WaitForItemPreviewDownloaded(Facepunch.Steamworks.Workshop.Item item, GUIListBox listBox, string previewImagePath)
{ {
while (pendingPreviewImageDownloads.Contains(item.PreviewImageUrl)) while (pendingPreviewImageDownloads.Contains(item.PreviewImageUrl))