[Mp-plugins-svn] SF.net SVN: mp-plugins:[4779] trunk/plugins/BrowseTheWeb/Source/ BrowseTheWeb

[<dos...@us...>]

Revision: 4779
          http://sourceforge.net/p/mp-plugins/code/4779
Author:   doskabouter
Date:     2014-04-02 20:27:51 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Refactor Bookmarks.cs

Modified Paths:
--------------
    trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
    trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs

Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs	2014-04-01 20:13:04 UTC (rev 4778)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs	2014-04-02 20:27:51 UTC (rev 4779)
@@ -31,6 +31,9 @@
 
 using System.Drawing;
 
+using Gecko;
+using Gecko.Utils;
+
 namespace BrowseTheWeb
 {
 
@@ -181,6 +184,8 @@
 
     public class Bookmark
     {
+        private static string ThumbDir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb";
+
         public static TreeNode FindNode(TreeView Treeview, string Name)
         {
             foreach (TreeNode t in Treeview.Nodes[0].Nodes)
@@ -224,8 +229,7 @@
         {
             try
             {
-                string filename = GetThumbString(Url);
-                filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+                string filename = GetSnapPath(Url);
                 Snap.Save(filename);
             }
             catch (Exception e)
@@ -233,22 +237,20 @@
                 MyLog.debug("Exception: " + e.ToString());
             }
         }
+
         public static Bitmap GetSnap(string Url)
         {
-            Bitmap snap = null;
 
             try
             {
-                string filename = GetThumbString(Url);
-                filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+                string filename = GetSnapPath(Url);
 
                 if (File.Exists(filename))
                 {
-                    snap = (Bitmap)Bitmap.FromFile(filename);
-                    return snap;
+                    return (Bitmap)Bitmap.FromFile(filename);
                 }
                 else
-                    MyLog.debug("Getsnap does not exist");
+                    MyLog.debug("Getsnap " + filename + " does not exist");
 
             }
             catch (Exception e)
@@ -256,31 +258,19 @@
                 MyLog.debug("Exception: " + e.ToString());
             }
 
-            return snap;
+            return null;
         }
 
         public static string GetSnapPath(string Url)
         {
             string filename = GetThumbString(Url);
-            filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+            return Path.Combine(ThumbDir, filename);
+        }
 
-            return filename;
-        }
         public static void InitCachePath()
         {
-            if (!Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb"))
-                Directory.CreateDirectory(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb");
-
-
-            if (Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb"))
-            {
-                string[] files = Directory.GetFiles(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb", "*.*");
-                foreach (string f in files)
-                {
-                    File.Move(f, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + Path.GetFileName(f));
-                }
-            }
-
+            if (!Directory.Exists(ThumbDir))
+                Directory.CreateDirectory(ThumbDir);
         }
 
         private static string GetThumbString(string Name)
@@ -300,5 +290,22 @@
             result = result + ".png";
             return result;
         }
+
+        public static bool GetAndSaveSnap(GeckoWebBrowser browser)
+        {
+            if (browser.Url.ToString() != "about:blank")
+            {
+                Bitmap snap = browser.GetBitmap((uint)browser.Width, (uint)browser.Height);
+
+                snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
+
+                Graphics g = Graphics.FromImage((Image)snap);
+                g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
+
+                Bookmark.SaveSnap(snap, browser.Url.ToString());
+                return true;
+            }
+            return false;
+        }
     }
 }

Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs	2014-04-01 20:13:04 UTC (rev 4778)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs	2014-04-02 20:27:51 UTC (rev 4779)
@@ -27,7 +27,6 @@
 using System.Windows.Forms;
 
 using Gecko;
-using Gecko.Utils;
 
 namespace BrowseTheWeb.Setup
 {
@@ -62,16 +61,8 @@
 
         private void browser_DocumentCompleted(object sender, EventArgs e)
         {
-            if (browser.Url.ToString() != "about:blank")
+            if (Bookmark.GetAndSaveSnap(browser))
             {
-                Bitmap snap = browser.GetBitmap((uint)browser.Width, (uint)browser.Height);
-
-                snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
-
-                Graphics g = Graphics.FromImage((Image)snap);
-                g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
-
-                Bookmark.SaveSnap(snap, SelectedUrl);
                 received = true;
                 chkGetThumb.Checked = true;
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.