refactor

po-miyasaka · Jul 22, 2022 · ce2183b · ce2183b
1 parent a3a4bfa
commit ce2183b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CopyHistory/CopyHistory/ContentView.swift b/CopyHistory/CopyHistory/ContentView.swift
@@ -382,10 +382,10 @@ struct Row: View, Equatable {
                             Group {
                                 if let content = item.content, let image = NSImage(data: content) {
                                     Image(nsImage: image).resizable().scaledToFit().frame(maxHeight: 300)
-                                } else if isShowingRTF, item.contentTypeString?.contains("rtf") == true, let attributedString = item.attributeString {
+                                } else if isShowingRTF, let attributedString = item.attributeString {
                                     Text(AttributedString(attributedString))
 
-                                } else if isShowingHTML, item.contentTypeString?.contains("html") == true, let attributedString = item.htmlString {
+                                } else if isShowingHTML, let attributedString = item.htmlString {
                                     Text(AttributedString(attributedString))
                                 } else if let url = item.fileURL {
                                     // TODO: why images disappear after first

diff --git a/CopyHistory/CopyHistory/PasteboardService.swift b/CopyHistory/CopyHistory/PasteboardService.swift
@@ -190,7 +190,7 @@ extension CopiedItem {
         if let att = rtfStringCached {
             return att
         }
-        guard let content = content else { return nil }
+        guard contentTypeString?.contains("rtf") == true, let content = content else { return nil }
 
         let attributeString = (try? NSAttributedString(data: content, options: [NSAttributedString.DocumentReadingOptionKey.documentType: NSAttributedString.DocumentType.rtf], documentAttributes: nil))
         rtfStringCached = attributeString
@@ -201,7 +201,7 @@ extension CopiedItem {
         if let att = htmlStringCached {
             return att
         }
-        guard let content = content else { return nil }
+        guard contentTypeString?.contains("html") == true, let content = content else { return nil }
 
         let attributeString = (try? NSAttributedString(data: content, options: [NSAttributedString.DocumentReadingOptionKey.documentType: NSAttributedString.DocumentType.html], documentAttributes: nil))
         htmlStringCached = attributeString