Fix for pipeline names with characters that need to be encoded.

ccmenu · Aug 28, 2023 · 1939516 · 1939516
1 parent 6e38172
commit 1939516
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/CCMenu/Resources/Info.plist b/CCMenu/Resources/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.0</string>
+	<string>20.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2200.3</string>
+	<string>2201.3</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/CCMenu/Source/Pipeline Window/AddGithubPipeline.swift b/CCMenu/Source/Pipeline Window/AddGithubPipeline.swift
@@ -84,7 +84,11 @@ struct AddGithubPipelineSheet: View {
 
 
     private func updatePipeline() {
-        pipeline.feed.url = String(format: "https://api.github.com/repos/%@/%@/actions/workflows/%@/runs", owner, repository, workflow)
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "api.github.com"
+        components.path = String(format: "/repos/%@/%@/actions/workflows/%@/runs", owner, repository, workflow)
+        pipeline.feed.url = components.url!.absoluteString
         pipeline.name = "\(repository) (\(workflow))"
     }
 

diff --git a/CCMenu/Source/Server Monitor/GithubFeedReader.swift b/CCMenu/Source/Server Monitor/GithubFeedReader.swift
@@ -23,7 +23,12 @@ class GithubFeedReader: NSObject, FeedReader {
 
     public func updatePipelineStatus() {
         // TODO: consider making page size configurable to make sure to get a completed/successful
-        var request = URLRequest(url: URL(string: pipeline.feed.url + "?per_page=5")!)
+        guard let url = URL(string: pipeline.feed.url + "?per_page=5") else {
+            pipeline.connectionError = "Invalid URL: " + pipeline.feed.url
+            delegate?.feedReader(self, didUpdate: pipeline)
+            return
+        }
+        var request = URLRequest(url: url)
         if let token = pipeline.feed.authToken {
             request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
         }