update market parsing

hwangshkr · hwangshkr · commit afa26a859ac3 · 2022-04-11T20:48:37.000+09:00
diff --git a/MainForm.cs b/MainForm.cs
@@ -631,35 +631,53 @@ private void FindItemInfo(Item item, bool isiteminfo, CancellationToken cts_one)
                                                     item.price_week = subnodes[1].InnerText.Trim();
                                                 }
                                             }
+                                            else if (sub_node_tm.InnerText.Trim().Contains("Buy from trader"))
+                                            {
+                                                if (node.ChildNodes.Count > 2)
+                                                {
+                                                    String[] temp = node.ChildNodes[2].InnerText.Trim().Split(' ');
+                                                    item.buy_from_trader = temp[0] + " " + temp[1];
+                                                    item.buy_from_trader_price = temp[2];
+                                                }
+                                            }
+                                            else if (sub_node_tm.InnerText.Trim().Contains("Sell to trader"))
+                                            {
+                                                if (node.ChildNodes.Count > 2)
+                                                {
+                                                    String[] temp = node.ChildNodes[2].InnerText.Trim().Split(' ');
+                                                    item.sell_to_trader = temp[0] + " " + temp[1];
+                                                    item.sell_to_trader_price = temp[2];
+                                                }
+                                            }/*
                                             else
                                             {
                                                 sub_node_tm2 = sub_node_tm.SelectSingleNode(".//div[@class='bold']");
                                                 if (sub_node_tm2 != null)
                                                 {
-                                                    String[] temp = sub_node_tm.InnerText.Trim().Split(' ');
+                                                    String[] temp = sub_node_tm2.InnerText.Trim().Split(' ');
                                                     if (temp.Length > 2)
                                                     {
-                                                        if (sub_node_tm.InnerText.Trim().Contains("LL"))
+                                                        if (sub_node_tm2.InnerText.Trim().Contains("LL"))
                                                         {
                                                             item.buy_from_trader = temp[0].Trim() + " " + temp[1];
-                                                            sub_node_tm = node.SelectSingleNode(".//div[@class='bold alt']");
-                                                            if (sub_node_tm != null)
+                                                            sub_node_tm2 = node.SelectSingleNode(".//div[@class='bold alt']");
+                                                            if (sub_node_tm2 != null)
                                                             {
-                                                                item.buy_from_trader_price = sub_node_tm.InnerText.Trim();
+                                                                item.buy_from_trader_price = sub_node_tm2.InnerText.Trim();
                                                             }
                                                         }
                                                         else
                                                         {
                                                             item.sell_to_trader = temp[0].Trim();
-                                                            sub_node_tm = node.SelectSingleNode(".//div[@class='bold alt']");
-                                                            if (sub_node_tm != null)
+                                                            sub_node_tm2 = node.SelectSingleNode(".//div[@class='bold alt']");
+                                                            if (sub_node_tm2 != null)
                                                             {
-                                                                item.sell_to_trader_price = sub_node_tm.InnerText.Trim();
+                                                                item.sell_to_trader_price = sub_node_tm2.InnerText.Trim();
                                                             }
                                                         }
                                                     }
                                                 }
-                                            }
+                                            }*/
                                         }
                                     }
                                 }
diff --git a/Program.cs b/Program.cs
@@ -128,7 +128,7 @@ public static void LoadSettings()
                 }
                 String st;
                 settings.Remove("Version");//force
-                settings.Add("Version", "v1.16");//force
+                settings.Add("Version", "v1.17");//force
                 if (!settings.TryGetValue("MinimizetoTrayWhenStartup", out st))
                 {
                     settings.Add("MinimizetoTrayWhenStartup", "false");
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# <img width="36" align="center" src="https://user-images.githubusercontent.com/32073152/126047438-2f1b7e59-ca31-43f2-bcf6-00b2f00e408c.png"/> Tarkov Price Viewer v1.16
+# <img width="36" align="center" src="https://user-images.githubusercontent.com/32073152/126047438-2f1b7e59-ca31-43f2-bcf6-00b2f00e408c.png"/> Tarkov Price Viewer v1.17
 This program is for newbies. It is especially good to find out the market price in advance when the flea market is not open yet. Currently, only English is available.
 
 Most of the information for this program (names, prices, wiki links, etc.) was provided by the Tarkov Market, and some information (Needs, etc.) was provided by the Tarkov Wiki.

Original file line number	Diff line number	Diff line change
`@@ -631,35 +631,53 @@ private void FindItemInfo(Item item, bool isiteminfo, CancellationToken cts_one)`
`631`	`631`	`item.price_week = subnodes[1].InnerText.Trim();`
`632`	`632`	`}`
`633`	`633`	`}`
	`634`	`+ else if (sub_node_tm.InnerText.Trim().Contains("Buy from trader"))`
	`635`	`+ {`
	`636`	`+ if (node.ChildNodes.Count > 2)`
	`637`	`+ {`
	`638`	`+ String[] temp = node.ChildNodes[2].InnerText.Trim().Split(' ');`
	`639`	`+ item.buy_from_trader = temp[0] + " " + temp[1];`
	`640`	`+ item.buy_from_trader_price = temp[2];`
	`641`	`+ }`
	`642`	`+ }`
	`643`	`+ else if (sub_node_tm.InnerText.Trim().Contains("Sell to trader"))`
	`644`	`+ {`
	`645`	`+ if (node.ChildNodes.Count > 2)`
	`646`	`+ {`
	`647`	`+ String[] temp = node.ChildNodes[2].InnerText.Trim().Split(' ');`
	`648`	`+ item.sell_to_trader = temp[0] + " " + temp[1];`
	`649`	`+ item.sell_to_trader_price = temp[2];`
	`650`	`+ }`
	`651`	`+ }/*`
`634`	`652`	`else`
`635`	`653`	`{`
`636`	`654`	`sub_node_tm2 = sub_node_tm.SelectSingleNode(".//div[@class='bold']");`
`637`	`655`	`if (sub_node_tm2 != null)`
`638`	`656`	`{`
`639`		`- String[] temp = sub_node_tm.InnerText.Trim().Split(' ');`
	`657`	`+ String[] temp = sub_node_tm2.InnerText.Trim().Split(' ');`
`640`	`658`	`if (temp.Length > 2)`
`641`	`659`	`{`
`642`		`- if (sub_node_tm.InnerText.Trim().Contains("LL"))`
	`660`	`+ if (sub_node_tm2.InnerText.Trim().Contains("LL"))`
`643`	`661`	`{`
`644`	`662`	`item.buy_from_trader = temp[0].Trim() + " " + temp[1];`
`645`		`- sub_node_tm = node.SelectSingleNode(".//div[@class='bold alt']");`
`646`		`- if (sub_node_tm != null)`
	`663`	`+ sub_node_tm2 = node.SelectSingleNode(".//div[@class='bold alt']");`
	`664`	`+ if (sub_node_tm2 != null)`
`647`	`665`	`{`
`648`		`- item.buy_from_trader_price = sub_node_tm.InnerText.Trim();`
	`666`	`+ item.buy_from_trader_price = sub_node_tm2.InnerText.Trim();`
`649`	`667`	`}`
`650`	`668`	`}`
`651`	`669`	`else`
`652`	`670`	`{`
`653`	`671`	`item.sell_to_trader = temp[0].Trim();`
`654`		`- sub_node_tm = node.SelectSingleNode(".//div[@class='bold alt']");`
`655`		`- if (sub_node_tm != null)`
	`672`	`+ sub_node_tm2 = node.SelectSingleNode(".//div[@class='bold alt']");`
	`673`	`+ if (sub_node_tm2 != null)`
`656`	`674`	`{`
`657`		`- item.sell_to_trader_price = sub_node_tm.InnerText.Trim();`
	`675`	`+ item.sell_to_trader_price = sub_node_tm2.InnerText.Trim();`
`658`	`676`	`}`
`659`	`677`	`}`
`660`	`678`	`}`
`661`	`679`	`}`
`662`		`- }`
	`680`	`+ }*/`
`663`	`681`	`}`
`664`	`682`	`}`
`665`	`683`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static void LoadSettings()`
`128`	`128`	`}`
`129`	`129`	`String st;`
`130`	`130`	`settings.Remove("Version");//force`
`131`		`- settings.Add("Version", "v1.16");//force`
	`131`	`+ settings.Add("Version", "v1.17");//force`
`132`	`132`	`if (!settings.TryGetValue("MinimizetoTrayWhenStartup", out st))`
`133`	`133`	`{`
`134`	`134`	`settings.Add("MinimizetoTrayWhenStartup", "false");`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# <img width="36" align="center" src="https://user-images.githubusercontent.com/32073152/126047438-2f1b7e59-ca31-43f2-bcf6-00b2f00e408c.png"/> Tarkov Price Viewer v1.16`
	`1`	`+# <img width="36" align="center" src="https://user-images.githubusercontent.com/32073152/126047438-2f1b7e59-ca31-43f2-bcf6-00b2f00e408c.png"/> Tarkov Price Viewer v1.17`
`2`	`2`	`This program is for newbies. It is especially good to find out the market price in advance when the flea market is not open yet. Currently, only English is available.`
`3`	`3`
`4`	`4`	`Most of the information for this program (names, prices, wiki links, etc.) was provided by the Tarkov Market, and some information (Needs, etc.) was provided by the Tarkov Wiki.`