Commit Graph

888 Commits

Author SHA1 Message Date
Maurice Parker 0ce1bf5ebc Added sync database integration 2020-03-31 20:56:34 -05:00
Maurice Parker c3b5d337c5 Change to use 0 and 1 for boolean. 2020-03-31 20:42:39 -05:00
Maurice Parker 3f82a28d21 Add import OPML for CloudKit. 2020-03-31 18:10:35 -05:00
Maurice Parker 0cafee7f59 Renamed old name left over from refactoring. 2020-03-31 16:47:02 -05:00
Maurice Parker cdde8e4b09 Refactored the OPML load code so that the normalization step is separate from the add step. 2020-03-31 15:21:53 -05:00
Maurice Parker 31e06cd24a Add batch update block to fetch to prevent the Feeds list from dancing around. 2020-03-31 11:18:52 -05:00
Maurice Parker 1be5dc8a54 Implemented feed and folder restore so that undo works. 2020-03-31 11:07:54 -05:00
Maurice Parker 218df326f4 Fix issue where out of order records was dropping web feeds. 2020-03-31 10:32:04 -05:00
Maurice Parker 90376dac03 Implement add, move, delete folder operations for feeds. 2020-03-31 03:30:53 -05:00
Maurice Parker df1faa368f Refactored add feed code to be more reliable. 2020-03-31 02:20:47 -05:00
Maurice Parker 203b83d64d Enable adding feeds to folders. 2020-03-30 21:11:57 -05:00
Maurice Parker 6d3e6914df Fix account container lookup so that it doesn't keep creating records. 2020-03-30 18:14:07 -05:00
Maurice Parker 1ee3c3d85a Made sure the special account container didn't get created locally. 2020-03-30 18:03:56 -05:00
Maurice Parker 766eb507bf Add container handling code 2020-03-30 15:15:45 -05:00
Maurice Parker 53e947ee4c Rename addFolder to createFolder to be more consistent. 2020-03-30 13:35:02 -05:00
Maurice Parker f68d523a15 Merge branch 'ios-release' 2020-03-30 11:50:58 -05:00
Maurice Parker 187121298e Added support for CloudKit push notifications (subscriptions). 2020-03-30 02:48:25 -05:00
Brent Simmons cf98ff49ea Implement retention policy for feed-based accounts (local, iCloud). 2020-03-29 23:20:01 -07:00
Brent Simmons 85b24ff92d Add parentheses in the right places to make Xcode 11.4 happy with our tuples. 2020-03-29 18:53:15 -07:00
Brent Simmons 2c4ee99dc2 Create and use ArticlesDatabase.RetentionStyle enum. 2020-03-29 18:51:03 -07:00
Maurice Parker e2d8db6f26 Added feed rename sync to iCloud. 2020-03-29 17:53:11 -05:00
Maurice Parker 4f425c9c86 Implement web feed sync between devices. 2020-03-29 17:12:34 -05:00
Maurice Parker c0e1fbfff3 Add external id lookups for folders and web feeds. 2020-03-29 12:07:54 -05:00
Maurice Parker 2afdd26c9d Change function names using the find suffix to use the existing suffix to match precedent. 2020-03-29 12:00:02 -05:00
Maurice Parker 3b31f2562d Stub out fetching feed changes. 2020-03-29 11:53:52 -05:00
Maurice Parker 573cee0fd6 Added delete feed functionality. 2020-03-29 08:52:59 -05:00
Maurice Parker 6ce82fc28b Implement CloudKit feed add. 2020-03-29 03:43:20 -05:00
Maurice Parker f59d6f712f Simplify record handling. 2020-03-28 08:53:03 -05:00
Maurice Parker fe2297213d Add automatic zone creation. 2020-03-28 08:30:25 -05:00
Maurice Parker f288e3d5d8 More infrastructure work on CloudKit. 2020-03-27 13:59:42 -05:00
Maurice Parker d0680bcc73 Merge branch 'ios-release' 2020-03-24 12:21:32 -05:00
Brent Simmons fb4f72ad18 Save articles from multiple web feeds at once — rather than doing it feed-by-feed — when syncing. (This makes syncing faster.) Fix #1794. 2020-03-22 19:25:53 -07:00
Maurice Parker 8105756ccb Add some work in progress for CloudKit syncing 2020-03-22 16:35:03 -05:00
Anh Do bdbeced5d2
Initial feed download now retrieves entries in the last 90 days 2020-03-22 01:11:00 -04:00
Anh Do cfaacd0ada
Fix starred story hashes being parsed incorrectly 2020-03-22 00:47:33 -04:00
Anh Do 59f3fb4b3d
Handle account-level folder when syncing 2020-03-22 00:47:33 -04:00
Anh Do f0fe308c7b
Update last article fetch time 2020-03-22 00:47:33 -04:00
Anh Do a784b11d1c
Fix feeds being returned without corresponding folder 2020-03-22 00:47:33 -04:00
Anh Do 1e5033febe
Restore feed and folder 2020-03-22 00:47:32 -04:00
Anh Do 1e66860f34
Move feed 2020-03-22 00:47:32 -04:00
Anh Do fe7cbe3bd3
Fix feed deletion in folder triggering unexpected deletes 2020-03-22 00:47:32 -04:00
Anh Do a9615560ae
Fix feed not showing up at account-level if it's also in another folder 2020-03-22 00:47:32 -04:00
Anh Do 51a4a2b3c8
Rename subscriptionID to externalID 2020-03-22 00:47:32 -04:00
Anh Do 20ff053335
Rename, delete web feed, fix adding feed directly under account not working 2020-03-22 00:47:31 -04:00
Anh Do 70302a425c
Refactoring, fix folder changes not working, add new web feed 2020-03-22 00:47:31 -04:00
Anh Do ec855364bc
Remove feeds in folder 2020-03-22 00:47:31 -04:00
Anh Do e6659eea10
Rename and remove folder 2020-03-22 00:47:31 -04:00
Anh Do 494ce5bab9
Add folder 2020-03-22 00:47:31 -04:00
Anh Do 08339606e9
Use secure version of story images 2020-03-22 00:47:30 -04:00
Anh Do fb07cfe187
Handle refresh progress 2020-03-22 00:47:30 -04:00
Anh Do 0479bbd9f5
Parse story image and tags 2020-03-22 00:47:30 -04:00
Anh Do 1d3073c593
Add missing story fetching 2020-03-22 00:47:30 -04:00
Anh Do bde6a607ba
Fix starred story parsing using incorrect JSON field 2020-03-22 00:47:30 -04:00
Anh Do b7e7e17656
Update unread/starred status 2020-03-22 00:47:29 -04:00
Anh Do b8c7e8c1c6
Fix typo 2020-03-22 00:47:29 -04:00
Anh Do e1d5288d3d
Implement status change 2020-03-22 00:47:29 -04:00
Anh Do 8f64f7230d
Add network suspension support 2020-03-22 00:47:29 -04:00
Anh Do bf1a732e8f
Add missing story fetching handler 2020-03-22 00:47:29 -04:00
Anh Do 299619703c
Ignore "everything" folder 2020-03-22 00:47:29 -04:00
Anh Do a913b65700
Fix failing login when credentials include &= 2020-03-22 00:47:28 -04:00
Anh Do 7453e397d5
Read published date from timestamp directly 2020-03-22 00:47:28 -04:00
Anh Do 6b38c07654
Put feeds in folders (code taken from Feedbin) 2020-03-22 00:47:28 -04:00
Anh Do 8e99f8deea
Display flat feed list 2020-03-22 00:47:28 -04:00
Anh Do f4a0c56a54
Use NewsBlur terminologies in models (Feed, Story) 2020-03-22 00:47:28 -04:00
Anh Do 175cd0e798
Parse articles from story river 2020-03-22 00:47:27 -04:00
Anh Do d37f70d2dd
Add unread story hashes query 2020-03-22 00:47:27 -04:00
Anh Do 9727219b09
Add feed list query 2020-03-22 00:47:27 -04:00
Anh Do b7fe991b7b
Retrieve session id for later requests 2020-03-22 00:47:27 -04:00
Anh Do 034aabbfff
Add login/logout support 2020-03-22 00:47:26 -04:00
Maurice Parker f2d9552c85 Renamed subscriptionID to externalD on WebFeed so that it matches what we did with Folder. 2020-03-21 11:33:13 -05:00
Maurice Parker 0d56226146 Fix delegate name. 2020-03-20 17:48:57 -05:00
Maurice Parker e3d46960fd Add CloudKit syncing add account UI. 2020-03-18 15:48:44 -05:00
Maurice Parker 5b5eaf6bb7 Merge branch 'ios-release' 2020-03-14 17:13:25 -05:00
Nate Weaver 1a930c4407 Simplify .utf8 2020-03-14 12:09:00 -05:00
Nate Weaver 6ad6fe46ad Make sure POST body is properly URL-encoded 2020-03-14 12:09:00 -05:00
Maurice Parker 8384725b01
Revert "Make sure POST body is properly URL-encoded" 2020-03-14 02:48:37 -05:00
Nate Weaver aed6858043 Simplify .utf8 2020-03-13 22:16:24 -05:00
Nate Weaver 3af70f5c7c Make sure POST body is properly URL-encoded 2020-03-13 22:12:36 -05:00
Maurice Parker cc0fd50ea2 Make podcast URL's have a lower priority than other URL's. Issue #1897 2020-03-13 12:57:43 -05:00
Maurice Parker fe31ca8076 Normalize the URL if it was found in the HTML metadata. Issue #1896 2020-03-13 12:15:35 -05:00
Maurice Parker 229aada857 Normalize the URL if it was found in the HTML metadata. 2020-03-13 12:11:38 -05:00
Maurice Parker 7d8feba24b Remove file coordinator usage from account files. Issue #1821 2020-03-03 11:39:04 -08:00
Maurice Parker 0e72811429 Implement mark as unread window for accounts that need it. Issue #1407 2020-02-18 13:49:29 -08:00
Maurice Parker 2ae021960b Move account files to the documents directory and out of the shared container. Issue #1784 2020-02-12 16:21:48 -08:00
Nate Weaver 4ac8107f27 Don't unwrap now-non-optionals, and unwrap now-explicit optionals 2020-02-08 18:22:35 -06:00
Brent Simmons c679d92e09 Make the Feedly tests build again — fix references to addOperation. 2020-02-05 22:37:43 -08:00
Brent Simmons 01fc60916e Move the operation queue from Account to ArticlesDatabase, which is the rightful owner. 2020-02-05 22:17:32 -08:00
Brent Simmons d40eaed1f5 Begin moving the MainThreadOperationQueue from Account to ArticlesDatabase. 2020-02-05 21:23:23 -08:00
Brent Simmons 2d33de1205 Fix references to addOperation, which is now just add. 2020-02-05 21:18:29 -08:00
Maurice Parker 2017a2138f Change to only send the unread counts init notification once during program load. Issue #1772 2020-02-03 10:28:34 -08:00
Brent Simmons 0b2ec6473a Call the correct fetchUnreadCounts methd. 2020-02-01 15:16:24 -08:00
Brent Simmons 3f4c84e442 Use the new FetchUnreadCountsForFeedsOperation. 2020-02-01 15:01:47 -08:00
Brent Simmons 30cf8c6a08 Add, as a micro-optimization, a custom hash function for FeedIdentifier. 2020-02-01 15:00:36 -08:00
Kiel Gillard b87882a919 Log failures attempting to add new feeds to a Feedly account to help debug #1691 2020-01-31 17:00:30 +11:00
Kiel Gillard e5e7163f8e Improve the test coverage and add some documentation. 2020-01-31 07:55:50 +11:00
Kiel Gillard a339b05bf8 Santizes right to left div elements from Feedly content. 2020-01-31 07:55:50 +11:00
Brent Simmons dc4850b777 Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate 2020-01-29 23:09:44 -08:00
Brent Simmons 35adaa7a8c Fetch the unread count for just one feed when that’s all that’s needed. Helps performance. 2020-01-29 23:09:38 -08:00
Maurice Parker b53cbfcf2c Make sure completion handler is called when there are no active accounts. Issue #1727 2020-01-28 16:24:35 -07:00
Brent Simmons dc9243dcc7 Make fetching all unread counts an operation. Cancel it when the account is suspending. Turning things like this into operations goes to fixing the dreaded 0xdead10cc crashes. 2020-01-27 23:00:48 -08:00
Nate Weaver b9bba7b614 Update RSWeb 2020-01-27 23:02:01 -06:00
Maurice Parker 118ecd01b0 Fix option set bug in AccountBehaviors. 2020-01-27 20:05:07 -07:00
Brent Simmons 61ccf6fa1f Replace use of Dictionary(uniqueKeysWithValues) with a separate function that can handle duplicate keys without crashing. Fix #1671. 2020-01-21 22:03:33 -08:00
Kiel Gillard fb69a2bc54 Fix the logging of Feedly errors. #1628. 2020-01-21 18:31:41 +11:00
Brent Simmons bca3c4216c Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate 2020-01-19 22:25:13 -08:00
Brent Simmons 70b57b9d4d Disable files with failing Feedly tests. This is meant to be temporary. 2020-01-19 22:25:06 -08:00
Brent Simmons f9f4d70868 Make Feedly tests build again. 2020-01-19 22:19:54 -08:00
Maurice Parker 531c40a059 Escape special XML characters for external folder id. Issue #1659 2020-01-19 22:52:45 -07:00
Brent Simmons f76385ce64 Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate 2020-01-19 16:55:46 -08:00
Brent Simmons a2bcdb1cfd Fix the progress indicator bug I had introduced in working on FeedlyOperation. Make sure FeedlyOperation calls downloadProgress.completeTask(), and make sure that all paths lead there. 2020-01-19 16:55:39 -08:00
Maurice Parker 53ba0bc9ac Fix so that Feedbin correctly stores the perma link in the correct field. 2020-01-19 17:15:21 -07:00
Brent Simmons 6181f416a4 Revise FeedlyOperation to work with MainThreadOperation properly. We’re still using inheritance — FeedlyOperation is a base class. I tried and failed to come up with a better solution. Everything other solution resulted in a lot of boilerplate code being replicated. 2020-01-19 14:19:06 -08:00
Nate Weaver 7ee1f99962 Updates for Data+RSCore changes 2020-01-18 19:18:58 -06:00
Nate Weaver b35215d03b Update for pending RSCore String updates 2020-01-17 13:45:38 -06:00
Kiel Gillard 912a3acb35 Subscribing to a Feedly feed only downloads the first page worth of content, not each and every page. Maybe related to #1408. 2020-01-17 17:16:52 +11:00
Brent Simmons e2e9a66bc5
Merge pull request #1635 from kielgillard/ios-candidate
Let Feedly users add to the uncategorized collection/folder.
2020-01-16 22:01:47 -08:00
Kiel Gillard 02cfc384c4 Makes the Feedly models immutable because they are used to represent API responses only and it improves a developer's ability to reason about how they're used in the codebase. Fixes #1629. 2020-01-17 16:47:21 +11:00
Kiel Gillard c18575ea85 Let Feedly users add to the uncategorized collection/folder. 2020-01-17 15:25:57 +11:00
Maurice Parker fb8d77fff1
Merge pull request #1631 from kielgillard/feedly-fix-tests-post-operations-surgery
Fix test failures by cancelling operations with the queue.
2020-01-16 13:45:36 -08:00
Kiel Gillard f14ba07740 Fix test failures by cancelling operations with the queue. It seems operations no longer can cancel themselves. 2020-01-17 08:27:20 +11:00
Maurice Parker 4f36ec3b11 Add Update Credetials button to the error dialog when a Feedbin credentials error happens. Issue #1441 2020-01-16 13:50:30 -07:00
Maurice Parker 61b788a1de Provide user friendly account error for 403 status code (FORBIDDEN) 2020-01-16 12:17:47 -07:00
Brent Simmons 80542bee12 Add missing calls to super.run() in FeedlyOperation subclasses. 2020-01-15 22:51:00 -08:00
Brent Simmons 57af7526da Revise Feedly tests to use MainThreadOperationQueue; get them building again. They don’t pass, but at least they build. 2020-01-15 22:10:06 -08:00
Brent Simmons 39db00c022 Use MainThreadOperationQueue with Feedly syncing. 2020-01-15 21:30:37 -08:00
Nate Weaver 6eac3781ba Update to latest RSCore
Update use of OMPLString().
2020-01-13 22:20:57 -06:00
Kiel Gillard 325f220181 Ignore the remote article status if the sync database contains a pending (and therefore more recent) status. Fixes #1516. 2020-01-13 18:04:58 +11:00
Nate Weaver e94985e7f2 Update to latest RSCore 2020-01-12 18:26:41 -06:00
Nate Weaver 42b4261793 Treat empty URLs as nil
Fixes #1612.
2020-01-12 03:29:56 -06:00
Kiel Gillard 745b5d8cb8 Fetch article contents from Feedly by ids rather than paging through streams up until the last successful sync date. Issues #1453 #1398 #1408 #1429 2020-01-11 10:45:45 +11:00
Brent Simmons 4ab5c25844 Add createStatusesIfNeeded API to Account, to use with syncing. (Needed for Feedly syncing, and could very well be needed for other systems too.) 2020-01-09 22:27:29 -08:00
Maurice Parker 7824939c30 Make OPML generate in a consistent order when the Web Feed name is the same. Issue #1545 2020-01-06 13:58:51 -07:00
Kiel Gillard 6922b6ddec Use string-based key paths instead of Swift key paths for FeedlyOperation. #1481 2020-01-06 08:59:08 +11:00
Maurice Parker c3fbf88fbb Add check so that we don't update article statuses for articles that we have pending statuses to send. Issue #1515 2020-01-02 18:21:18 -07:00
Brent Simmons e773c11571
Merge pull request #1509 from timothyekl/account-test-api-updates
Update Account tests for new async API
2020-01-02 16:12:17 -08:00
Tim Ekl 44e920b18b Don't explicitly name error variables
Following the resolution of #1512, start using the implicit `error`
variable inside `catch` blocks instead of explicitly declaring `e`
everywhere.
2020-01-02 13:31:06 -08:00
Kiel Gillard 2ee50054dc Indicate FeedlyOperations are asynchronous. 2020-01-02 10:00:09 +11:00
Kiel Gillard f455bcec16 Models the feed website url of feedly articles as an optional since it seems the Feedly API will not always provide one. Issue #1449. 2020-01-02 09:34:24 +11:00
Tim Ekl 5ac18b14a7 Add missing expectations to send statuses tests
f82be27666 flipped around calls to `selectPendingCount(_:)` so that it
respected the new async nature of the method; however, it neglected to
add enough XCTestExpectations to keep the test methods running through
the callbacks. Add those here.
2020-01-01 13:39:17 -08:00
Tim Ekl e4c84bc501 Add two missing expectation fulfillments
It looks like two tests in FeedlySetStarredArticlesOperationTests
created but never referenced XCTestExpectation instances. Based on the
other nearby tests, add a call to `fulfill()` inside the associated
completion block after the rest of our test assertions are done.
2019-12-31 19:41:32 -06:00
Tim Ekl 6c10774c4a Fix build errors stemming from FeedlyTestSupport
There was one call to a throwing function inside
`checkArticles(in:correspondToStreamItemsIn:)` which was not
appropriately marked with `try`. Add that keyword, and then bubble out
the chain of errors through additional layers of helpers to the
enclosing test:

* This `checkArticles` variant was called by two others
* …one of which was used in `testAddNewFeedSuccess()`
* …another of which was used in various `verify` sync helpers
* …which were referenced from `testSyncing()`, a test case method

None of these involved any particular async hoops to jump through, and
since the top-level callers were all test functions, we can count on
XCTest to handle any errors thrown — no additional `catch` or handling
on our part is necessary.
2019-12-31 19:36:42 -06:00
Tim Ekl 711aca3d1b Fix build errors in Feedly test support
Two more cases of completion blocks taking Results, requiring a
do/catch/Result.get() to unwrap.

This commit deliberately leaves one build error for a more comprehensive
fix, since it occurs in a helper function that will have broader
fallout.
2019-12-31 19:29:44 -06:00
Tim Ekl 152b1f2b8a Fix errors in Feedly sync unread operations tests
Yet more completion blocks with Results; apply the usual
do/catch/Result.get() dance.
2019-12-31 19:27:47 -06:00
Tim Ekl 13b227a461 Fix errors in Feedly set starred operations tests
More of the same: completion blocks which take Results need
do/catch/Result.get().
2019-12-31 19:24:36 -06:00
Tim Ekl f12e8b4a4a Fix errors in starred articles operations tests
Pull the same do/catch/Result.get() trick as previously for completion
blocks which now take Results. `try` a few throwing calls.
2019-12-31 19:11:37 -06:00
Tim Ekl 6a4f3fb11e Fix build errors in sync stream operations tests
Prefix two throwing calls with `try`. Label the enclosing test functions
with `throws` so the XCTest machinery helps us with error reporting.
2019-12-31 19:08:29 -06:00
Tim Ekl 6583688e38 Fix errors in Feedly unread operations tests
Most fetch completion blocks took a parameter that was expected to be
some result data type, but is now a Result. Rename these parameters;
wrap their existing bodies in do/catch blocks; and recreate the original
underlying variable using the result of `Result.get()`.

Prepend a few synchronous calls that started throwing with `try` along
the way.
2019-12-31 19:06:10 -06:00
Brent Simmons 51faf77e59 Update isExecuting and isFinished in a way that should make NSOperationQueue happy. Hopefully this fixes a mystery crash bug. 2019-12-31 15:40:05 -08:00
Tim Ekl ae1651fad1 Fix errors in Feedly update-feeds operation tests
Mark some throwing calls with `try`; mark the enclosing test functions
with `throws`, letting the XCTest framework handle error reporting for
us.
2019-12-31 15:55:59 -06:00
Tim Ekl f82be27666 Resolve errors in Feedly statuses operation tests
Add `error` parameters to completion blocks which now pass them. Assert
these errors are always nil in the existing tests.

Flip calls to `selectPendingCount()` so they are async, with a
completion block that asserts about the results instead of asserting
about the return value. Since the closure takes a Result, unwrap it in a
do/catch block at each site; `XCTAssertNoThrow` doesn't help us bubble a
value out from `Result.get()`, and I'd rather not use `try!` here. There
might be a stylistic discussion to be had about this unwrapping, though.
2019-12-31 15:52:54 -06:00