Make OPMLparser only concerned with parsing feeds

Previously it also called addFeeds(), but I moved that into the
function that calls it.

2 files changed, 13 insertions, 11 deletions

diff --git a/src/Backend/FeedServerInterface.vala b/src/Backend/FeedServerInterface.vala
index ed605872..f9acbb08 100644
--- a/src/Backend/FeedServerInterface.vala
+++ b/src/Backend/FeedServerInterface.vala
@@ -118,7 +118,8 @@ public abstract void removeCatFromFeed(string feedID, string catID);
 public virtual void importOPML(string opml)
 {
 	var parser = new OPMLparser(opml);
-	parser.parse();
+	var feeds = parser.parse();
+	addFeeds(feeds);
 }
 
 public abstract bool getFeedsAndCats(Gee.List<Feed> feeds, Gee.List<Category> categories, Gee.List<Tag> tags, GLib.Cancellable? cancellable = null);
diff --git a/src/Backend/OPMLparser.vala b/src/Backend/OPMLparser.vala
index 5d81fd75..6781ca51 100644
--- a/src/Backend/OPMLparser.vala
+++ b/src/Backend/OPMLparser.vala
@@ -17,27 +17,31 @@ public class FeedReader.OPMLparser : GLib.Object {
 
 private string m_opmlString;
 private uint m_level = 0;
-private Gee.List<Feed> m_feeds;
+private Gee.List<Feed> m_feeds = new Gee.ArrayList<Feed>();
 
 public OPMLparser(string opml)
 {
 	m_opmlString = opml;
-	m_feeds = new Gee.LinkedList<Feed>();
 }
 
-public bool parse()
+public Gee.List<Feed> parse()
 {
+	if(!m_feeds.is_empty)
+	{
+		Logger.error("OPMLParser is not meant to be re-used!");
+		m_feeds = new Gee.ArrayList<Feed>();
+	}
+
 	Xml.Doc* doc = Xml.Parser.read_doc(m_opmlString, null, null, 0);
 	if(doc == null)
 	{
 		Logger.error("OPML: parsing xml failed");
-		return false;
+		return m_feeds;
 	}
 
-
 	Xml.Node* root = doc->get_root_element();
 	if(root->name != "opml")
-		return false;
+		return m_feeds;
 
 	Logger.debug("OPML version: " + root->get_prop("version"));
 
@@ -58,10 +62,7 @@ public bool parse()
 		}
 	}
 
-	Logger.debug("Subscribe to feeds");
-	FeedServer.get_default().addFeeds(m_feeds);
-
-	return true;
+	return m_feeds;
 }
 
 private void parseHead(Xml.Node* root)