Merge pull request #63 from makinosp:develop

feat: implement decoder / encoder for URL strings

Author: makinosp

.github/workflows/swift.yml

@@ -5,15 +5,17 @@ name: Swift
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - "main"
+      - "develop"
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - "main"
+      - "develop"
 
 jobs:
   build:
-
     runs-on: macos-latest
-
     steps:
     - uses: actions/checkout@v4
     - name: Build

Sources/VRCKit/Models/URLString.swift

@@ -0,0 +1,30 @@
+//
+//  URLString.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/07/28.
+//
+
+import Foundation
+
+public struct URLString: Codable, Hashable {
+    public let url: URL
+
+    public init(url: URL) {
+        self.url = url
+    }
+
+    public init(from decoder: any Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        let urlString = try container.decode(String.self)
+        guard let url = URL(string: urlString) else {
+            throw DecodingError.dataCorruptedError(in: container, debugDescription: "Invalid URL string.")
+        }
+        self.url = url
+    }
+
+    public func encode(to encoder: any Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode(url.absoluteString)
+    }
+}

Sources/VRCKit/Models/WorldModel.swift

@@ -17,8 +17,8 @@ public struct World: Codable, Identifiable, Hashable {
     public let capacity: Int
     public let tags: [String]
     public let releaseStatus: ReleaseStatus
-    public let imageUrl: String
-    public let thumbnailImageUrl: String
+    public let imageUrl: URLString
+    public let thumbnailImageUrl: URLString
     public let namespace: String?
     public let organization: String
     public let previewYoutubeId: String?

Sources/VRCKit/PreviewServices/PreviewDataProvider.swift

@@ -206,8 +206,8 @@ final class PreviewDataProvider {
             capacity: 32,
             tags: [],
             releaseStatus: .public,
-            imageUrl: "https://ul.h3z.jp/ecWPM0Wk.jpg",
-            thumbnailImageUrl: "https://ul.h3z.jp/ecWPM0Wk.jpg",
+            imageUrl: URLString(url: URL(string: "https://ul.h3z.jp/ecWPM0Wk.jpg")!),
+            thumbnailImageUrl: URLString(url: URL(string: "https://ul.h3z.jp/ecWPM0Wk.jpg")!),
             namespace: nil,
             organization: "",
             previewYoutubeId: "",