Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2797] trunk/plugins/MyDailyComics
|
From: <tim...@us...> - 2009-04-15 13:27:18
|
Revision: 2797
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2797&view=rev
Author: timmyt81
Date: 2009-04-15 13:27:13 +0000 (Wed, 15 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyDailyComics/MyDailyComics.cs
trunk/plugins/MyDailyComics/MyDailyComics.suo
trunk/plugins/MyDailyComics/MyXmlReader.cs
trunk/plugins/MyDailyComics/gui/Setup.cs
trunk/plugins/MyDailyComics/model/Config.cs
Removed Paths:
-------------
trunk/plugins/MyDailyComics/_version012/mydailycomics_v012.zip
Modified: trunk/plugins/MyDailyComics/MyDailyComics.cs
===================================================================
--- trunk/plugins/MyDailyComics/MyDailyComics.cs 2009-04-15 12:00:18 UTC (rev 2796)
+++ trunk/plugins/MyDailyComics/MyDailyComics.cs 2009-04-15 13:27:13 UTC (rev 2797)
@@ -225,13 +225,16 @@
conf.Init();
Title = conf.PluginName;
GUIPropertyManager.SetProperty("#title", Title);
-
// load comics xml
MyXmlReader reader = new MyXmlReader();
ArrayList alComics = new ArrayList();
reader.parseXml(conf.XmlLocation, alComics,true);
_comics = ComicHelper.Instance.prepareArrayList(alComics);
- SelectedComic = _comics[0];
+ try
+ {
+ SelectedComic = _comics[0];
+ }
+ catch (Exception ex) { }
}
/// <summary>
Modified: trunk/plugins/MyDailyComics/MyDailyComics.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyDailyComics/MyXmlReader.cs
===================================================================
--- trunk/plugins/MyDailyComics/MyXmlReader.cs 2009-04-15 12:00:18 UTC (rev 2796)
+++ trunk/plugins/MyDailyComics/MyXmlReader.cs 2009-04-15 13:27:13 UTC (rev 2797)
@@ -42,97 +42,104 @@
public void parseXml(string pathToXml, ArrayList alComics, bool onlyLoadEnabled)
{
- XmlTextReader reader = new XmlTextReader(pathToXml);
- ComicStrip comic = new ComicStrip();
- while (reader.Read())
+ try
{
- XmlNodeType nodeType = reader.NodeType;
-
- switch (nodeType)
+ XmlTextReader reader = new XmlTextReader(pathToXml);
+ ComicStrip comic = new ComicStrip();
+ while (reader.Read())
{
- case XmlNodeType.Element:
- switch (reader.Name)
- {
- case "comic":
- comic = new ComicStrip();
- break;
+ XmlNodeType nodeType = reader.NodeType;
- case "name":
- comic.Name = reader.ReadInnerXml();
- break;
+ switch (nodeType)
+ {
+ case XmlNodeType.Element:
+ switch (reader.Name)
+ {
+ case "comic":
+ comic = new ComicStrip();
+ break;
- case "url":
- comic.Url = reader.ReadInnerXml();
- break;
+ case "name":
+ comic.Name = reader.ReadInnerXml();
+ break;
- case "banner":
- comic.Banner = reader.ReadInnerXml();
- break;
+ case "url":
+ comic.Url = reader.ReadInnerXml();
+ break;
- case "enabled":
- string enabled = reader.ReadInnerXml();
- comic.Enabled = (enabled == true.ToString().ToLowerInvariant());
- break;
+ case "banner":
+ comic.Banner = reader.ReadInnerXml();
+ break;
- case "language":
- comic.Language = reader.ReadInnerXml();
- break;
+ case "enabled":
+ string enabled = reader.ReadInnerXml();
+ comic.Enabled = (enabled == true.ToString().ToLowerInvariant());
+ break;
- case "startswith":
- comic.StartsWith = reader.ReadInnerXml();
- break;
+ case "language":
+ comic.Language = reader.ReadInnerXml();
+ break;
- case "endswith":
- comic.EndsWith = reader.ReadInnerXml();
- break;
+ case "startswith":
+ comic.StartsWith = reader.ReadInnerXml();
+ break;
- case "title":
- _title = reader.ReadInnerXml();
- break;
+ case "endswith":
+ comic.EndsWith = reader.ReadInnerXml();
+ break;
- case "type":
- comic.Type = reader.ReadInnerXml();
- break;
+ case "title":
+ _title = reader.ReadInnerXml();
+ break;
- case "urltype":
- comic.UrlType = reader.ReadInnerXml();
- break;
+ case "type":
+ comic.Type = reader.ReadInnerXml();
+ break;
- case "firstrelease":
- comic.FirstRelease = reader.ReadInnerXml();
- break;
+ case "urltype":
+ comic.UrlType = reader.ReadInnerXml();
+ break;
- case "lastrelease":
- comic.LastRelease = reader.ReadInnerXml();
- break;
+ case "firstrelease":
+ comic.FirstRelease = reader.ReadInnerXml();
+ break;
- }
- break;
+ case "lastrelease":
+ comic.LastRelease = reader.ReadInnerXml();
+ break;
+ }
+ break;
- case XmlNodeType.EndElement:
- if (reader.Name.Equals("comic"))
- {
- if (onlyLoadEnabled)
+
+ case XmlNodeType.EndElement:
+ if (reader.Name.Equals("comic"))
{
- if (comic.Enabled)
+ if (onlyLoadEnabled)
{
+ if (comic.Enabled)
+ {
+ alComics.Add(comic);
+ }
+ }
+ else
+ {
alComics.Add(comic);
}
}
- else
- {
- alComics.Add(comic);
- }
- }
- break;
+ break;
+ }
}
+ reader.Close();
+ reader = null;
}
- reader.Close();
- reader = null;
- }
+ catch (Exception ex)
+ {
+ Log.Error("Error during reading comic.xml file: " + pathToXml);
+ }
+ }
}
-
+
}
Deleted: trunk/plugins/MyDailyComics/_version012/mydailycomics_v012.zip
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyDailyComics/gui/Setup.cs
===================================================================
--- trunk/plugins/MyDailyComics/gui/Setup.cs 2009-04-15 12:00:18 UTC (rev 2796)
+++ trunk/plugins/MyDailyComics/gui/Setup.cs 2009-04-15 13:27:13 UTC (rev 2797)
@@ -35,6 +35,7 @@
using MyDailyComics.util;
using MyDailyComics.model;
using System.Diagnostics;
+using System.IO;
namespace MyDailyComics.gui
{
Modified: trunk/plugins/MyDailyComics/model/Config.cs
===================================================================
--- trunk/plugins/MyDailyComics/model/Config.cs 2009-04-15 12:00:18 UTC (rev 2796)
+++ trunk/plugins/MyDailyComics/model/Config.cs 2009-04-15 13:27:13 UTC (rev 2797)
@@ -68,6 +68,10 @@
}
reader.Close();
}
+ else
+ {
+ reset();
+ }
}
public void reset()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
