Missing image handling

Displays blank card, message about which card image is missing.
thquinn · Mar 2, 2015 · 933c825 · 933c825
1 parent 6f4a87a
commit 933c825
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/IsochronDrafter.suo b/IsochronDrafter.suo
diff --git a/IsochronDrafter/DraftServer.cs b/IsochronDrafter/DraftServer.cs
@@ -91,6 +91,7 @@ public bool IsValidSet()
         public void PrintServerStartMessage()
         {
             // Get public IP address of server.
+            serverWindow.PrintLine("Looking up public IP...");
             string url = "http://checkip.dyndns.org";
             System.Net.WebRequest req = System.Net.WebRequest.Create(url);
             System.Net.WebResponse resp = req.GetResponse();

diff --git a/IsochronDrafter/DraftWindow.cs b/IsochronDrafter/DraftWindow.cs
@@ -16,6 +16,7 @@ namespace IsochronDrafter
     public partial class DraftWindow : Form
     {
         private static Dictionary<string, Image> cardImages = new Dictionary<string, Image>();
+        private static Image blankCard = Image.FromStream(System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("IsochronDrafter.blank.jpg"));
         public CardWindow cardWindow;
         public DraftClient draftClient;
         public bool canPick = true, chatBlank = true;
@@ -67,7 +68,17 @@ public static void LoadImage(string cardName)
             if (cardImages.ContainsKey(cardName))
                 return;
             HttpWebRequest httpWebRequest = (HttpWebRequest)HttpWebRequest.Create(Util.imageDirectory + cardName.Replace(",", "").Replace("’", "") + ".full.jpg");
-            HttpWebResponse httpWebReponse = (HttpWebResponse)httpWebRequest.GetResponse();
+            HttpWebResponse httpWebReponse;
+            try
+            {
+                httpWebReponse = (HttpWebResponse)httpWebRequest.GetResponse();
+            }
+            catch (WebException ex)
+            {
+                MessageBox.Show("Couldn't find image for card " + cardName + " at URL " + httpWebRequest.RequestUri.ToString() + ".");
+                cardImages.Add(cardName, blankCard);
+                return;
+            }
             Stream stream = httpWebReponse.GetResponseStream();
             cardImages.Add(cardName, Image.FromStream(stream));
         }

diff --git a/IsochronDrafter/IsochronDrafter.csproj b/IsochronDrafter/IsochronDrafter.csproj
@@ -147,6 +147,7 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="blank.jpg" />
     <Content Include="isochron.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/IsochronDrafter/blank.jpg b/IsochronDrafter/blank.jpg