From: <dos...@us...> - 2012-04-08 15:18:16
|
Revision: 4471 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4471&view=rev Author: doskabouter Date: 2012-04-08 15:18:09 +0000 (Sun, 08 Apr 2012) Log Message: ----------- fixed missing some bookmark thumbs Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2012-04-04 21:12:44 UTC (rev 4470) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2012-04-08 15:18:09 UTC (rev 4471) @@ -35,238 +35,236 @@ namespace BrowseTheWeb { - public class Bookmark - { - private static XmlTextWriter textWriter; - - public static bool Save(TreeView Treeview, string Path) + public class Bookmark { - bool result = false; + private static XmlTextWriter textWriter; - try - { - textWriter = new XmlTextWriter(Path, null); - textWriter.Formatting = Formatting.Indented; - - textWriter.WriteStartDocument(); - textWriter.WriteStartElement("Bookmarks"); - - foreach (TreeNode t in Treeview.Nodes[0].Nodes) + public static bool Save(TreeView Treeview, string Path) { - BookmarkElement bkm = (BookmarkElement)t.Tag; - if (bkm != null) - { - WriteOneEntry(bkm); + bool result = false; - foreach (TreeNode sub in t.Nodes) + try { - BookmarkElement bkm2 = (BookmarkElement)sub.Tag; - WriteOneEntry(bkm2); - } - } - } + textWriter = new XmlTextWriter(Path, null); + textWriter.Formatting = Formatting.Indented; - textWriter.WriteEndElement(); + textWriter.WriteStartDocument(); + textWriter.WriteStartElement("Bookmarks"); - textWriter.WriteEndDocument(); - textWriter.Close(); + foreach (TreeNode t in Treeview.Nodes[0].Nodes) + { + BookmarkElement bkm = (BookmarkElement)t.Tag; + if (bkm != null) + { + WriteOneEntry(bkm); - result = true; - } - catch - { - // error - } - finally - { - if (textWriter != null) textWriter.Close(); - } + foreach (TreeNode sub in t.Nodes) + { + BookmarkElement bkm2 = (BookmarkElement)sub.Tag; + WriteOneEntry(bkm2); + } + } + } - return result; - } - public static void Load(TreeView Treeview, string Path) - { - Treeview.Nodes.Clear(); + textWriter.WriteEndElement(); - TreeNode main = Treeview.Nodes.Add("Bookmarks", "Bookmarks"); - main.ImageIndex = 2; - main.SelectedImageIndex = 2; + textWriter.WriteEndDocument(); + textWriter.Close(); - try - { - BookmarkXml.LoadBookmarks(Path); - TreeNode akt = new TreeNode(); + result = true; + } + catch + { + // error + } + finally + { + if (textWriter != null) textWriter.Close(); + } - foreach (BookmarkElement bkm in BookmarkXml.BookmarkItems) - { - if (bkm.isFolder) - { - akt = main.Nodes.Add(bkm.Name); - akt.Tag = bkm; - akt.ImageIndex = 1; - akt.SelectedImageIndex = 1; - } - if (bkm.isSubFolder) - { - TreeNode sub = akt.Nodes.Add(bkm.Name); - sub.Tag = bkm; - } - if ((!bkm.isFolder) && (!bkm.isSubFolder)) - { - TreeNode add = main.Nodes.Add(bkm.Name); - add.Tag = bkm; - } + return result; } + public static void Load(TreeView Treeview, string Path) + { + Treeview.Nodes.Clear(); - Treeview.Invalidate(); + TreeNode main = Treeview.Nodes.Add("Bookmarks", "Bookmarks"); + main.ImageIndex = 2; + main.SelectedImageIndex = 2; - } - catch { } - } + try + { + BookmarkXml.LoadBookmarks(Path); + TreeNode akt = new TreeNode(); - private static void WriteOneEntry(BookmarkElement bkm) - { - textWriter.WriteStartElement("Entry"); + foreach (BookmarkElement bkm in BookmarkXml.BookmarkItems) + { + if (bkm.isFolder) + { + akt = main.Nodes.Add(bkm.Name); + akt.Tag = bkm; + akt.ImageIndex = 1; + akt.SelectedImageIndex = 1; + } + if (bkm.isSubFolder) + { + TreeNode sub = akt.Nodes.Add(bkm.Name); + sub.Tag = bkm; + } + if ((!bkm.isFolder) && (!bkm.isSubFolder)) + { + TreeNode add = main.Nodes.Add(bkm.Name); + add.Tag = bkm; + } + } - textWriter.WriteStartElement("Name"); - textWriter.WriteValue(bkm.Name); - textWriter.WriteEndElement(); + Treeview.Invalidate(); - textWriter.WriteStartElement("URL"); - textWriter.WriteValue(bkm.Url); - textWriter.WriteEndElement(); + } + catch { } + } - textWriter.WriteStartElement("Visited"); - textWriter.WriteValue(bkm.Visited); - textWriter.WriteEndElement(); + private static void WriteOneEntry(BookmarkElement bkm) + { + textWriter.WriteStartElement("Entry"); - textWriter.WriteStartElement("LastVisited"); - textWriter.WriteValue(bkm.LastVisited); - textWriter.WriteEndElement(); + textWriter.WriteStartElement("Name"); + textWriter.WriteValue(bkm.Name); + textWriter.WriteEndElement(); - textWriter.WriteStartElement("Created"); - textWriter.WriteValue(bkm.Created); - textWriter.WriteEndElement(); + textWriter.WriteStartElement("URL"); + textWriter.WriteValue(bkm.Url); + textWriter.WriteEndElement(); - textWriter.WriteStartElement("isFolder"); - textWriter.WriteValue(bkm.isFolder); - textWriter.WriteEndElement(); + textWriter.WriteStartElement("Visited"); + textWriter.WriteValue(bkm.Visited); + textWriter.WriteEndElement(); - textWriter.WriteStartElement("isSubFolder"); - textWriter.WriteValue(bkm.isSubFolder); - textWriter.WriteEndElement(); + textWriter.WriteStartElement("LastVisited"); + textWriter.WriteValue(bkm.LastVisited); + textWriter.WriteEndElement(); - textWriter.WriteEndElement(); + textWriter.WriteStartElement("Created"); + textWriter.WriteValue(bkm.Created); + textWriter.WriteEndElement(); - } + textWriter.WriteStartElement("isFolder"); + textWriter.WriteValue(bkm.isFolder); + textWriter.WriteEndElement(); - public static bool Exists(TreeView Treeview, string Name) - { - foreach (TreeNode t in Treeview.Nodes[0].Nodes) - { - if (Name == t.Text) - return true; - foreach (TreeNode sub in t.Nodes) - { - if (Name == sub.Text) - return true; - } - } - return false; - } + textWriter.WriteStartElement("isSubFolder"); + textWriter.WriteValue(bkm.isSubFolder); + textWriter.WriteEndElement(); - public static bool isValidUrl(string URL) - { - try - { - Uri urlCheck = new Uri(URL); - WebRequest request = WebRequest.Create(urlCheck); - request.Timeout = 10000; + textWriter.WriteEndElement(); - WebResponse response; + } - response = request.GetResponse(); - } - catch (Exception) - { - return false; //url does not exist - } - return true; - } + public static bool Exists(TreeView Treeview, string Name) + { + foreach (TreeNode t in Treeview.Nodes[0].Nodes) + { + if (Name == t.Text) + return true; + foreach (TreeNode sub in t.Nodes) + { + if (Name == sub.Text) + return true; + } + } + return false; + } - public static void SaveSnap(Bitmap Snap, string Url) - { - try - { - string filename = GetThumbString(Url); - filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename; + public static bool isValidUrl(string URL) + { + try + { + Uri urlCheck = new Uri(URL); + WebRequest request = WebRequest.Create(urlCheck); + request.Timeout = 10000; - Snap.Save(filename); - } - catch { } - } - public static Bitmap GetSnap(string Url) - { - Bitmap snap = null; + WebResponse response; - try - { - string filename = GetThumbString(Url); - filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename; + response = request.GetResponse(); + } + catch (Exception) + { + return false; //url does not exist + } + return true; + } - if (File.Exists(filename)) + public static void SaveSnap(Bitmap Snap, string Url) { - snap = (Bitmap)Bitmap.FromFile(filename); - return snap; + try + { + string filename = GetThumbString(Url); + filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename; + + Snap.Save(filename); + } + catch { } } - } - catch { } + public static Bitmap GetSnap(string Url) + { + Bitmap snap = null; - return snap; - } + try + { + string filename = GetThumbString(Url); + filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename; - public static string GetSnapPath(string Url) - { - string filename = GetThumbString(Url); - filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename; + if (File.Exists(filename)) + { + snap = (Bitmap)Bitmap.FromFile(filename); + return snap; + } + } + catch { } - 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"); + return snap; + } - - 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) + public static string GetSnapPath(string Url) { - File.Move(f, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + Path.GetFileName(f)); + string filename = GetThumbString(Url); + filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + 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"); - } - private static string GetThumbString(string Name) - { - string result = Name; + 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 (result.EndsWith("/")) result = result.Substring(0, result.Length - 1); + } - int x = result.IndexOf("//"); - if (x > 0) - { - result = result.Substring(x + 2); - } + private static string GetThumbString(string Name) + { + string result = Name; - result = result.Replace("/", "_"); - result = result.Replace(".", "_"); - result = result.Replace("?", "_"); - result = result + ".png"; + if (result.EndsWith("/")) result = result.Substring(0, result.Length - 1); - return result; + int x = result.IndexOf("//"); + if (x > 0) + { + result = result.Substring(x + 2); + } + + foreach (char c in Path.GetInvalidFileNameChars()) + result = result.Replace(c, '_'); + result = result + ".png"; + return result; + } } - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dos...@us...> - 2013-11-12 21:38:43
|
Revision: 4675 http://sourceforge.net/p/mp-plugins/code/4675 Author: doskabouter Date: 2013-11-12 21:38:40 +0000 (Tue, 12 Nov 2013) Log Message: ----------- Minor logging improvement Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2013-11-11 18:20:05 UTC (rev 4674) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2013-11-12 21:38:40 UTC (rev 4675) @@ -198,10 +198,12 @@ { string filename = GetThumbString(Url); filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename; - Snap.Save(filename); } - catch { } + catch (Exception e) + { + MyLog.debug("Exception: " + e.ToString()); + } } public static Bitmap GetSnap(string Url) { @@ -217,8 +219,14 @@ snap = (Bitmap)Bitmap.FromFile(filename); return snap; } + else + MyLog.debug("Getsnap does not exist"); + } - catch { } + catch (Exception e) + { + MyLog.debug("Exception: " + e.ToString()); + } return snap; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |