From 421d16ce10de2da06e35fa86985dcf13071322c6 Mon Sep 17 00:00:00 2001
From: qwertyyb <qwertyyb@qq.com>
Date: Sat, 26 Oct 2019 20:57:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5(=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=80=83=E8=99=91=E9=99=A4=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E4=B9=8B=E5=A4=96=E7=9A=84=E7=B1=BB=E5=9E=8B=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?),=20=E6=94=B9=E4=B8=BA=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YPaste.xcodeproj/project.pbxproj   |  8 ++---
 YPaste/AppDelegate.swift           |  3 ++
 YPaste/Base.lproj/Main.storyboard  | 24 ++++++++------
 YPaste/Info.plist                  |  2 +-
 YPaste/SummaryTransformer.swift    | 23 -------------
 YPaste/Window/Transformers.swift   | 53 ++++++++++++++++++++++++++++++
 YPaste/Window/ViewController.swift |  1 -
 7 files changed, 75 insertions(+), 39 deletions(-)
 delete mode 100644 YPaste/SummaryTransformer.swift
 create mode 100644 YPaste/Window/Transformers.swift

diff --git a/YPaste.xcodeproj/project.pbxproj b/YPaste.xcodeproj/project.pbxproj
index 22701e3..965c5c1 100644
--- a/YPaste.xcodeproj/project.pbxproj
+++ b/YPaste.xcodeproj/project.pbxproj
@@ -15,7 +15,7 @@
 		4596AE6123216A8500F63EBF /* YPaste.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4596AE6023216A8500F63EBF /* YPaste.swift */; };
 		4596AE6923216E6C00F63EBF /* YPasteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4596AE6823216E6C00F63EBF /* YPasteTests.swift */; };
 		4596AE712322B5CB00F63EBF /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4596AE702322B5CB00F63EBF /* MainWindowController.swift */; };
-		4596AE732323CF5800F63EBF /* SummaryTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4596AE722323CF5800F63EBF /* SummaryTransformer.swift */; };
+		4596AE732323CF5800F63EBF /* Transformers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4596AE722323CF5800F63EBF /* Transformers.swift */; };
 		67096210235EC02E009068B9 /* TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6709620F235EC02E009068B9 /* TableView.swift */; };
 		67096213235EC0D7009068B9 /* SearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67096212235EC0D7009068B9 /* SearchField.swift */; };
 		67136E302359E04F00EFB448 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 67136E322359E04F00EFB448 /* Preferences.xib */; };
@@ -53,7 +53,7 @@
 		4596AE6823216E6C00F63EBF /* YPasteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YPasteTests.swift; sourceTree = "<group>"; };
 		4596AE6A23216E6C00F63EBF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4596AE702322B5CB00F63EBF /* MainWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowController.swift; sourceTree = "<group>"; };
-		4596AE722323CF5800F63EBF /* SummaryTransformer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SummaryTransformer.swift; sourceTree = "<group>"; };
+		4596AE722323CF5800F63EBF /* Transformers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Transformers.swift; sourceTree = "<group>"; };
 		5798607827522D99BA309E4B /* libPods-YPaste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-YPaste.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6709620F235EC02E009068B9 /* TableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableView.swift; sourceTree = "<group>"; };
 		67096212235EC0D7009068B9 /* SearchField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchField.swift; sourceTree = "<group>"; };
@@ -136,7 +136,6 @@
 				4596AE53232025A800F63EBF /* Info.plist */,
 				4596AE54232025A800F63EBF /* YPaste.entitlements */,
 				4596AE4B232025A700F63EBF /* YPaste.xcdatamodeld */,
-				4596AE722323CF5800F63EBF /* SummaryTransformer.swift */,
 				67136E322359E04F00EFB448 /* Preferences.xib */,
 				67C3262B2359D86300248CDE /* PreferencesWindowController.swift */,
 				67784475235F376800970786 /* PasteboardHandler.swift */,
@@ -163,6 +162,7 @@
 				4596AE49232025A700F63EBF /* ViewController.swift */,
 				6790407F235D8C1D00B0C74E /* PasteItemsController.swift */,
 				4596AE702322B5CB00F63EBF /* MainWindowController.swift */,
+				4596AE722323CF5800F63EBF /* Transformers.swift */,
 			);
 			path = Window;
 			sourceTree = "<group>";
@@ -377,7 +377,7 @@
 				4596AE4D232025A700F63EBF /* YPaste.xcdatamodeld in Sources */,
 				4596AE6123216A8500F63EBF /* YPaste.swift in Sources */,
 				67096213235EC0D7009068B9 /* SearchField.swift in Sources */,
-				4596AE732323CF5800F63EBF /* SummaryTransformer.swift in Sources */,
+				4596AE732323CF5800F63EBF /* Transformers.swift in Sources */,
 				67446E7A235F3EAE0050AB96 /* HotkeyHandler.swift in Sources */,
 				4596AE4A232025A700F63EBF /* ViewController.swift in Sources */,
 				4596AE48232025A700F63EBF /* AppDelegate.swift in Sources */,
diff --git a/YPaste/AppDelegate.swift b/YPaste/AppDelegate.swift
index 6914ee3..7051ddd 100644
--- a/YPaste/AppDelegate.swift
+++ b/YPaste/AppDelegate.swift
@@ -21,6 +21,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         statusItem?.button!.image = NSImage(named: "statusImage")
         statusItem?.menu = menu
         
+        ValueTransformer.setValueTransformer(SummaryTransformer(), forName: .summaryTransformerName)
+        ValueTransformer.setValueTransformer(TimeTransformer(), forName: .timeTransformerName)
+        
         //  check permission
         let _ = PasteboardHandler.shared.checkAccess(prompt: true)
         
diff --git a/YPaste/Base.lproj/Main.storyboard b/YPaste/Base.lproj/Main.storyboard
index 501cb75..2a277f4 100644
--- a/YPaste/Base.lproj/Main.storyboard
+++ b/YPaste/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -114,8 +114,8 @@
                                     <rect key="frame" x="1" y="1" width="478" height="248"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="IWK-h8-GX2" customClass="TableView" customModule="YPaste" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="478" height="248"/>
+                                        <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="IWK-h8-GX2" customClass="TableView" customModule="YPaste" customModuleProvider="target">
+                                            <rect key="frame" x="0.0" y="0.0" width="479" height="248"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -168,7 +168,7 @@
                                                         </tableCellView>
                                                     </prototypeCellViews>
                                                 </tableColumn>
-                                                <tableColumn width="85" minWidth="40" maxWidth="1000" id="yX1-kQ-pUb">
+                                                <tableColumn width="86" minWidth="40" maxWidth="1000" id="yX1-kQ-pUb">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                         <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -182,17 +182,21 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView id="vFT-GW-ujY">
-                                                            <rect key="frame" x="391" y="1" width="85" height="17"/>
+                                                            <rect key="frame" x="391" y="1" width="86" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Ew2-hw-lNE">
-                                                                    <rect key="frame" x="0.0" y="1" width="85" height="16"/>
-                                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" baseWritingDirection="rightToLeft" title="type" id="dSS-b1-vUc">
+                                                                    <rect key="frame" x="0.0" y="1" width="86" height="16"/>
+                                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" baseWritingDirection="rightToLeft" title="Time" id="dSS-b1-vUc">
                                                                         <font key="font" metaFont="system"/>
                                                                         <color key="textColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                         <connections>
-                                                                            <binding destination="vFT-GW-ujY" name="value" keyPath="objectValue.type" id="Nnj-fO-rQI"/>
+                                                                            <binding destination="vFT-GW-ujY" name="value" keyPath="objectValue.updated_at" id="rMS-Qg-xZy">
+                                                                                <dictionary key="options">
+                                                                                    <string key="NSValueTransformerName">TimeTransformer</string>
+                                                                                </dictionary>
+                                                                            </binding>
                                                                         </connections>
                                                                     </textFieldCell>
                                                                 </textField>
@@ -219,7 +223,7 @@
                                     </subviews>
                                     <nil key="backgroundColor"/>
                                 </clipView>
-                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="GXx-bY-2zG">
+                                <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="GXx-bY-2zG">
                                     <rect key="frame" x="1" y="233" width="478" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
diff --git a/YPaste/Info.plist b/YPaste/Info.plist
index 8d2716e..23bf4cb 100644
--- a/YPaste/Info.plist
+++ b/YPaste/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>Explosion v0.1.8</string>
 	<key>CFBundleVersion</key>
-	<string>100613</string>
+	<string>100646</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/YPaste/SummaryTransformer.swift b/YPaste/SummaryTransformer.swift
deleted file mode 100644
index 03cd6ac..0000000
--- a/YPaste/SummaryTransformer.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  SummaryTransformer.swift
-//  YPaste
-//
-//  Created by 虚幻 on 2019/9/7.
-//  Copyright © 2019 qwertyyb. All rights reserved.
-//
-
-import Cocoa
-
-class SummaryTransformer: ValueTransformer {
-    override func transformedValue(_ value: Any?) -> Any? {
-        if (value == nil) { return value }
-        let str = value as! String
-        let trimmedTitle = str.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
-        return trimmedTitle
-    }
-}
-
-extension NSValueTransformerName {
-    static let summaryTransformerName = NSValueTransformerName(rawValue: "SummaryTransformer")
-}
-
diff --git a/YPaste/Window/Transformers.swift b/YPaste/Window/Transformers.swift
new file mode 100644
index 0000000..07560e6
--- /dev/null
+++ b/YPaste/Window/Transformers.swift
@@ -0,0 +1,53 @@
+//
+//  SummaryTransformer.swift
+//  YPaste
+//
+//  Created by 虚幻 on 2019/9/7.
+//  Copyright © 2019 qwertyyb. All rights reserved.
+//
+
+import Cocoa
+
+class SummaryTransformer: ValueTransformer {
+    override func transformedValue(_ value: Any?) -> Any? {
+        if (value == nil) { return value }
+        let str = value as! String
+        let trimmedTitle = str.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
+        return trimmedTitle
+    }
+}
+
+class TimeTransformer: ValueTransformer {
+    override func transformedValue(_ value: Any?) -> Any? {
+        if value == nil { return value }
+        let date = value as! Date
+        let ts = lround(-date.timeIntervalSinceNow)
+        let s = ts % 60
+        let m = Int(ts / 60) % 60
+        let h = Int(ts / 3600) % 24
+        let d = Int(ts / 3600 / 24)
+        var output = ""
+        if d > 0 { output += "\(d)天" }
+        if d > 2 {
+            let formatter = DateFormatter()
+            formatter.dateFormat = "HH:mm MM-dd"
+            return formatter.string(from: date)
+        }
+        if h > 0 { output += "\(h)小时" }
+        if d > 0 {
+            return output + "前"
+        }
+        if m > 0 { output += "\(m)分" }
+        if h > 0 {
+            return output + "前"
+        }
+        if s > 0 { output += "\(s)秒" }
+        return output + "前"
+    }
+}
+
+extension NSValueTransformerName {
+    static let summaryTransformerName = NSValueTransformerName(rawValue: "SummaryTransformer")
+    static let timeTransformerName = NSValueTransformerName(rawValue: "TimeTransformer")
+}
+
diff --git a/YPaste/Window/ViewController.swift b/YPaste/Window/ViewController.swift
index 6d745e9..3e3d43d 100644
--- a/YPaste/Window/ViewController.swift
+++ b/YPaste/Window/ViewController.swift
@@ -19,7 +19,6 @@ class ViewController: NSViewController {
     required init?(coder: NSCoder) {
         self.managedObjectContext = (NSApp.delegate as! AppDelegate).persistentContainer.viewContext
         super.init(coder: coder)
-        ValueTransformer.setValueTransformer(SummaryTransformer(), forName: .summaryTransformerName)
         NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: "fetchPredicateChanged"), object: nil, queue: nil) { (notification) in
             self.tableView.scrollRowToVisible(0)
         }