From 213f67d1de2d0033664b1dae8c24538233d65b2c Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Fri, 23 Aug 2024 20:31:13 -0700
Subject: [PATCH] Continue progress on porting OPML code to Swift.

---
 .../xcshareddata/xcschemes/Parser.xcscheme    | 12 +++++++
 .../Sources/Parser/OPML/OPMLDocument.swift    |  2 +-
 ...pecifier.swift => OPMLFeedSpecifier.swift} |  4 +--
 .../Parser/Sources/Parser/OPML/OPMLItem.swift |  2 +-
 .../Parser/OPML/ParsedOPMLDocument.swift      | 25 ---------------
 .../Sources/Parser/OPML/ParsedOPMLItem.swift  | 31 -------------------
 6 files changed, 16 insertions(+), 60 deletions(-)
 rename Modules/Parser/Sources/Parser/OPML/{ParsedOPMLFeedSpecifier.swift => OPMLFeedSpecifier.swift} (88%)
 delete mode 100644 Modules/Parser/Sources/Parser/OPML/ParsedOPMLDocument.swift
 delete mode 100644 Modules/Parser/Sources/Parser/OPML/ParsedOPMLItem.swift

diff --git a/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser.xcscheme b/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser.xcscheme
index ed73f5e1b..7bfc0fe97 100644
--- a/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser.xcscheme
+++ b/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser.xcscheme
@@ -29,6 +29,18 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ParserTests"
+               BuildableName = "ParserTests"
+               BlueprintName = "ParserTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
diff --git a/Modules/Parser/Sources/Parser/OPML/OPMLDocument.swift b/Modules/Parser/Sources/Parser/OPML/OPMLDocument.swift
index 55adb982c..690d23155 100644
--- a/Modules/Parser/Sources/Parser/OPML/OPMLDocument.swift
+++ b/Modules/Parser/Sources/Parser/OPML/OPMLDocument.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-final class OPMLDocument: OPMLItem, @unchecked Sendable {
+final class OPMLDocument: OPMLItem {
 
 	var title: String? = nil
 	var url: String? = nil
diff --git a/Modules/Parser/Sources/Parser/OPML/ParsedOPMLFeedSpecifier.swift b/Modules/Parser/Sources/Parser/OPML/OPMLFeedSpecifier.swift
similarity index 88%
rename from Modules/Parser/Sources/Parser/OPML/ParsedOPMLFeedSpecifier.swift
rename to Modules/Parser/Sources/Parser/OPML/OPMLFeedSpecifier.swift
index ccad2b847..2b5e43856 100644
--- a/Modules/Parser/Sources/Parser/OPML/ParsedOPMLFeedSpecifier.swift
+++ b/Modules/Parser/Sources/Parser/OPML/OPMLFeedSpecifier.swift
@@ -1,5 +1,5 @@
 //
-//  ParsedOPMLFeedSpecifier.swift
+//  OPMLFeedSpecifier.swift
 //  
 //
 //  Created by Brent Simmons on 8/18/24.
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct ParsedOPMLFeedSpecifier: Sendable {
+public struct OPMLFeedSpecifier: Sendable {
 
 	let title: String?
 	let feedDescription: String?
diff --git a/Modules/Parser/Sources/Parser/OPML/OPMLItem.swift b/Modules/Parser/Sources/Parser/OPML/OPMLItem.swift
index 001ac169a..7d1733fbb 100644
--- a/Modules/Parser/Sources/Parser/OPML/OPMLItem.swift
+++ b/Modules/Parser/Sources/Parser/OPML/OPMLItem.swift
@@ -8,7 +8,7 @@
 import Foundation
 import os
 
-class OPMLItem: @unchecked Sendable {
+class OPMLItem {
 
 	public let feedSpecifier: ParsedOPMLFeedSpecifier
 
diff --git a/Modules/Parser/Sources/Parser/OPML/ParsedOPMLDocument.swift b/Modules/Parser/Sources/Parser/OPML/ParsedOPMLDocument.swift
deleted file mode 100644
index ee90cd99d..000000000
--- a/Modules/Parser/Sources/Parser/OPML/ParsedOPMLDocument.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  ParsedOPMLDocument.swift
-//
-//
-//  Created by Brent Simmons on 8/18/24.
-//
-
-import Foundation
-
-public final class ParsedOPMLDocument: Sendable {
-
-	public let title: String?
-	public let url: String?
-	public let items: [ParsedOPMLItem]?
-
-	init(opmlDocument: OPMLDocument) {
-
-		self.title = opmlDocument.title
-		self.url = opmlDocument.url
-
-		self.items = opmlDocument.items.map { opmlItem in
-			ParsedOPMLItem(opmlItem: opmlItem)
-		}
-	}
-}
diff --git a/Modules/Parser/Sources/Parser/OPML/ParsedOPMLItem.swift b/Modules/Parser/Sources/Parser/OPML/ParsedOPMLItem.swift
deleted file mode 100644
index 517a1681f..000000000
--- a/Modules/Parser/Sources/Parser/OPML/ParsedOPMLItem.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  File.swift
-//  
-//
-//  Created by Brent Simmons on 8/18/24.
-//
-
-import Foundation
-
-public struct ParsedOPMLItem: Sendable {
-
-	public let feedSpecifier: ParsedOPMLFeedSpecifier?
-
-	public let attributes: [String: String]?
-	public let title: String?
-
-	public var items: [ParsedOPMLItem]?
-	public var isFolder: Bool
-
-	init(opmlItem: OPMLItem) {
-
-		self.feedSpecifier = ParsedOPMLFeedSpecifier(opmlItem.feedSpecifier)
-		self.attributes = opmlItem.attributes
-		self.title = opmlItem.title
-
-		self.items = opmlItem.items.map { opmlItem in
-			ParsedOPMLItem(opmlItem: opmlItem)
-		}
-		self.isFolder = (self.items?.count ?? 0) > 0
-	}
-}