Merge pull request #4 from Zotikus1001/main

A few improvements, bug fixes, restored ballistics functionality.

Author: hwangshkr

App.config

@@ -9,6 +9,22 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="IronSoftware.Drawing.Common" publicKeyToken="8d7e55c97b3e9835" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2022.11.10457.0" newVersion="2022.11.10457.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Item.cs

@@ -20,6 +20,8 @@ public class Item
         public String buy_from_trader;
         public String buy_from_trader_price;
         public String last_updated;
+        public String profit;
+        public String banned_from_flea;
 
         public String needs;
         public String bartersandcrafts;

MainForm.Designer.cs

@@ -3,16 +3,19 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
-using System.Text.Json;
+using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Newtonsoft.Json;
 
 namespace TarkovPriceViewer
 {
     static class Program
     {
+        public static bool UsingAPI = true;
+ 
         private static MainForm main = null;
         public static Dictionary<String, String> settings = new Dictionary<String, String>();
         public static readonly List<Item> itemlist = new List<Item>();
@@ -29,21 +32,27 @@ static class Program
         public static readonly String appname = "EscapeFromTarkov";
         public static readonly String loading = "Loading...";
         public static readonly String notfound = "Item Name Not Found.";
-        public static readonly String noflea = "Item not Found on Flea.";
-        public static readonly String notfinishloading = "Wait for Loading Data. Please Check Your Internet, and Check Tarkov Wiki Site.";
+        public static readonly String waitingForTooltip = "Loading";
+        public static readonly String noflea = "Item not Found on the Flea Market.";
+        public static readonly String notfinishloading = "Ballistics Data not finished loading. \nPlease try again or check your Internet connection.";
+        public static readonly String notfinishloadingAPI = "API not finished loading. \nPlease try again or check your Internet connection.";
         public static readonly String presscomparekey = "Please Press Compare Key.";
         public static bool finishloadingballistics = false;
+        public static bool finishloadingAPI = false;
         public static readonly String wiki = "https://escapefromtarkov.fandom.com/wiki/";
+        public static readonly String tarkov_dev = "https://tarkov.dev/";
         public static readonly String tarkovmarket = "https://tarkov-market.com/item/";
         public static readonly String official = "https://www.escapefromtarkov.com/";
-        public static readonly String github = "https://github.com/hwangshkr/TarkovPriceViewer";
-        public static readonly String checkupdate = "https://github.com/hwangshkr/TarkovPriceViewer/raw/main/README.md";
+        public static readonly String github = "https://github.com/Zotikus1001/TarkovPriceViewer";
+        public static readonly String checkupdate = "https://github.com/Zotikus1001/TarkovPriceViewer/raw/main/README.md";
         public static readonly char rouble = '₽';
         public static readonly char dollar = '$';
         public static readonly char euro = '€';
         public static readonly char[] splitcur = new char[] { rouble, dollar, euro };
         public static readonly Regex inraid_filter = new Regex(@"in raid");
         public static readonly Regex money_filter = new Regex(@"([\d,]+[₽\$€]|[₽\$€][\d,]+)");
+        public static DateTime APILastUpdated = DateTime.Now.AddHours(-5);
+        public static TarkovAPI.Data tarkovAPI;
 
         /// <summary>
         /// 해당 애플리케이션의 주 진입점입니다.
@@ -65,14 +74,25 @@ static void Main()
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine(ex.Message);
+                    Debug.WriteLine("Error 15: " + ex.Message);
                 }
             }
             ThreadPool.SetMinThreads(10, 10);
             ThreadPool.SetMaxThreads(20, 20);
             Task task = Task.Factory.StartNew(() => getBallistics());
+
             LoadSettings();
-            getItemList();
+
+            if (UsingAPI)
+            {
+                if (File.Exists(@"Resources\TarkovAPI.json"))
+                    APILastUpdated = File.GetLastWriteTime(@"Resources\TarkovAPI.json");
+
+                Task task2 = Task.Factory.StartNew(() => UpdateItemListAPI());
+            }
+            else
+                getItemList();
+
             main = new MainForm();
             if (Convert.ToBoolean(settings["MinimizetoTrayWhenStartup"]))
             {
@@ -96,18 +116,113 @@ private static void getItemList()
                 {
                     String[] spl = textValue[i].Split('\t');
                     Item item = new Item();
-                    item.name_display = spl[0].Trim();
-                    item.name_display2 = spl[2].Trim();
+                    item.name_display = spl[0].Trim(); //Column 1
+                    item.name_display2 = spl[2].Trim(); //Column 3
                     item.name_compare = item.name_display.ToLower().ToCharArray();
                     item.name_compare2 = item.name_display2.ToLower().ToCharArray();
-                    item.market_address = spl[1].Replace(" ", "_").Trim();
-                    item.wiki_address = spl[0].Replace(" ", "_").Trim();
+                    item.market_address = spl[1].Replace(" ", "_").Trim(); //Column 2
+                    item.wiki_address = spl[0].Replace(" ", "_").Trim(); //Column 1
                     itemlist.Add(item);
                 }
             }
             Debug.WriteLine("itemlist Count : " + itemlist.Count);
         }
 
+        public static async void UpdateItemListAPI()
+        {
+            if (UsingAPI)
+            {
+                //If Outdated by 15 minutes.
+                if ((DateTime.Now - APILastUpdated).TotalMinutes >= 15)
+                {
+                    try
+                    {
+                        Debug.WriteLine("\n--> Updating API...");
+
+                        var data = new Dictionary<string, string>()
+                        {
+                            {"query", "{\r\n  items {\r\n    name\r\n    types\r\n    lastLowPrice\r\n    avg24hPrice\r\n    updated\r\n    fleaMarketFee\r\n    link\r\n    wikiLink\r\n    width\r\n    height\r\n    properties {\r\n      ... on ItemPropertiesAmmo {\r\n        caliber\r\n        damage\r\n        projectileCount\r\n        penetrationPower\r\n        armorDamage\r\n        fragmentationChance\r\n        ammoType\r\n      }\r\n      ... on ItemPropertiesWeapon {\r\n        caliber\r\n        ergonomics\r\n        defaultRecoilVertical\r\n        defaultRecoilHorizontal\r\n        defaultWidth\r\n        defaultHeight\r\n        defaultAmmo {\r\n          name\r\n        }\r\n      }\r\n    }\r\n    sellFor {\r\n      currency\r\n      priceRUB\r\n      vendor {\r\n        name\r\n        ... on TraderOffer {\r\n          minTraderLevel\r\n        }\r\n      }\r\n    }\r\n    buyFor {\r\n      currency\r\n      priceRUB\r\n      vendor {\r\n        name\r\n        ... on TraderOffer {\r\n          minTraderLevel\r\n        }\r\n      }\r\n    }\r\n    usedInTasks {\r\n      name\r\n      trader {\r\n        name\r\n      }\r\n      map {\r\n        name\r\n      }\r\n      minPlayerLevel\r\n      traderLevelRequirements {\r\n        level\r\n      }\r\n    }\r\n  }\r\n}"}
+                        };
+
+                        using (var httpClient = new HttpClient())
+                        {
+                            //Http response message
+                            var httpResponse = await httpClient.PostAsJsonAsync("https://api.tarkov.dev/graphql", data);
+                            //Response content
+                            string responseContent = await httpResponse.Content.ReadAsStringAsync();
+
+                            int index = responseContent.IndexOf("{\"data\":");
+                            if (index != -1)
+                            {
+                                responseContent = responseContent.Remove(index, 8);
+                                responseContent = responseContent.Remove(responseContent.Length - 1, 1);
+                            }
+
+                            //Prettify JSON (Produces a larger file)
+                            //responseContent = JToken.Parse(responseContent).ToString();
+
+                            tarkovAPI = JsonConvert.DeserializeObject<TarkovAPI.Data>(responseContent);
+                            APILastUpdated = DateTime.Now;
+                            finishloadingAPI = true;
+                            Debug.WriteLine("\n--> API Updated!");
+                            File.WriteAllText(@"Resources\TarkovAPI.json", responseContent);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        //MessageBox.Show("--> Error trying to update Tarkov API: " + ex.Message);
+                        Thread.Sleep(500);
+                        UpdateItemListAPI();
+                    }
+                }
+                else if (tarkovAPI == null)
+                {
+                    try
+                    {
+                        string responseContent = File.ReadAllText(@"Resources\TarkovAPI.json");
+                        tarkovAPI = JsonConvert.DeserializeObject<TarkovAPI.Data>(responseContent);
+                        Debug.WriteLine("\nAPI Loaded from local File! \n" + LastUpdated(APILastUpdated));
+                        finishloadingAPI = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        //MessageBox.Show("\n--> Error trying to load Tarkov API from local file: " + ex.Message);
+                        Thread.Sleep(500);
+                        UpdateItemListAPI();
+                    }
+                }
+                else
+                    Debug.WriteLine("--> No need to update API! \n--> " + LastUpdated(APILastUpdated) + "\n");
+            }
+        }
+
+        public static string LastUpdated(DateTime time)
+        {
+            TimeSpan elapsed = DateTime.Now - time;
+
+            if (elapsed.TotalHours < 1)
+            {
+                if (elapsed.TotalMinutes < 1)
+                    return $"Updated: {(int)elapsed.TotalMinutes} minute ago";
+                else
+                    return $"Updated: {(int)elapsed.TotalMinutes} minutes ago";
+            }
+            else if (elapsed.TotalDays < 1)
+            {
+                if (elapsed.TotalHours < 2)
+                    return $"Updated: {(int)elapsed.TotalHours} hour ago";
+                else
+                    return $"Updated: {(int)elapsed.TotalHours} hours ago";
+            }
+            else
+            {
+                if(elapsed.TotalDays <= 1) 
+                    return $"Updated: {(int)elapsed.TotalDays} day ago";
+                else
+                    return $"Updated: {(int)elapsed.TotalDays} days ago";
+            }
+        }
+
         public static void LoadSettings()
         {
             try
@@ -119,16 +234,16 @@ public static void LoadSettings()
                 String text = File.ReadAllText(setting_path);
                 try
                 {
-                    settings = JsonSerializer.Deserialize<Dictionary<String, String>>(text);
-                } catch (JsonException je)
+                    settings = System.Text.Json.JsonSerializer.Deserialize<Dictionary<String, String>>(text);
+                } catch (System.Text.Json.JsonException je)
                 {
-                    Debug.WriteLine(je.Message);
+                    Debug.WriteLine("Error 11: " + je.Message);
                     text = "{}";
-                    settings = JsonSerializer.Deserialize<Dictionary<String, String>>(text);
+                    settings = System.Text.Json.JsonSerializer.Deserialize<Dictionary<String, String>>(text);
                 }
                 String st;
                 settings.Remove("Version");//force
-                settings.Add("Version", "v1.18");//force
+                settings.Add("Version", "v1.22");//force
                 if (!settings.TryGetValue("MinimizetoTrayWhenStartup", out st))
                 {
                     settings.Add("MinimizetoTrayWhenStartup", "false");
@@ -188,7 +303,7 @@ public static void LoadSettings()
             }
             catch (Exception e)
             {
-                Debug.WriteLine(e.Message);
+                Debug.WriteLine("Error 12: " + e.Message);
             }
         }
 
@@ -200,12 +315,12 @@ public static void SaveSettings()
                 {
                     File.Create(setting_path).Dispose();
                 }
-                string jsonString = JsonSerializer.Serialize<Dictionary<String, String>>(settings);
+                string jsonString = System.Text.Json.JsonSerializer.Serialize<Dictionary<String, String>>(settings);
                 File.WriteAllText(setting_path, jsonString.Replace(",", ",\n"));
             }
             catch (Exception e)
             {
-                Debug.WriteLine(e.Message);
+                Debug.WriteLine("Error 13: " + e.Message);
             }
         }
 
@@ -220,9 +335,10 @@ private static void getBallistics()
                         HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
                         Debug.WriteLine(Program.wiki + "Ballistics");
                         doc.LoadHtml(wc.DownloadString(Program.wiki + "Ballistics"));
-                        HtmlAgilityPack.HtmlNode node_tm = doc.DocumentNode.SelectSingleNode("//table[@id='trkballtable']");
+                        HtmlAgilityPack.HtmlNode node_tm = doc.DocumentNode.SelectSingleNode("//table[4]"); //table[@id='trkballtable']
                         HtmlAgilityPack.HtmlNodeCollection nodes = null;
                         HtmlAgilityPack.HtmlNodeCollection sub_nodes = null;
+
                         if (node_tm != null)
                         {
                             node_tm = node_tm.SelectSingleNode(".//tbody");
@@ -299,7 +415,7 @@ private static void getBallistics()
                                                 }
                                                 catch (Exception ex)
                                                 {
-                                                    Debug.WriteLine(ex.Message);
+                                                    Debug.WriteLine("Error 14: " + ex.Message);
                                                 }
                                                 damage += " = " + mul;
                                             }
@@ -334,11 +450,11 @@ private static void getBallistics()
                 }
                 catch (Exception e)
                 {
-                    Debug.WriteLine("error with ballistics : " + e.Message);
+                    Debug.WriteLine("Error with Ballistics : " + e.Message);
                     Thread.Sleep(3000);
                 }
             }
-            Debug.WriteLine("finish to get ballistics.");
+            Debug.WriteLine("Finished getting Ballistics!");
         }
     }
 }

MainForm.cs

@@ -1,11 +1,16 @@
-# <img width="36" align="center" src="https://user-images.githubusercontent.com/32073152/126047438-2f1b7e59-ca31-43f2-bcf6-00b2f00e408c.png"/> Tarkov Price Viewer v1.18
-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.
+# <img width="36" align="center" src="https://user-images.githubusercontent.com/32073152/126047438-2f1b7e59-ca31-43f2-bcf6-00b2f00e408c.png"/> Tarkov Price Viewer v1.22
+This Overlay software is meant to help new players.
+You can easily distinguish all the strengths and weaknesses of all the ammo in the game.
+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.
 
 # How to use
-<img src="https://user-images.githubusercontent.com/32073152/130308975-2a380c87-f0d1-4e9e-91e6-cc2381d5d2c0.gif"/>
-When the name appears as in the image, press the shortcut key (default: F9). By default, it disappears when you move the mouse, and this can be removed from the settings. It disappears even if you press the shortcut key (default: F10).
+<img src="https://i.imgur.com/bluk1dQ.gif"/>
+Hover the item and press the shortcut key (default: F9). 
+By default, it disappears when you move the mouse, and this can be removed from the settings. 
+It disappears even if you press the shortcut key (default: F10).
 </br>
 </br>
 <img src="https://user-images.githubusercontent.com/32073152/130593787-f0979114-46cf-47cb-93f3-2f364195e7e9.gif"/>
@@ -14,12 +19,19 @@ This is the experiential function since version 1.06. You can compare some optio
 Sorting function is added since Version 1.08.</br>
 </br>
 </br>
-<img src="https://user-images.githubusercontent.com/32073152/131343945-99a673df-877b-4059-a674-85ea6df966cf.png"/>
-Ballistics is added since Version 1.08.
+<img src="https://i.imgur.com/iLxEsIc.png"/>
+Ballistics added since Version 1.08.
 </br>
 </br>
-<img src="https://user-images.githubusercontent.com/32073152/131344302-57be08bb-b6f1-449a-a653-20544db68630.png"/>
-You can set some values for the functions.
+<img src="https://i.imgur.com/9POHPgA.png"/>
+<img src="https://i.imgur.com/Xru5QA5.png"/>
+<img src="https://i.imgur.com/GKyoYLl.png"/>
+<img src="https://i.imgur.com/Sn7DPlO.png"/>
+Loot Tiers added in v1.21
+</br>
+</br>
+<img src="https://i.imgur.com/GdkE78e.png"/>
+You can change the settings how you like.
 </br>
 </br>
 If you got errors, please check you installed .NET Framework 4.7.2 (https://dotnet.microsoft.com/download/dotnet-framework/net472).
@@ -42,3 +54,4 @@ If you got errors, please check you installed .NET Framework 4.7.2 (https://dotn
 4. Tarkov Market (https://tarkov-market.com/)
 5. Tarkov Wiki (https://escapefromtarkov.fandom.com/wiki/Escape_from_Tarkov_Wiki)
 6. Escape from Tarkov(https://www.escapefromtarkov.com/)
+7. Tarkov.dev API(https://tarkov.dev/)