show number of tonies in database

add manual JSON downloading
toniebox-reverse-engineering · Jan 3, 2024 · d429f7c · d429f7c
1 parent caa2957
commit d429f7c
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 32 deletions.
diff --git a/TeddyBench/TeddyMain.Designer.cs b/TeddyBench/TeddyMain.Designer.cs
diff --git a/TeddyBench/TeddyMain.cs b/TeddyBench/TeddyMain.cs
@@ -133,11 +133,11 @@ public int Compare(object a, object b)
             }
         }
 
-        public void LoadJson()
+        public void LoadJson(bool force = false)
         {
             try
             {
-                if (Settings.DownloadJson)
+                if (Settings.DownloadJson || force)
                 {
                     try
                     {
@@ -212,7 +212,6 @@ public TeddyMain()
             LoadJson();
             StartThreads();
 
-
             UpdateCheckThread = new SafeThread(UpdateCheck, "UpdateCheckThread");
             UpdateCheckThread.Start();
 
@@ -350,22 +349,43 @@ private void Proxmark3_DeviceFound(object sender, string e)
 
         private void UpdateStatusBar()
         {
+            string text = "";
+
             if (RfidReader != null && RfidReader.Connected)
             {
                 if (!statusStrip1.Visible)
                 {
                     statusStrip1.Show();
                 }
                 string voltageString = Settings.DebugWindow ? ", " + RfidReader.AntennaVoltage.ToString("0.00", CultureInfo.InvariantCulture) + " V" : "";
-                statusLabel.Text = RfidReader.HardwareType + " (FW: " + (RfidReader.UnlockSupported ? "SLIX-L enabled" : "stock") + voltageString + ") found at " + RfidReader.CurrentPort + ". The UID of the tag will be automatically used where applicable.";
+
+                text += " | " + RfidReader.HardwareType + " (FW: " + (RfidReader.UnlockSupported ? "SLIX-L enabled" : "stock") + voltageString + ") found at " + RfidReader.CurrentPort + ". The UID of the tag will be automatically used where applicable.";
             }
-            else
+
+            if(TonieInfos.Length == 0)
+            {
+                text += " | No tonies.json, consider downloading it";
+            }
+            else
+            {
+                text += " | tonies.json has " + TonieInfos.Length + " entries";
+            }
+
+            if (text == "")
             {
                 if (statusStrip1.Visible)
                 {
                     statusStrip1.Hide();
                 }
             }
+            else
+            {
+                if (!statusStrip1.Visible)
+                {
+                    statusStrip1.Show();
+                }
+                statusLabel.Text = text.Trim().Trim('|').Trim();
+            }
         }
 
         private void Proxmark3_UidFound(object sender, string e)
@@ -2365,5 +2385,10 @@ private void downloadToniesjsonOnStartupToolStripMenuItem_Click(object sender, E
             Settings.DownloadJson = downloadToniesjsonOnStartupToolStripMenuItem.Checked;
             SaveSettings();
         }
+
+        private void downloadToniesjsonNowToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            LoadJson(true);
+        }
     }
 }