add image caching to fix #8 and #9

toniebox-reverse-engineering · Jul 5, 2020 · da930e5 · da930e5
1 parent 7efc29b
commit da930e5
Showing 1 changed file with 51 additions and 13 deletions.
diff --git a/TeddyBench/MainForm.cs b/TeddyBench/MainForm.cs
@@ -19,6 +19,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
 using TeddyBench.Properties;
 using TonieFile;
 using Application = System.Windows.Forms.Application;
@@ -217,12 +218,6 @@ void SaveSettings()
             Settings.Save("teddyBench.cfg");
         }
 
-        protected override void OnFormClosing(FormClosingEventArgs e)
-        {
-            SaveSettings();
-            base.OnFormClosing(e);
-        }
-
         private void Proxmark3_DeviceFound(object sender, string e)
         {
             if (InvokeRequired)
@@ -352,6 +347,7 @@ protected override void OnDragDrop(DragEventArgs drgevent)
         protected override void OnClosing(CancelEventArgs e)
         {
             StopThreads();
+            SaveSettings();
             base.OnClosing(e);
         }
 
@@ -623,14 +619,14 @@ private void AnalyzeMain()
                                     }
                                     if (!string.IsNullOrEmpty(info.Pic) && !lstTonies.LargeImageList.Images.ContainsKey(hash))
                                     {
-                                        HttpWebRequest request = (HttpWebRequest)WebRequest.Create(info.Pic);
-                                        HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-                                        Image img = ResizeImage(Image.FromStream(response.GetResponseStream()), 128, 128);
-
-                                        this.BeginInvoke(new Action(() =>
+                                        Image img = GetImage(info.Pic, hash);
+                                        if (img != null)
                                         {
-                                            lstTonies.LargeImageList.Images.Add(hash, img);
-                                        }));
+                                            this.BeginInvoke(new Action(() =>
+                                            {
+                                                lstTonies.LargeImageList.Images.Add(hash, img);
+                                            }));
+                                        }
                                     }
                                     image = hash;
                                 }
@@ -678,6 +674,48 @@ private void AnalyzeMain()
             }
         }
 
+        private Image GetImage(string pic, string hash)
+        {
+            string cacheFileName = Path.Combine("cache", hash + ".png");
+
+            try
+            {
+                if(!Directory.Exists("cache"))
+                {
+                    Directory.CreateDirectory("cache");
+                }
+
+                if (File.Exists(cacheFileName))
+                {
+                    return Image.FromFile(cacheFileName);
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(pic);
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+                Image img = ResizeImage(Image.FromStream(response.GetResponseStream()), 128, 128);
+
+                try
+                {
+                    img.Save(cacheFileName);
+                }
+                catch (Exception ex)
+                {
+                }
+                return img;
+            }
+            catch (Exception ex)
+            {
+            }
+
+            return null;
+        }
+
         private TonieAudio GetTonieAudio(string fileName)
         {
             FileInfo info = new FileInfo(fileName);