Fix htmlCode extension for URL

Author: livid

Diff for: Planet/Helper/URLUtils.swift

@@ -5,8 +5,8 @@
 //  Created by Shu Lyu on 2022-05-07.
 //
 
-import Foundation
 import Cocoa
+import Foundation
 
 struct URLUtils {
     static let applicationSupportPath = try! FileManager.default.url(
@@ -30,38 +30,65 @@ struct URLUtils {
         create: true
     )
 
-    static let legacyPlanetsPath = applicationSupportPath.appendingPathComponent("planets", isDirectory: true)
+    static let legacyPlanetsPath = applicationSupportPath.appendingPathComponent(
+        "planets",
+        isDirectory: true
+    )
 
-    static let legacyTemplatesPath = applicationSupportPath.appendingPathComponent("templates", isDirectory: true)
+    static let legacyTemplatesPath = applicationSupportPath.appendingPathComponent(
+        "templates",
+        isDirectory: true
+    )
 
-    static let legacyDraftPath = applicationSupportPath.appendingPathComponent("drafts", isDirectory: true)
+    static let legacyDraftPath = applicationSupportPath.appendingPathComponent(
+        "drafts",
+        isDirectory: true
+    )
 
     static func repoPath() -> URL {
-        if let libraryLocation = UserDefaults.standard.string(forKey: .settingsLibraryLocation), FileManager.default.fileExists(atPath: libraryLocation) {
+        if let libraryLocation = UserDefaults.standard.string(forKey: .settingsLibraryLocation),
+            FileManager.default.fileExists(atPath: libraryLocation)
+        {
             let libraryURL = URL(fileURLWithPath: libraryLocation)
             let planetURL = libraryURL.appendingPathComponent("Planet", isDirectory: true)
             if FileManager.default.fileExists(atPath: planetURL.path) {
                 do {
                     let bookmarkKey = libraryURL.path.md5()
                     if let bookmarkData = UserDefaults.standard.data(forKey: bookmarkKey) {
                         var isStale = false
-                        let url = try URL(resolvingBookmarkData: bookmarkData, options: .withSecurityScope, relativeTo: nil, bookmarkDataIsStale: &isStale)
+                        let url = try URL(
+                            resolvingBookmarkData: bookmarkData,
+                            options: .withSecurityScope,
+                            relativeTo: nil,
+                            bookmarkDataIsStale: &isStale
+                        )
                         if isStale {
-                            let updatedBookmarkData = try url.bookmarkData(options: .withSecurityScope, includingResourceValuesForKeys: nil, relativeTo: nil)
+                            let updatedBookmarkData = try url.bookmarkData(
+                                options: .withSecurityScope,
+                                includingResourceValuesForKeys: nil,
+                                relativeTo: nil
+                            )
                             UserDefaults.standard.set(updatedBookmarkData, forKey: bookmarkKey)
                         }
                         if url.startAccessingSecurityScopedResource() {
                             return planetURL
-                        } else {
+                        }
+                        else {
                             UserDefaults.standard.removeObject(forKey: .settingsLibraryLocation)
-                            debugPrint("failed to start accessing security scoped resource, abort & restore to default.")
+                            debugPrint(
+                                "failed to start accessing security scoped resource, abort & restore to default."
+                            )
                         }
                     }
-                } catch {
+                }
+                catch {
                     UserDefaults.standard.removeObject(forKey: .settingsLibraryLocation)
-                    debugPrint("failed to get planet library location: \(error), restore to default.")
+                    debugPrint(
+                        "failed to get planet library location: \(error), restore to default."
+                    )
                 }
-            } else {
+            }
+            else {
                 UserDefaults.standard.removeObject(forKey: .settingsLibraryLocation)
             }
         }
@@ -84,12 +111,18 @@ struct URLUtils {
 extension URL {
     var isHTTP: Bool {
         if let scheme = scheme?.lowercased(),
-           scheme == "http" || scheme == "https" {
+            scheme == "http" || scheme == "https"
+        {
             return true
         }
         return false
     }
 
+    var isImage: Bool {
+        let ext = pathExtension.lowercased()
+        return ["jpg", "jpeg", "png", "gif", "webp", "heic", "heif", "avif", "svg", "tiff", "bmp"].contains(ext)
+    }
+
     var pathQueryFragment: String {
         var s = path
         if let query = query {
@@ -117,11 +150,17 @@ extension URL {
     var asNSImage: NSImage {
         let ext = pathExtension.lowercased()
         if ["jpg", "jpeg", "png", "gif", "tiff", "bmp"].contains(ext),
-           let image = NSImage(contentsOf: self) {
+            let image = NSImage(contentsOf: self)
+        {
             return image
         }
         if let rep = NSWorkspace.shared.icon(forFile: self.path)
-            .bestRepresentation(for: NSRect(x: 0, y: 0, width: 128, height: 128), context: nil, hints: nil) {
+            .bestRepresentation(
+                for: NSRect(x: 0, y: 0, width: 128, height: 128),
+                context: nil,
+                hints: nil
+            )
+        {
             let image = NSImage(size: rep.size)
             image.addRepresentation(rep)
             return image
@@ -139,10 +178,16 @@ extension URL {
             let source = CGImageSourceCreateWithData(data as CFData, nil)!
             let count = CGImageSourceGetCount(source)
             let mutableData = NSMutableData()
-            let destination = CGImageDestinationCreateWithData(mutableData, CGImageSourceGetType(source)!, count, nil)!
+            let destination = CGImageDestinationCreateWithData(
+                mutableData,
+                CGImageSourceGetType(source)!,
+                count,
+                nil
+            )!
             for i in 0..<count {
                 let image = CGImageSourceCreateImageAtIndex(source, i, nil)!
-                let properties = CGImageSourceCopyPropertiesAtIndex(source, i, nil) as! [CFString: Any]
+                let properties =
+                    CGImageSourceCopyPropertiesAtIndex(source, i, nil) as! [CFString: Any]
                 var newProperties = properties
                 newProperties.removeValue(forKey: kCGImagePropertyGPSDictionary)
                 // newProperties.removeValue(forKey: kCGImagePropertyExifDictionary)
@@ -151,33 +196,40 @@ extension URL {
             }
             CGImageDestinationFinalize(destination)
             try mutableData.write(to: self)
-        } catch {
+        }
+        catch {
             // Handle the error here
             print("Remove GPS Error: \(error)")
         }
     }
 
-    var imageCode: String {
+    var htmlCode: String {
         let name = self.lastPathComponent
-        if let im = NSImage(contentsOf: self) {
-            let imageRep = im.representations.first as? NSBitmapImageRep
-            let width = imageRep?.pixelsWide ?? 0
-            let height = imageRep?.pixelsHigh ?? 0
-            let pointSize = im.size
-            let pointWidth = pointSize.width
-            let pointHeight = pointSize.height
-            var widthToUse = 0
-            if (CGFloat(width) / pointWidth) > 1 {
-                widthToUse = Int(pointWidth)
-            } else {
-                widthToUse = width
-            }
+        if isImage {
+            if let im = NSImage(contentsOf: self) {
+                let imageRep = im.representations.first as? NSBitmapImageRep
+                let width = imageRep?.pixelsWide ?? 0
+                let height = imageRep?.pixelsHigh ?? 0
+                let pointSize = im.size
+                let pointWidth = pointSize.width
+                let pointHeight = pointSize.height
+                var widthToUse = 0
+                if (CGFloat(width) / pointWidth) > 1 {
+                    widthToUse = Int(pointWidth)
+                }
+                else {
+                    widthToUse = width
+                }
             if Int(widthToUse) > 0 {
-                return "<img width=\"\(Int(widthToUse))\" alt=\"\((name as NSString).deletingPathExtension)\" src=\"\(name)\">"
-            } else {
-                return "<img alt=\"\((name as NSString).deletingPathExtension)\" src=\"\(name)\">"
+                return
+                    "<img width=\"\(Int(widthToUse))\" alt=\"\((name as NSString).deletingPathExtension)\" src=\"\(name)\">"
+                }
+                else {
+                    return "<img alt=\"\((name as NSString).deletingPathExtension)\" src=\"\(name)\">"
+                }
             }
+            return "<img alt=\"\((name as NSString).deletingPathExtension)\" src=\"\(name)\">"
         }
-        return "<img alt=\"\((name as NSString).deletingPathExtension)\" src=\"\(name)\">"
+        return "<a href=\"\(name)\">\(name)</a>"
     }
 }

Diff for: Planet/Labs/Quick Post/QuickPostView.swift

@@ -176,7 +176,7 @@ struct QuickPostView: View {
         .onTapGesture {
             // Insert media reference at cursor position
             let fileName = url.lastPathComponent
-            let mediaReference = url.imageCode
+            let mediaReference = url.htmlCode
 
             // Get current cursor position
             let currentContent = viewModel.content
@@ -195,7 +195,7 @@ struct QuickPostView: View {
                 }
                 // Also remove the media reference from the content
                 let currentContent = viewModel.content
-                let mediaReference = url.imageCode
+                let mediaReference = url.htmlCode
                 viewModel.content = currentContent.replacingOccurrences(of: mediaReference, with: "")
             } label: {
                 Label("Remove", systemImage: "trash")

Diff for: Planet/versioning.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 2293
+CURRENT_PROJECT_VERSION = 2294