优化下图片链接处理

ming1016 · Apr 1, 2024 · f8f1db3 · f8f1db3
1 parent e356729
commit f8f1db3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/SwiftPamphletApp/Core/FundationFunction.swift b/SwiftPamphletApp/Core/FundationFunction.swift
@@ -116,6 +116,26 @@ func validHTTPUrlStrFromUrlStr(urlStr: String) -> String {
     return httpsPrefix + urlStr
 }
 
+// 网页的相对地址转绝对地址
+func urlWithSchemeAndHost(url: URL, urlStr: String) -> String {
+    var schemeStr = ""
+    var hostStr = ""
+    if let scheme = url.scheme, let host = url.host {
+        schemeStr = scheme
+        hostStr = host
+    }
+
+    if urlStr.hasPrefix("http") {
+        return urlStr
+    } else {
+        var slash = ""
+        if urlStr.hasPrefix("/") == false {
+            slash = "/"
+        }
+        return "\(schemeStr)://\(hostStr)\(slash)\(urlStr)"
+    }
+}
+
 // MARK: - 文件 - 沙盒
 // 获取沙盒Document目录路径
 func getDocumentsDirectory() -> URL {

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift b/SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift
@@ -141,7 +141,7 @@ struct EditInfoView: View {
                         }
                         VStack {
                             HStack {
-                                PhotosPicker(selection: $selectedPhotos, matching: .images) {
+                                PhotosPicker(selection: $selectedPhotos, matching: .not(.videos)) {
                                     Label("选择照片图片", systemImage: "photo.on.rectangle.angled")
                                 }
                                 .onChange(of: selectedPhotos) { oldValue, newValue in
@@ -315,31 +315,17 @@ struct EditInfoView: View {
         var imageUrls = [String]()
 
         // 获取图集
-        var schemeStr = ""
-        var hostStr = ""
-        if let scheme = url.scheme, let host = url.host {
-            schemeStr = scheme
-            hostStr = host
-        }
+
         do {
             let imgs = try soup.select("img").array()
             if imgs.count > 0 {
                 let imgUrl = try imgs.randomElement()?.attr("src")
                 if let okImgUrl = imgUrl {
-                    if okImgUrl.hasPrefix("http") {
-                        imageUrl = okImgUrl
-                    } else {
-                        imageUrl = "\(schemeStr)://\(hostStr)/\(okImgUrl)"
-                    }
+                    imageUrl = urlWithSchemeAndHost(url: url, urlStr: okImgUrl)
                 }
                 for elm in imgs {
                     let elmUrl = try elm.attr("src")
-                    if elmUrl.hasPrefix("http") {
-                        imageUrls.append(elmUrl)
-                    } else {
-                        imageUrls.append("\(schemeStr)://\(hostStr)/\(elmUrl)")
-                    }
-
+                    imageUrls.append(urlWithSchemeAndHost(url: url, urlStr: elmUrl))
                 }
             }
         } catch {}