Commit: f71edbdb8a1c018c5ffbd2186023cbaef4458110 - GoInto (git)

macOSのスクリーンショットの保存場所を変更するメニュバーエクストラ

Commit MetaInfo

• Revision: f71edbdb8a1c018c5ffbd2186023cbaef4458110 (tree)
• Time: 2017-04-23 23:52:13
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

実験的クラスを削除

Change Summary

• modified: GoInto.xcodeproj/project.pbxproj
• modified: GoInto.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/GoInto.xcscheme
• delete: GoInto/FolderItemSerializer.swift
• delete: GoInto/LimitedArraySerializer.swift
• modified: GoInto/StatusBar.swift
• modified: GoInto/UserDefaultsExtension.swift
• delete: GoIntoTests/GoIntoTests.swift
• delete: GoIntoTests/LimitedArraySerializerTest.swift
• modified: GoIntoTests/UserDefaultsTest.swift

Incremental Difference

--- a/GoInto.xcodeproj/project.pbxproj
+++ b/GoInto.xcodeproj/project.pbxproj
@@ -14,13 +14,9 @@
 		F40EB6D01EA26BEC00FEE444 /* ActionListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40EB6CF1EA26BEC00FEE444 /* ActionListener.swift */; };
 		F40EB6D21EA2F28100FEE444 /* Screenshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40EB6D11EA2F28100FEE444 /* Screenshot.swift */; };
 		F414DD031EABAB7300111DA7 /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F414DD021EABAB7300111DA7 /* UserDefaultsExtension.swift */; };
-		F414DD051EAC12D500111DA7 /* FolderItemSerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F414DD041EAC12D500111DA7 /* FolderItemSerializer.swift */; };
-		F414DD071EAC43E500111DA7 /* UserDefaultsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F414DD061EAC43E500111DA7 /* UserDefaultsTest.swift */; };
-		F463F6D91EAA3B8F00FAB2E3 /* LimitedArraySerializerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F463F6D81EAA3B8F00FAB2E3 /* LimitedArraySerializerTest.swift */; };
-		F463F6DB1EAA3C9700FAB2E3 /* LimitedArraySerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F463F6DA1EAA3C9700FAB2E3 /* LimitedArraySerializer.swift */; };
+		F42539E01EACCEDE0083EB9D /* UserDefaultsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42539DF1EACCEDE0083EB9D /* UserDefaultsTest.swift */; };
 		F47B06EB1E9A5DF9006711D9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47B06EA1E9A5DF9006711D9 /* AppDelegate.swift */; };
 		F47B06EF1E9A5DF9006711D9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F47B06EE1E9A5DF9006711D9 /* Assets.xcassets */; };
-		F47B06FD1E9A5DF9006711D9 /* GoIntoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47B06FC1E9A5DF9006711D9 /* GoIntoTests.swift */; };
 		F47B07081E9A6071006711D9 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F47B07071E9A6071006711D9 /* MainMenu.xib */; };
 		F47B070C1E9A65FA006711D9 /* StatusItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47B070B1E9A65FA006711D9 /* StatusItem.swift */; };
 		F47B070E1E9A6E55006711D9 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47B070D1E9A6E55006711D9 /* StatusBar.swift */; };
@@ -51,16 +47,12 @@
 		F40EB6CF1EA26BEC00FEE444 /* ActionListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionListener.swift; sourceTree = "<group>"; };
 		F40EB6D11EA2F28100FEE444 /* Screenshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Screenshot.swift; sourceTree = "<group>"; };
 		F414DD021EABAB7300111DA7 /* UserDefaultsExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaultsExtension.swift; sourceTree = "<group>"; };
-		F414DD041EAC12D500111DA7 /* FolderItemSerializer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderItemSerializer.swift; sourceTree = "<group>"; };
-		F414DD061EAC43E500111DA7 /* UserDefaultsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaultsTest.swift; sourceTree = "<group>"; };
-		F463F6D81EAA3B8F00FAB2E3 /* LimitedArraySerializerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LimitedArraySerializerTest.swift; sourceTree = "<group>"; };
-		F463F6DA1EAA3C9700FAB2E3 /* LimitedArraySerializer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LimitedArraySerializer.swift; sourceTree = "<group>"; };
+		F42539DF1EACCEDE0083EB9D /* UserDefaultsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaultsTest.swift; sourceTree = "<group>"; };
 		F47B06E71E9A5DF9006711D9 /* GoInto.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoInto.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F47B06EA1E9A5DF9006711D9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		F47B06EE1E9A5DF9006711D9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		F47B06F31E9A5DF9006711D9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		F47B06F81E9A5DF9006711D9 /* GoIntoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GoIntoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		F47B06FC1E9A5DF9006711D9 /* GoIntoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoIntoTests.swift; sourceTree = "<group>"; };
 		F47B06FE1E9A5DF9006711D9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		F47B07071E9A6071006711D9 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
 		F47B070B1E9A65FA006711D9 /* StatusItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusItem.swift; sourceTree = "<group>"; };
@@ -123,8 +115,6 @@
 				F47B07171EA10A88006711D9 /* QuitItem.swift */,
 				F40EB6CF1EA26BEC00FEE444 /* ActionListener.swift */,
 				F4D346931EA644170031AFB3 /* LimitedArray.swift */,
-				F463F6DA1EAA3C9700FAB2E3 /* LimitedArraySerializer.swift */,
-				F414DD041EAC12D500111DA7 /* FolderItemSerializer.swift */,
 				F47B06EE1E9A5DF9006711D9 /* Assets.xcassets */,
 				F47B06F31E9A5DF9006711D9 /* Info.plist */,
 				F40EB6C91EA1D7B500FEE444 /* ImageType.plist */,
@@ -139,9 +129,7 @@
 			isa = PBXGroup;
 			children = (
 				F4DBE9271EA7864B00CEB984 /* LimitedArrayTest.swift */,
-				F463F6D81EAA3B8F00FAB2E3 /* LimitedArraySerializerTest.swift */,
-				F414DD061EAC43E500111DA7 /* UserDefaultsTest.swift */,
-				F47B06FC1E9A5DF9006711D9 /* GoIntoTests.swift */,
+				F42539DF1EACCEDE0083EB9D /* UserDefaultsTest.swift */,
 				F47B06FE1E9A5DF9006711D9 /* Info.plist */,
 			);
 			path = GoIntoTests;
@@ -261,11 +249,9 @@
 				F47B07181EA10A88006711D9 /* QuitItem.swift in Sources */,
 				F40EB6C81EA1CD7A00FEE444 /* ImageTypeItem.swift in Sources */,
 				F47B070E1E9A6E55006711D9 /* StatusBar.swift in Sources */,
-				F463F6DB1EAA3C9700FAB2E3 /* LimitedArraySerializer.swift in Sources */,
 				F4D346941EA644170031AFB3 /* LimitedArray.swift in Sources */,
 				F414DD031EABAB7300111DA7 /* UserDefaultsExtension.swift in Sources */,
 				F47B07121EA10A3E006711D9 /* ChooseFolderItem.swift in Sources */,
-				F414DD051EAC12D500111DA7 /* FolderItemSerializer.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -273,10 +259,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F414DD071EAC43E500111DA7 /* UserDefaultsTest.swift in Sources */,
+				F42539E01EACCEDE0083EB9D /* UserDefaultsTest.swift in Sources */,
 				F4DBE9281EA7864B00CEB984 /* LimitedArrayTest.swift in Sources */,
-				F463F6D91EAA3B8F00FAB2E3 /* LimitedArraySerializerTest.swift in Sources */,
-				F47B06FD1E9A5DF9006711D9 /* GoIntoTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/GoInto.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/GoInto.xcscheme
+++ b/GoInto.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/GoInto.xcscheme
@@ -24,8 +24,8 @@
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>

--- a/GoInto/FolderItemSerializer.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  FolderItemSerializer.swift
-//  GoInto
-//
-//  Created by Hori,Masaki on 2017/04/23.
-//  Copyright © 2017年 Hori,Masaki. All rights reserved.
-//
-
-import Foundation
-
-final class FolderItemSerializer: NSObject, NSCoding {
-    fileprivate let url: URL
-    
-    init(_ url: URL) {
-        self.url = url
-    }
-    
-    private struct CodingKey {
-        static let url = "FolderItemWrapper.url"
-    }
-    
-    init?(coder aDecoder: NSCoder) {
-        guard let url = aDecoder.decodeObject(forKey: CodingKey.url) as? URL
-            else { return nil }
-        self.url = url
-    }
-    func encode(with aCoder: NSCoder) {
-        aCoder.encode(url, forKey: CodingKey.url)
-    }
-}
-extension FolderItemSerializer: Serializer {
-    var original: SerializerProvider? { return FolderItem(url) }
-}
-
-extension FolderItem: SerializerProvider {
-    var serializer: Serializer { return FolderItemSerializer(url) }
-}

--- a/GoInto/LimitedArraySerializer.swift
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  LimitedArraySerializer.swift
-//  GoInto
-//
-//  Created by Hori,Masaki on 2017/04/21.
-//  Copyright © 2017年 Hori,Masaki. All rights reserved.
-//
-
-import Foundation
-
-protocol SerializerProvider {
-    var serializer: Serializer { get }
-}
-protocol Serializer {
-    var original: SerializerProvider? { get }
-}
-
-private struct LimitedArrayWrapperCodingKey {
-    static let array = "LimitedArrayWrapperCodingKey.Array"
-    static let size = "LimitedArrayWrapperCodingKey.Size"
-}
-
-private class LimitedArrayWrapper<Element: Equatable>: NSObject, NSCoding {
-    let array: [Element]
-    let size: Int
-    
-    init(_ limited: LimitedArray<Element>) {
-        array = limited.array
-        size = limited.size
-    }
-    required init?(coder aDecoder: NSCoder) {
-        let array = aDecoder.decodeObject(forKey: LimitedArrayWrapperCodingKey.array)
-        switch array {
-        case let elements as [Element]:
-            self.array = elements
-        case let serialized as [Serializer]:
-            self.array = serialized.flatMap { $0.original as? Element }
-        default:
-            return nil
-        }
-        size = aDecoder.decodeInteger(forKey: LimitedArrayWrapperCodingKey.size)
-    }
-    func encode(with aCoder: NSCoder) {
-        if let serializable = array as? [SerializerProvider] {
-            let storeArray = serializable.map { $0.serializer }
-            aCoder.encode(storeArray, forKey: LimitedArrayWrapperCodingKey.array)
-        } else {
-            aCoder.encode(array, forKey: LimitedArrayWrapperCodingKey.array)
-        }
-        aCoder.encode(size, forKey: LimitedArrayWrapperCodingKey.size)
-    }
-}
-
-class LimitedArraySerializer {
-    
-    class func seirialize<Element>(_ object: LimitedArray<Element>) -> Data {
-        let wrapper = LimitedArrayWrapper(object)
-        return NSKeyedArchiver.archivedData(withRootObject: wrapper)
-    }
-    
-    class func deserialize<Element>(_ data: Data) -> LimitedArray<Element>? {
-        guard let wrapper = NSKeyedUnarchiver.unarchiveObject(with: data) as? LimitedArrayWrapper<Element>
-            else { return nil }
-        var limited = LimitedArray<Element>(wrapper.size)
-        wrapper.array.reversed().forEach { limited.append($0) }
-        return limited
-    }
-}

--- a/GoInto/StatusBar.swift
+++ b/GoInto/StatusBar.swift
@@ -12,7 +12,7 @@ final class StatusBar: NSObject {
     let myStatusBar = NSStatusBar.system().statusItem(withLength: NSSquareStatusItemLength)
     let menu = NSMenu()
     private(set) var items: [StatusItem] = []
-    private(set) var recentItems = LimitedArray<FolderItem>(3)
+    private(set) var recentItems = LimitedArray<FolderItem>(5)
     
     override init() {
         super.init()
@@ -36,6 +36,8 @@ final class StatusBar: NSObject {
         
         items.reversed().forEach { $0.enter(menu) }
         
+        UserDefaults.standard.recentURLs?.forEach(appendFolder)
+        
         let currentLocation = Screenshot.shared.location
         if items
             .flatMap({ $0 as? FolderItem })
@@ -50,6 +52,8 @@ final class StatusBar: NSObject {
         newItem.enter(menu)
         newItem.set()
         recentItems.append(newItem)
+        
+        UserDefaults.standard.recentURLs = recentItems.map { $0.url }
     }
 }
 

--- a/GoInto/UserDefaultsExtension.swift
+++ b/GoInto/UserDefaultsExtension.swift
@@ -9,16 +9,23 @@
 import Foundation
 
 extension UserDefaults {
-    var recentFolders: LimitedArray<FolderItem>? {
-        get {
-            guard let data = object(forKey: "recentFolders") as? Data,
-                let serialized: LimitedArray<FolderItem> = LimitedArraySerializer.deserialize(data)
-                else { return nil }
-            return serialized
+    func set(archived: Any?, forKey: String) {
+        if let object = archived {
+            let data = NSKeyedArchiver.archivedData(withRootObject: object)
+            set(data, forKey: forKey)
+        } else {
+            set(nil, forKey: forKey)
         }
-        set {
-            let data = newValue.map { LimitedArraySerializer.seirialize($0) }
-            set(data, forKey: "recentFolders")
+    }
+    func unarchiveObject(forKey: String) -> Any? {
+        if let data = object(forKey: forKey) as? Data {
+            return NSKeyedUnarchiver.unarchiveObject(with: data)
         }
+        return nil
+    }
+    
+    var recentURLs: [URL]? {
+        get { return unarchiveObject(forKey: "recentURLs") as? [URL] }
+        set { set(archived: newValue, forKey: "recentURLs") }
     }
 }

--- a/GoIntoTests/GoIntoTests.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  GoIntoTests.swift
-//  GoIntoTests
-//
-//  Created by Hori,Masaki on 2017/04/09.
-//  Copyright © 2017年 Hori,Masaki. All rights reserved.
-//
-
-import XCTest
-@testable import GoInto
-
-class GoIntoTests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}

--- a/GoIntoTests/LimitedArraySerializerTest.swift
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-//  LimitedArraySerializerTest.swift
-//  GoInto
-//
-//  Created by Hori,Masaki on 2017/04/21.
-//  Copyright © 2017年 Hori,Masaki. All rights reserved.
-//
-
-import XCTest
-
-@testable import GoInto
-
-
-class LimitedArraySerializerTest: XCTestCase {
-
-    func testInt() {
-        var limited = LimitedArray<Int>(3)
-        limited.append(1)
-        limited.append(2)
-        limited.append(3)
-        
-        let data = LimitedArraySerializer.seirialize(limited)
-        XCTAssertNotNil(data)
-        let object: LimitedArray<Int> = LimitedArraySerializer.deserialize(data) ?? LimitedArray<Int>(3)
-        
-        XCTAssertEqual(object.array, limited.array)
-        XCTAssertEqual(object.size, limited.size)
-    }
-    
-    func testURL() {
-        var limited = LimitedArray<URL>(3)
-        limited.append(URL(fileURLWithPath: "/System/"))
-        limited.append(URL(fileURLWithPath: "/Users/"))
-        limited.append(URL(fileURLWithPath: "/var/"))
-        
-        let data = LimitedArraySerializer.seirialize(limited)
-        XCTAssertNotNil(data)
-        let object: LimitedArray<URL> = LimitedArraySerializer.deserialize(data) ?? LimitedArray<URL>(3)
-        
-        XCTAssertEqual(object.array, limited.array)
-        XCTAssertEqual(object.size, limited.size)
-    }
-    func testFolderItem() {
-        var limited = LimitedArray<FolderItem>(3)
-        limited.append(FolderItem(URL(fileURLWithPath: "/System/")))
-        limited.append(FolderItem(URL(fileURLWithPath: "/Users/")))
-        limited.append(FolderItem(URL(fileURLWithPath: "/var/")))
-        
-        let data = LimitedArraySerializer.seirialize(limited)
-        XCTAssertNotNil(data)
-        let object: LimitedArray<FolderItem> = LimitedArraySerializer.deserialize(data) ?? LimitedArray<FolderItem>(3)
-        
-        XCTAssertEqual(object.array, limited.array)
-        XCTAssertEqual(object.size, limited.size)
-    }
-    
-    func testSize() {
-        var limited = LimitedArray<URL>(5)
-        limited.append(URL(fileURLWithPath: "/System/"))
-        limited.append(URL(fileURLWithPath: "/Users/"))
-        limited.append(URL(fileURLWithPath: "/var/"))
-        
-        let data = LimitedArraySerializer.seirialize(limited)
-        XCTAssertNotNil(data)
-        let object: LimitedArray<URL> = LimitedArraySerializer.deserialize(data) ?? LimitedArray<URL>(5)
-        
-        XCTAssertEqual(object.array, limited.array)
-        XCTAssertEqual(object.size, limited.size)
-    }
-}

--- a/GoIntoTests/UserDefaultsTest.swift
+++ b/GoIntoTests/UserDefaultsTest.swift
@@ -11,20 +11,29 @@ import XCTest
 @testable import GoInto
 
 class UserDefaultsTest: XCTestCase {
+    var originalURLs: [URL]? = []
+    
+    override func setUp() {
+        super.setUp()
+        originalURLs = UserDefaults.standard.recentURLs
+    }
+    
+    override func tearDown() {
+        UserDefaults.standard.recentURLs = originalURLs
+        super.tearDown()
+    }
     
     func testRecentFolders() {
-        var limited = LimitedArray<FolderItem>(3)
-        limited.append(FolderItem(URL(fileURLWithPath: "/System/")))
-        limited.append(FolderItem(URL(fileURLWithPath: "/Users/")))
-        limited.append(FolderItem(URL(fileURLWithPath: "/var/")))
+        let urls = [URL(fileURLWithPath: "/System/"),
+                    URL(fileURLWithPath: "/Users/"),
+                    URL(fileURLWithPath: "/var/")]
         
-        UserDefaults.standard.recentFolders = limited
+        UserDefaults.standard.recentURLs = urls
         
-        let storedData = UserDefaults.standard.recentFolders
+        let storedData = UserDefaults.standard.recentURLs
         XCTAssertNotNil(storedData)
         guard let stored = storedData else { return }
         
-        XCTAssertEqual(limited.array, stored.array)
-        XCTAssertEqual(limited.size, stored.size)
+        XCTAssertEqual(urls, stored)
     }
 }