From 321339186f27b79028409a35c68872cdac010c99 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 23 Aug 2024 18:03:59 -0700 Subject: [PATCH] Rename OPMLFeedSpecifier to ParsedOPMLFeedSpecifier. --- .../Parser/OPML/OPMLFeedSpecifier.swift | 40 ------------------- .../Parser/OPML/ParsedOPMLFeedSpecifier.swift | 36 ++++++++++++----- 2 files changed, 26 insertions(+), 50 deletions(-) delete mode 100644 Modules/Parser/Sources/Parser/OPML/OPMLFeedSpecifier.swift diff --git a/Modules/Parser/Sources/Parser/OPML/OPMLFeedSpecifier.swift b/Modules/Parser/Sources/Parser/OPML/OPMLFeedSpecifier.swift deleted file mode 100644 index ee6b1b456..000000000 --- a/Modules/Parser/Sources/Parser/OPML/OPMLFeedSpecifier.swift +++ /dev/null @@ -1,40 +0,0 @@ -// -// File.swift -// -// -// Created by Brent Simmons on 8/18/24. -// - -import Foundation - -public struct OPMLFeedSpecifier: Sendable { - - let title: String? - let feedDescription: String? - let homePageURL: String? - let feedURL: String - - init(title: String?, feedDescription: String?, homePageURL: String?, feedURL: String) { - - if String.isEmptyOrNil(title) { - self.title = nil - } else { - self.title = title - } - - if String.isEmptyOrNil(feedDescription) { - self.feedDescription = nil - } else { - self.feedDescription = feedDescription - } - - if String.isEmptyOrNil(homePageURL) { - self.homePageURL = nil - } else { - self.homePageURL = homePageURL - } - - self.feedURL = feedURL - } -} - diff --git a/Modules/Parser/Sources/Parser/OPML/ParsedOPMLFeedSpecifier.swift b/Modules/Parser/Sources/Parser/OPML/ParsedOPMLFeedSpecifier.swift index 0d7e574f2..ccad2b847 100644 --- a/Modules/Parser/Sources/Parser/OPML/ParsedOPMLFeedSpecifier.swift +++ b/Modules/Parser/Sources/Parser/OPML/ParsedOPMLFeedSpecifier.swift @@ -1,6 +1,6 @@ // // ParsedOPMLFeedSpecifier.swift -// +// // // Created by Brent Simmons on 8/18/24. // @@ -9,16 +9,32 @@ import Foundation public struct ParsedOPMLFeedSpecifier: Sendable { - public let title: String? - public let feedDescription: String? - public let homePageURL: String? - public let feedURL: String + let title: String? + let feedDescription: String? + let homePageURL: String? + let feedURL: String - init(_ opmlFeedSpecifier: OPMLFeedSpecifier) { + init(title: String?, feedDescription: String?, homePageURL: String?, feedURL: String) { - self.title = opmlFeedSpecifier.title - self.feedDescription = opmlFeedSpecifier.feedDescription - self.homePageURL = opmlFeedSpecifier.homePageURL - self.feedURL = opmlFeedSpecifier.feedURL + if String.isEmptyOrNil(title) { + self.title = nil + } else { + self.title = title + } + + if String.isEmptyOrNil(feedDescription) { + self.feedDescription = nil + } else { + self.feedDescription = feedDescription + } + + if String.isEmptyOrNil(homePageURL) { + self.homePageURL = nil + } else { + self.homePageURL = homePageURL + } + + self.feedURL = feedURL } } +