Switch to new Parser.

2025-08-12 06:26:36 +00:00 · 2024-11-15 22:59:51 -08:00
parent c3f063ae4a
commit 85d1a8fe7a
79 changed files with 187 additions and 219 deletions
--- a/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser
+++ b/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1610"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Parser"
-               BuildableName = "Parser"
-               BlueprintName = "Parser"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "Parser"
-            BuildableName = "Parser"
-            BlueprintName = "Parser"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
--- a/Parser/Sources/Parser/FeedParser/Feeds/FeedParser.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/FeedParser.swift
@@ -1,6 +1,6 @@
 //
 //  FeedParser.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/20/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
@@ -50,6 +50,22 @@ public struct FeedParser {
 		}
 	}

+	public static func parse(_ parserData: ParserData, _ completion: @Sendable @escaping (ParsedFeed?, Error?) -> Void) {
+
+		Task {
+			do {
+				let parsedFeed = try await parseAsync(urlString: parserData.url, data: parserData.data)
+				Task { @MainActor in
+					completion(parsedFeed, nil)
+				}
+			} catch {
+				Task { @MainActor in
+					completion(nil, error)
+				}
+			}
+		}
+	}
+
 	public static func parseAsync(urlString: String, data: Data) async throws -> ParsedFeed? {

 		try parse(urlString: urlString, data: data)
--- a/Parser/Sources/Parser/FeedParser/Feeds/FeedParserError.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/FeedParserError.swift
@@ -1,6 +1,6 @@
 //
 //  FeedParserError.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/24/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/FeedType.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/FeedType.swift
@@ -1,6 +1,6 @@
 //
 //  FeedType.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/20/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/JSON/JSONFeedParser.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/JSON/JSONFeedParser.swift
@@ -1,6 +1,6 @@
 //
 //  JSONFeedParser.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/25/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/JSON/RSSInJSONParser.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/JSON/RSSInJSONParser.swift
@@ -1,6 +1,6 @@
 //
 //  RSSInJSONParser.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/24/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/ParsedAttachment.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/ParsedAttachment.swift
@@ -1,6 +1,6 @@
 //
 //  ParsedAttachment.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/20/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/ParsedAuthor.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/ParsedAuthor.swift
@@ -1,6 +1,6 @@
 //
 //  ParsedAuthor.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/20/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/ParsedFeed.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/ParsedFeed.swift
@@ -1,6 +1,6 @@
 //
 //  ParsedFeed.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/20/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/ParsedHub.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/ParsedHub.swift
@@ -1,6 +1,6 @@
 //
 //  ParsedHub.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/20/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/ParsedItem.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/ParsedItem.swift
@@ -1,6 +1,6 @@
 //
 //  ParsedItem.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/20/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/XML/AtomParser.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/XML/AtomParser.swift
@@ -1,6 +1,6 @@
 //
 //  AtomParser.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/25/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSFeedTransformer.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSFeedTransformer.swift
@@ -1,6 +1,6 @@
 //
 //  RSSFeedTransformer.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/25/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSParser.swift
+++ b/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSParser.swift
@@ -1,6 +1,6 @@
 //
 //  RSSParser.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/25/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/JSON/JSONTypes.swift
+++ b/Parser/Sources/Parser/FeedParser/JSON/JSONTypes.swift
@@ -1,6 +1,6 @@
 //
 //  JSONDictionary.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/24/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/FeedParser/JSON/JSONUtilities.swift
+++ b/Parser/Sources/Parser/FeedParser/JSON/JSONUtilities.swift
@@ -1,6 +1,6 @@
 //
 //  JSONUtilities.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 12/10/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Sources/Parser/SAX/Extensions/String+SAX.swift
+++ b/Parser/Sources/Parser/SAX/Extensions/String+SAX.swift
@@ -1,6 +1,6 @@
 //
-//  String+RSParser.swift
-//  RSParser
+//  String+Parser.swift
+//  Parser
 //
 //  Created by Nate Weaver on 2020-01-19.
 //  Copyright © 2020 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/AtomParserTests.swift
+++ b/Parser/Tests/ParserTests/AtomParserTests.swift
@@ -1,6 +1,6 @@
 //
 //  AtomParserTests.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/26/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/EntityDecodingTests.swift
+++ b/Parser/Tests/ParserTests/EntityDecodingTests.swift
@@ -1,6 +1,6 @@
 //
 //  EntityDecodingTests.swift
-//  RSParserTests
+//  ParserTests
 //
 //  Created by Brent Simmons on 12/30/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/FeedParserTypeTests.swift
+++ b/Parser/Tests/ParserTests/FeedParserTypeTests.swift
@@ -1,6 +1,6 @@
 //
 //  FeedParserTypeTests.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/25/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/HTMLLinkTests.swift
+++ b/Parser/Tests/ParserTests/HTMLLinkTests.swift
@@ -1,6 +1,6 @@
 //
 //  HTMLLinkTests.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/25/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/HTMLMetadataTests.swift
+++ b/Parser/Tests/ParserTests/HTMLMetadataTests.swift
@@ -1,6 +1,6 @@
 //
 //  HTMLMetadataTests.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/25/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/JSONFeedParserTests.swift
+++ b/Parser/Tests/ParserTests/JSONFeedParserTests.swift
@@ -1,6 +1,6 @@
 //
 //  JSONFeedParserTests.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/26/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/OPMLTests.swift
+++ b/Parser/Tests/ParserTests/OPMLTests.swift
@@ -1,6 +1,6 @@
 //
 //  OPMLTests.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/25/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/RSSInJSONParserTests.swift
+++ b/Parser/Tests/ParserTests/RSSInJSONParserTests.swift
@@ -1,6 +1,6 @@
 //
 //  RSSInJSONParserTests.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/26/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
--- a/Parser/Tests/ParserTests/RSSParserTests.swift
+++ b/Parser/Tests/ParserTests/RSSParserTests.swift
@@ -1,6 +1,6 @@
 //
 //  RSSParserTests.swift
-//  RSParser
+//  Parser
 //
 //  Created by Brent Simmons on 6/26/17.
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.