Merge pull request #786 from 39aldo39/fix-remove-category

When a category is removed, uncategorize feeds/categories explicitly to plugins

2 files changed, 18 insertions, 20 deletions

diff --git a/src/Backend/Backend.vala b/src/Backend/Backend.vala
index 930e070c..1a0ccddd 100644
--- a/src/Backend/Backend.vala
+++ b/src/Backend/Backend.vala
@@ -576,6 +576,24 @@ namespace FeedReader {
 
 		public void removeCategory(string catID)
 		{
+			var feeds = DataBase.readOnly().read_feeds();
+			foreach(Feed feed in feeds)
+			{
+				if(feed.hasCat(catID))
+				{
+					moveFeed(feed.getFeedID(), catID);
+				}
+			}
+
+			var cats = DataBase.readOnly().read_categories(feeds);
+			foreach(var cat in cats)
+			{
+				if(cat.getParent() == catID)
+				{
+					moveCategory(cat.getCatID(), uncategorizedID());
+				}
+			}
+
 			asyncPayload pl = () => { FeedServer.get_default().deleteCategory(catID); };
 			callAsync.begin((owned)pl, (obj, res) => { callAsync.end(res); });
 
diff --git a/src/DataBaseWriteAccess.vala b/src/DataBaseWriteAccess.vala
index 6f92ba06..95f77b63 100644
--- a/src/DataBaseWriteAccess.vala
+++ b/src/DataBaseWriteAccess.vala
@@ -624,26 +624,6 @@ public class FeedReader.DataBase : DataBaseReadOnly {
 	public void delete_category(string catID)
 	{
 		m_db.execute("DELETE FROM main.categories WHERE categorieID = ?", { catID });
-
-		if(FeedServer.get_default().supportMultiCategoriesPerFeed())
-		{
-			var rows = m_db.execute("SELECT feed_id, category_id FROM feeds WHERE instr(category_id, ?) > 0", { catID });
-			foreach(var row in rows)
-			{
-				string feedID = row[0].to_string();
-				string catIDs = row[1].to_string().replace(catID + ",", "");
-
-				m_db.execute("UPDATE main.feeds set category_id = ? WHERE feed_id = ?", { catIDs, feedID });
-			}
-		}
-		else
-		{
-			m_db.execute("UPDATE main.feeds set category_id = ? WHERE category_id = ?", { FeedServer.get_default().uncategorizedID(), catID });
-			if(FeedServer.get_default().supportMultiLevelCategories())
-			{
-				m_db.execute("UPDATE main.categories set Parent = \"-2\" WHERE categorieID = ?", { catID });
-			}
-		}
 	}
 
 	public void rename_category(string catID, string newName)