From c5b0bfcd91cac4b02e9b2cac03036ca04782b699 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 7 May 2019 18:34:45 -0500
Subject: [PATCH] Save feed folder relationship identifier

---
 Frameworks/Account/Feed.swift                 | 10 +++++
 Frameworks/Account/FeedMetadata.swift         | 10 +++++
 .../Feedbin/FeedbinAccountDelegate.swift      | 45 ++++++++++++++-----
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/Frameworks/Account/Feed.swift b/Frameworks/Account/Feed.swift
index dd1c963ca..c9973c7c3 100644
--- a/Frameworks/Account/Feed.swift
+++ b/Frameworks/Account/Feed.swift
@@ -118,6 +118,16 @@ public final class Feed: DisplayNameProvider, Renamable, UnreadCountProvider, Ha
 		}
 	}
 
+	// Folder Name: Sync Service Relationship ID
+	public var folderRelationship: [String: String]? {
+		get {
+			return metadata.folderRelationship
+		}
+		set {
+			metadata.folderRelationship = newValue
+		}
+	}
+	
 	// MARK: - DisplayNameProvider
 
 	public var nameForDisplay: String {
diff --git a/Frameworks/Account/FeedMetadata.swift b/Frameworks/Account/FeedMetadata.swift
index 23116ebbd..b6d0e7182 100644
--- a/Frameworks/Account/FeedMetadata.swift
+++ b/Frameworks/Account/FeedMetadata.swift
@@ -28,6 +28,7 @@ final class FeedMetadata: Codable {
 		case authors
 		case contentHash
 		case conditionalGetInfo
+		case folderRelationship
 	}
 
 	var homePageURL: String? {
@@ -93,6 +94,14 @@ final class FeedMetadata: Codable {
 			}
 		}
 	}
+	
+	var folderRelationship: [String: String]? {
+		didSet {
+			if folderRelationship != oldValue {
+				valueDidChange(.folderRelationship)
+			}
+		}
+	}
 
 	weak var delegate: FeedMetadataDelegate?
 
@@ -103,4 +112,5 @@ final class FeedMetadata: Codable {
 	func valueDidChange(_ key: CodingKeys) {
 		delegate?.valueDidChange(self, key: key)
 	}
+	
 }
diff --git a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
index 60c294fcd..6b558681c 100644
--- a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
+++ b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
@@ -91,6 +91,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
 					BatchUpdate.shared.perform {
 						for feed in folder.topLevelFeeds {
 							account.addFeed(feed, to: nil)
+							self?.clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
 						}
 						account.deleteFolder(folder)
 					}
@@ -168,6 +169,7 @@ private extension FeedbinAccountDelegate {
 					DispatchQueue.main.sync {
 						for feed in folder.topLevelFeeds {
 							account.addFeed(feed, to: nil)
+							clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
 						}
 						account.deleteFolder(folder)
 					}
@@ -295,27 +297,30 @@ private extension FeedbinAccountDelegate {
 			}
 		}()
 
-		let taggingsDict = taggings.reduce([String: [String]]()) { (dict, tagging) in
+		let taggingsDict = taggings.reduce([String: [FeedbinTagging]]()) { (dict, tagging) in
 			var taggedFeeds = dict
 			if var taggedFeed = taggedFeeds[tagging.name] {
-				taggedFeed.append(String(tagging.feedID))
+				taggedFeed.append(tagging)
 				taggedFeeds[tagging.name] = taggedFeed
 			} else {
-				taggedFeeds[tagging.name] = [String(tagging.feedID)]
+				taggedFeeds[tagging.name] = [tagging]
 			}
 			return taggedFeeds
 		}
 
 		// Sync the folders
-		for (folderName, feedIDs) in taggingsDict {
+		for (folderName, groupedTaggings) in taggingsDict {
 			
 			guard let folder = folderDict[folderName] else { return }
-				
+			
+			let taggingFeedIDs = groupedTaggings.map { String($0.feedID) }
+			
 			// Move any feeds not in the folder to the account
 			for feed in folder.topLevelFeeds {
-				if !feedIDs.contains(feed.feedID) {
+				if !taggingFeedIDs.contains(feed.feedID) {
 					DispatchQueue.main.sync {
 						folder.deleteFeed(feed)
+						clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
 						account.addFeed(feed, to: nil)
 					}
 				}
@@ -325,11 +330,13 @@ private extension FeedbinAccountDelegate {
 			let folderFeedIds = folder.topLevelFeeds.map { $0.feedID }
 			
 			var feedsToAdd = Set<Feed>()
-			for feedId in feedIDs {
-				if !folderFeedIds.contains(feedId) {
-					guard let feed = account.idToFeedDictionary[feedId] else {
+			for tagging in groupedTaggings {
+				let taggingFeedID = String(tagging.feedID)
+				if !folderFeedIds.contains(taggingFeedID) {
+					guard let feed = account.idToFeedDictionary[taggingFeedID] else {
 						continue
 					}
+					saveFolderRelationship(for: feed, withFolderName: folderName, id: String(tagging.taggingID))
 					feedsToAdd.insert(feed)
 				}
 			}
@@ -340,12 +347,12 @@ private extension FeedbinAccountDelegate {
 			
 		}
 		
-		let taggedFeedIds = Set(taggings.map { String($0.feedID) })
+		let taggedFeedIDs = Set(taggings.map { String($0.feedID) })
 		
 		// Delete all the feeds without a tag
 		var feedsToDelete = Set<Feed>()
 		for feed in account.topLevelFeeds {
-			if taggedFeedIds.contains(feed.feedID) {
+			if taggedFeedIDs.contains(feed.feedID) {
 				feedsToDelete.insert(feed)
 			}
 		}
@@ -375,4 +382,20 @@ private extension FeedbinAccountDelegate {
 
 	}
 	
+	func clearFolderRelationship(for feed: Feed, withFolderName folderName: String) {
+		if var folderRelationship = feed.folderRelationship {
+			folderRelationship[folderName] = nil
+			feed.folderRelationship = folderRelationship
+		}
+	}
+	
+	func saveFolderRelationship(for feed: Feed, withFolderName folderName: String, id: String) {
+		if var folderRelationship = feed.folderRelationship {
+			folderRelationship[folderName] = id
+			feed.folderRelationship = folderRelationship
+		} else {
+			feed.folderRelationship = [folderName: id]
+		}
+	}
+	
 }