renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename FeedlyResourceId to FeedlyResourceID.

Browse Source
This commit is contained in:
Brent Simmons
2023-09-12 21:34:50 -07:00
parent babdbd4619
commit 77481fdcb3
13 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Account/Sources/Account/Feedly/FeedlyAPICaller.swift
View File

@@ -605,7 +605,7 @@ extension FeedlyAPICaller: FeedlyGetCollectionsService {
extension FeedlyAPICaller: FeedlyGetStreamContentsService {
func getStreamContents(for resource: FeedlyResourceId, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStream, Error>) -> ()) {
func getStreamContents(for resource: FeedlyResourceID, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStream, Error>) -> ()) {
guard !isSuspended else {
return DispatchQueue.main.async {
completion(.failure(TransportError.suspended))
@@ -673,7 +673,7 @@ extension FeedlyAPICaller: FeedlyGetStreamContentsService {
extension FeedlyAPICaller: FeedlyGetStreamIDsService {
func streamIDs(for resource: FeedlyResourceId, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStreamIDs, Error>) -> ()) {
func streamIDs(for resource: FeedlyResourceID, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStreamIDs, Error>) -> ()) {
guard !isSuspended else {
return DispatchQueue.main.async {
completion(.failure(TransportError.suspended))

4
Account/Sources/Account/Feedly/FeedlyResourceProviding.swift
View File

@@ -9,12 +9,12 @@
import Foundation
protocol FeedlyResourceProviding {
var resource: FeedlyResourceId { get }
var resource: FeedlyResourceID { get }
}
extension FeedlyFeedResourceId: FeedlyResourceProviding {
var resource: FeedlyResourceId {
var resource: FeedlyResourceID {
return self
}
}

8
Account/Sources/Account/Feedly/Models/FeedlyResourceId.swift
View File

@@ -9,14 +9,14 @@
import Foundation
/// The kinds of Resource Ids is documented here: https://developer.feedly.com/cloud/
protocol FeedlyResourceId {
protocol FeedlyResourceID {
/// The resource Id from Feedly.
var id: String { get }
}
/// The Feed Resource is documented here: https://developer.feedly.com/cloud/
struct FeedlyFeedResourceId: FeedlyResourceId {
struct FeedlyFeedResourceId: FeedlyResourceID {
let id: String
/// The location of the kind of resource a concrete type represents.
@@ -44,7 +44,7 @@ extension FeedlyFeedResourceId {
}
}
struct FeedlyCategoryResourceID: FeedlyResourceId {
struct FeedlyCategoryResourceID: FeedlyResourceID {
let id: String
enum Global {
@@ -71,7 +71,7 @@ struct FeedlyCategoryResourceID: FeedlyResourceId {
}
}
struct FeedlyTagResourceId: FeedlyResourceId {
struct FeedlyTagResourceId: FeedlyResourceID {
let id: String
enum Global {

2
Account/Sources/Account/Feedly/Operations/FeedlyAddFeedToCollectionOperation.swift
View File

@@ -33,7 +33,7 @@ final class FeedlyAddFeedToCollectionOperation: FeedlyOperation, FeedlyFeedsAndF
private(set) var feedsAndFolders = [([FeedlyFeed], Folder)]()
var resource: FeedlyResourceId {
var resource: FeedlyResourceID {
return feedResource
}

4
Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift
View File

@@ -27,7 +27,7 @@ protocol FeedlyGetStreamContentsOperationDelegate: AnyObject {
final class FeedlyGetStreamContentsOperation: FeedlyOperation, FeedlyEntryProviding, FeedlyParsedItemProviding, Logging {
struct ResourceProvider: FeedlyResourceProviding {
var resource: FeedlyResourceId
var resource: FeedlyResourceID
}
let resourceProvider: FeedlyResourceProviding
@@ -82,7 +82,7 @@ final class FeedlyGetStreamContentsOperation: FeedlyOperation, FeedlyEntryProvid
weak var streamDelegate: FeedlyGetStreamContentsOperationDelegate?
init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamContentsService, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool? = nil) {
init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamContentsService, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool? = nil) {
self.account = account
self.resourceProvider = ResourceProvider(resource: resource)
self.service = service

4
Account/Sources/Account/Feedly/Operations/FeedlyGetStreamIdsOperation.swift
View File

@@ -29,11 +29,11 @@ final class FeedlyGetStreamIdsOperation: FeedlyOperation, FeedlyEntryIdentifierP
let account: Account
let service: FeedlyGetStreamIDsService
let continuation: String?
let resource: FeedlyResourceId
let resource: FeedlyResourceID
let unreadOnly: Bool?
let newerThan: Date?
init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService, continuation: String? = nil, newerThan: Date? = nil, unreadOnly: Bool?) {
init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService, continuation: String? = nil, newerThan: Date? = nil, unreadOnly: Bool?) {
self.account = account
self.resource = resource
self.service = service

4
Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift
View File

@@ -17,11 +17,11 @@ import Secrets
class FeedlyGetUpdatedArticleIdsOperation: FeedlyOperation, FeedlyEntryIdentifierProviding, Logging {
private let account: Account
private let resource: FeedlyResourceId
private let resource: FeedlyResourceID
private let service: FeedlyGetStreamIDsService
private let newerThan: Date?
init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService, newerThan: Date?) {
init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService, newerThan: Date?) {
self.account = account
self.resource = resource
self.service = service

4
Account/Sources/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift
View File

@@ -20,7 +20,7 @@ import Secrets
final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation, Logging {
private let account: Account
private let resource: FeedlyResourceId
private let resource: FeedlyResourceID
private let service: FeedlyGetStreamIDsService
private let database: SyncDatabase
private var remoteEntryIds = Set<String>()
@@ -30,7 +30,7 @@ final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation, Logging {
self.init(account: account, resource: resource, service: service, database: database, newerThan: newerThan)
}
init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService, database: SyncDatabase, newerThan: Date?) {
init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService, database: SyncDatabase, newerThan: Date?) {
self.account = account
self.resource = resource
self.service = service

4
Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift
View File

@@ -18,10 +18,10 @@ import Secrets
class FeedlyIngestStreamArticleIdsOperation: FeedlyOperation, Logging {
private let account: Account
private let resource: FeedlyResourceId
private let resource: FeedlyResourceID
private let service: FeedlyGetStreamIDsService
init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService) {
init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService) {
self.account = account
self.resource = resource
self.service = service

4
Account/Sources/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift
View File

@@ -21,7 +21,7 @@ import Secrets
final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation, Logging {
private let account: Account
private let resource: FeedlyResourceId
private let resource: FeedlyResourceID
private let service: FeedlyGetStreamIDsService
private let database: SyncDatabase
private var remoteEntryIDs = Set<String>()
@@ -31,7 +31,7 @@ final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation, Logging {
self.init(account: account, resource: resource, service: service, database: database, newerThan: newerThan)
}
init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService, database: SyncDatabase, newerThan: Date?) {
init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService, database: SyncDatabase, newerThan: Date?) {
self.account = account
self.resource = resource
self.service = service

4
Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift
View File

@@ -15,14 +15,14 @@ import Secrets
final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationDelegate, FeedlyGetStreamContentsOperationDelegate, FeedlyCheckpointOperationDelegate, Logging {
private let account: Account
private let resource: FeedlyResourceId
private let resource: FeedlyResourceID
private let operationQueue = MainThreadOperationQueue()
private let service: FeedlyGetStreamContentsService
private let newerThan: Date?
private let isPagingEnabled: Bool
private let finishOperation: FeedlyCheckpointOperation
init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamContentsService, isPagingEnabled: Bool, newerThan: Date?) {
init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamContentsService, isPagingEnabled: Bool, newerThan: Date?) {
self.account = account
self.resource = resource
self.service = service

2
Account/Sources/Account/Feedly/Services/FeedlyGetStreamContentsService.swift
View File

@@ -9,5 +9,5 @@
import Foundation
protocol FeedlyGetStreamContentsService: AnyObject {
func getStreamContents(for resource: FeedlyResourceId, continuation: String?, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStream, Error>) -> ())
func getStreamContents(for resource: FeedlyResourceID, continuation: String?, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStream, Error>) -> ())
}

2
Account/Sources/Account/Feedly/Services/FeedlyGetStreamIdsService.swift
View File

@@ -9,5 +9,5 @@
import Foundation
protocol FeedlyGetStreamIDsService: AnyObject {
func streamIDs(for resource: FeedlyResourceId, continuation: String?, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStreamIDs, Error>) -> ())
func streamIDs(for resource: FeedlyResourceID, continuation: String?, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStreamIDs, Error>) -> ())
}