From 9fea9c2d126444ab13a4bd1d1f1a9686561878be Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 17 Jan 2018 22:03:13 -0800 Subject: [PATCH] Create and use fetchUnsortedArticles(for:), which is common code that needed to be a separate function. --- .../Timeline/TimelineViewController.swift | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Evergreen/MainWindow/Timeline/TimelineViewController.swift b/Evergreen/MainWindow/Timeline/TimelineViewController.swift index 236cffb74..1234c6072 100644 --- a/Evergreen/MainWindow/Timeline/TimelineViewController.swift +++ b/Evergreen/MainWindow/Timeline/TimelineViewController.swift @@ -641,6 +641,15 @@ private extension TimelineViewController { return } + let fetchedArticles = fetchUnsortedArticles(for: representedObjects) + let sortedArticles = Array(fetchedArticles).sortedByDate() + if articles != sortedArticles { + articles = sortedArticles + } + } + + func fetchUnsortedArticles(for representedObjects: [Any]) -> Set
{ + var fetchedArticles = Set
() for object in representedObjects { @@ -653,13 +662,9 @@ private extension TimelineViewController { } } - let sortedArticles = Array(fetchedArticles).sortedByDate() - if articles != sortedArticles { - articles = sortedArticles - } + return fetchedArticles } - func fetchAndMergeArticles() { let selectedArticleIDs = selectedArticles.articleIDs()