Merge pull request #7 from zhangjk95/master

Fix online game data parsing

Author: Aixile

.vs/Etupirka/v14/.suo

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.852
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Etupirka", "Etupirka\Etupirka.csproj", "{2DE8A7AD-A633-4CE4-AB24-9590A7BB0202}"
 EndProject
@@ -19,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {033E3683-970D-4A61-A634-11B68D67B0E0}
+	EndGlobalSection
 EndGlobal

Etupirka.sln

@@ -13,6 +13,7 @@
 using MahApps.Metro.Controls;
 using System.ComponentModel;
 using Microsoft.Win32;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace Etupirka.Dialog
 {
@@ -36,15 +37,25 @@ public GamePropertyDialog(GameExecutionInfo _game)
 		}
 
 		private bool updating;
-		private void SyncESID_Click(object sender, RoutedEventArgs e)
+		private async void SyncESID_Click(object sender, RoutedEventArgs e)
 		{
 			if (updating)
 			{
 				return;
 			}
 			updating = true;
-			bgame.updateInfoFromES();
-			updating = false;
+			try
+			{
+				await bgame.updateInfoFromES();
+			}
+			catch
+			{
+				await this.ShowMessageAsync("Error", "Failed to sync game data");
+			}
+			finally
+			{
+				updating = false;
+			}
 		}
 
 		private void btnDialogOk_Click(object sender, RoutedEventArgs e)

Etupirka/Dialog/GamePropertyDialog.xaml.cs

@@ -11,6 +11,6 @@
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <StartAction>Program</StartAction>
+    <StartAction>Project</StartAction>
   </PropertyGroup>
 </Project>

Etupirka/Etupirka.csproj.user

@@ -93,15 +93,15 @@ public string SaleDayString
 				else return "";
 			}
 		}
-		public void updateInfoFromES()
+		public async Task updateInfoFromES()
 		{
 			if (Properties.Settings.Default.useOfflineESDatabase)
 			{
 				updateInfoFromESOffline();
 			}
 			else
 			{
-				updateInfoFromESOnline();
+				await updateInfoFromESOnline();
 			}
 
 		}
@@ -121,36 +121,16 @@ public void updateInfoFromESOffline()
 			}
 		} 
 
-		public async void updateInfoFromESOnline()
+		public async Task updateInfoFromESOnline()
 		{
 			if (erogameScapeID > 0)
 			{
-				string result =	await TaskEx.Run(() => { return NetworkUtility.GetString("http://erogamescape.dyndns.org/~ap2/ero/toukei_kaiseki/game.php?game=" + erogameScapeID); });
-					
-				//Console.Write(result);
-				string matchTitle = "<div id=\"soft-title\"><span class=\"bold\">(?<title>.*?)</span>";
-				string matchBrand = "<td><a href=\"brand.php\\?brand=(?<brandid>.*?)\">(?<brand>.*?)</a></td>";
-				string matchSaleDay = "<td><a href=\"toukei_hatubaibi_month.php\\?.*\">(?<saleday>.*?)</a></td>";
+				var document = await NetworkUtility.GetHtmlDocument("http://erogamescape.dyndns.org/~ap2/ero/toukei_kaiseki/game.php?game=" + erogameScapeID);
 
-				Regex re = new Regex(matchTitle, RegexOptions.IgnoreCase);
-				for (Match m = re.Match(result); m.Success; m = m.NextMatch())
-				{
-					Title = System.Net.WebUtility.HtmlDecode(m.Groups["title"].Value);
-			//		Console.Write(title);
-				}
-				re = new Regex(matchBrand, RegexOptions.IgnoreCase);
-				for (Match m = re.Match(result); m.Success; m = m.NextMatch())
-				{
-					Brand = System.Net.WebUtility.HtmlDecode(m.Groups["brand"].Value);
-		//			Console.Write(brand);
-				}
-				re = new Regex(matchSaleDay, RegexOptions.IgnoreCase);
-				for (Match m = re.Match(result); m.Success; m = m.NextMatch())
-				{
-					string saleday = m.Groups["saleday"].Value;
-					SaleDay = DateTime.ParseExact(saleday, "yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture);
-			//		Console.Write(saleday);
-				}
+				Title = document.GetElementById("soft-title").GetElementsByTagName("span")[0].InnerText;
+				Brand = document.GetElementById("brand").GetElementsByTagName("td")[0].InnerText;
+				string saleday = document.GetElementById("sellday").GetElementsByTagName("td")[0].InnerText;
+				SaleDay = DateTime.ParseExact(saleday, "yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture);
 			}
 		}
 

Etupirka/GameData/GameInfo.cs

@@ -309,7 +309,7 @@ private void UpdateStatus(int time=0)
                      }
                      catch (Exception e)
                      {
-                         Console.WriteLine(e);
+                         // Console.WriteLine(e);
                      }
                  }
 

Etupirka/MainWindow.xaml.cs

@@ -5,6 +5,10 @@
 using System.Text;
 using System.Collections;
 using Etupirka.Views;
+using System.Windows.Forms;
+using System.Threading.Tasks;
+using System.Threading;
+using Timer = System.Threading.Timer;
 
 namespace Etupirka
 {
@@ -68,5 +72,16 @@ public static byte[] GetData(string uri)
 				return null;
 			}
 		}
+
+		public static Task<HtmlDocument> GetHtmlDocument(string uri, int timeoutMs = 10000)
+		{
+			var browser = new WebBrowser();
+			var taskCompletionSource = new TaskCompletionSource<HtmlDocument>();
+			Timer timer = new Timer((state) => taskCompletionSource.TrySetException(new TimeoutException()), null, timeoutMs, Timeout.Infinite);
+			browser.DocumentCompleted += (sender, e) => taskCompletionSource.TrySetResult(browser.Document);
+			browser.ScriptErrorsSuppressed = true;
+			browser.Navigate(uri);
+			return taskCompletionSource.Task;
+		}
 	}
 }