From 6171ea7cf37469f87a16ee25e49316e8c47ea400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sun, 17 Nov 2013 17:19:47 +0100
Subject: [PATCH] harden asset browser against invalid user input and allow R8

closes #3980
---
 .../Widgets/Logic/AssetBrowserLogic.cs        | 22 +++++++++++++------
 mods/d2k/chrome/assetbrowser.yaml             |  3 ++-
 mods/ra/chrome/assetbrowser.yaml              |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs
index 88626ddd5a..f4681dd5ea 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
@@ -52,7 +53,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			spriteImage = panel.Get<ShpImageWidget>("SPRITE");
 
 			filenameInput = panel.Get<TextFieldWidget>("FILENAME_INPUT");
-			filenameInput.Text = spriteImage.Image + ".shp";
 			filenameInput.OnEnterKey = () => LoadAsset(filenameInput.Text);
 
 			frameSlider = panel.Get<SliderWidget>("FRAME_SLIDER");
@@ -184,20 +184,28 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 
 		void AddAsset(ScrollPanelWidget list, string filepath, ScrollItemWidget template)
 		{
-			var sprite = Path.GetFileNameWithoutExtension(filepath);
+			var r8 = filepath.EndsWith(".r8", true, CultureInfo.InvariantCulture);
+			var filename =  Path.GetFileName(filepath);
+			var sprite = r8 ? filename : Path.GetFileNameWithoutExtension(filepath);
 			var item = ScrollItemWidget.Setup(template,
 			                                  () => spriteImage.Image == sprite,
-			                                  () => LoadAsset(sprite));
+			                                  () => {filenameInput.Text = filename; LoadAsset(filename); });
 			item.Get<LabelWidget>("TITLE").GetText = () => filepath;
 
 			list.AddChild(item);
 		}
 
-		bool LoadAsset(string sprite)
+		bool LoadAsset(string filename)
 		{
-			if (sprite == null)
+			if (string.IsNullOrEmpty(filename))
 				return false;
 
+			if (!FileSystem.Exists(filename))
+				return false;
+
+			var r8 = filename.EndsWith(".r8", true, CultureInfo.InvariantCulture);
+			var sprite = r8 ? filename : Path.GetFileNameWithoutExtension(filename);
+
 			spriteImage.Frame = 0;
 			spriteImage.Image = sprite;
 			frameSlider.MaximumValue = (float)spriteImage.FrameCount;
@@ -220,7 +228,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			///var sources = new[] { (IFolder)null }.Concat(FileSystem.MountedFolders);
 
 			var sources = FileSystem.MountedFolders;
-			dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 250, sources, setupItem);
+			dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, sources, setupItem);
 			return true;
 		}
 
@@ -239,7 +247,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			var files = assetSource.AllFileNames();
 			foreach (var file in files)
 			{
-				if (file.EndsWith(".shp"))
+				if (file.EndsWith(".shp", true, CultureInfo.InvariantCulture) || file.EndsWith(".r8", true, CultureInfo.InvariantCulture))
 				{
 					AddAsset(assetList, file, template);
 					availableShps.Add(file);
diff --git a/mods/d2k/chrome/assetbrowser.yaml b/mods/d2k/chrome/assetbrowser.yaml
index 65289f5767..2b7b238e20 100644
--- a/mods/d2k/chrome/assetbrowser.yaml
+++ b/mods/d2k/chrome/assetbrowser.yaml
@@ -42,6 +42,7 @@ Background@ASSETBROWSER_BG:
 			Y:280
 			Width:140
 			Height:25
+			Text:mouse.r8
 		Button@LOAD_BUTTON:
 			X:40
 			Y:310
@@ -69,7 +70,7 @@ Background@ASSETBROWSER_BG:
 					Y:4
 					Width:246
 					Height:246
-					Image:DATA.R8
+					Image:mouse.r8
 					Palette:colorpicker
 		Label@ACTIONS_TITLE:
 			X:PARENT_RIGHT - 150
diff --git a/mods/ra/chrome/assetbrowser.yaml b/mods/ra/chrome/assetbrowser.yaml
index fb77ec748c..1539db03a9 100644
--- a/mods/ra/chrome/assetbrowser.yaml
+++ b/mods/ra/chrome/assetbrowser.yaml
@@ -42,6 +42,7 @@ Background@ASSETBROWSER_BG:
 			Y:280
 			Width:140
 			Height:25
+			Text: mouse.shp
 		Button@LOAD_BUTTON:
 			X:40
 			Y:310