提交: bb8adaf3739e5f08a6b5162c883ae57a968a1b04 - GoInto (git)

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

Commit MetaInfo

• 修订版: bb8adaf3739e5f08a6b5162c883ae57a968a1b04 (tree)
• 时间: 2018-04-16 23:20:55
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

コーディング規約を変更

更改概述

• modified: GoInto/AppDelegate.swift
• modified: GoInto/ChooseFolderItem.swift
• modified: GoInto/FolderItem.swift
• modified: GoInto/ImageTypeItem.swift
• modified: GoInto/LimitedArray.swift
• modified: GoInto/QuitItem.swift
• modified: GoInto/Screenshot.swift
• modified: GoInto/StatusBar.swift
• modified: GoInto/StatusItem.swift
• modified: GoInto/UserDefaultsExtension.swift
• modified: GoIntoTests/LimitedArrayTest.swift
• modified: GoIntoTests/UserDefaultsTest.swift

差异

--- a/GoInto/AppDelegate.swift
+++ b/GoInto/AppDelegate.swift
@@ -14,9 +14,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     let statusBar = StatusBar()
     
     class var appName: String {
+        
         guard let dict = Bundle.main.localizedInfoDictionary,
-            let name = dict["CFBundleDisplayName"] as? String
-            else { return "GO into" }
+            let name = dict["CFBundleDisplayName"] as? String else {
+                
+                return "GO into"
+        }
         return name
     }
 }

--- a/GoInto/ChooseFolderItem.swift
+++ b/GoInto/ChooseFolderItem.swift
@@ -9,10 +9,12 @@
 import Cocoa
 
 class ChooseFolderItem: StatusItem {
+    
     let menuItem = NSMenuItem()
     let urlSelector: (URL) -> Void
     
     init(_ handler: @escaping ((URL) -> Void)) {
+        
         urlSelector = handler
         menuItem.title = NSLocalizedString("Choose Folder", comment: "Choose Folder MenuItem")
         menuItem.action = #selector(selectFolder(_:))
@@ -20,6 +22,7 @@ class ChooseFolderItem: StatusItem {
     }
     
     @IBAction func selectFolder(_ sender: Any?) {
+        
         let panel = NSOpenPanel()
         panel.canChooseDirectories = true
         panel.allowsMultipleSelection = false
@@ -31,7 +34,10 @@ class ChooseFolderItem: StatusItem {
         
         NSApplication.shared.activate(ignoringOtherApps: true)
         guard panel.runModal() == NSApplication.ModalResponse(NSFileHandlingPanelOKButton),
-            let url = panel.directoryURL else { return }
+            let url = panel.directoryURL else {
+                
+                return
+        }
         urlSelector(url)
     }
 }

--- a/GoInto/FolderItem.swift
+++ b/GoInto/FolderItem.swift
@@ -9,16 +9,21 @@
 import Cocoa
 
 final class FolderItem: StatusItem {
+    
     let url: URL
     let menuItem = NSMenuItem()
     
     init(_ url: URL) {
+        
         self.url = url
         
         if let either = try? url.resourceValues(forKeys: [.localizedNameKey]),
             let name = either.localizedName {
+            
             menuItem.title = name
+            
         } else {
+            
             menuItem.title = FileManager.default.displayName(atPath: url.path)
         }
         
@@ -27,44 +32,59 @@ final class FolderItem: StatusItem {
         menuItem.action = #selector(changeFolder(_:))
         menuItem.target = self
     }
+    
     deinit {
+        
         remove()
     }
     
     func set() {
+        
         let newUrl = url
+        
         DispatchQueue(label: "Launch defaults").async {
+            
             Screenshot.shared.location = newUrl
             if #available(macOS 10.12, *) {
+                
                 return
+                
             } else {
+                
                 Screenshot.shared.apply()
             }
         }
     }
     
     func update(_ url: URL) {
+        
         menuItem.state = (self.url == url ? .on : .off)
     }
     
     @IBAction func changeFolder(_ sender: Any?) {
+        
         set()
     }
 }
 
 func fitSize(_ image: NSImage) -> NSImage {
+    
     let fitSize: CGFloat = 19
     let size = image.size
     guard size.width > fitSize else { return image }
+    
     let ratio = fitSize / size.width
     let newSize = NSSize(width: size.width * ratio, height: size.height * ratio)
     image.resizingMode = .stretch
     image.size = newSize
+    
     return image
 }
 
 extension FolderItem: Equatable {
+    
     static func ==(lhs: FolderItem, rhs: FolderItem) -> Bool {
+        
         return lhs.url == rhs.url
     }
 }

--- a/GoInto/ImageTypeItem.swift
+++ b/GoInto/ImageTypeItem.swift
@@ -9,17 +9,23 @@
 import Cocoa
 
 private func loadImageTypes() -> [String] {
+    
     guard let url = Bundle.main.url(forResource: "ImageType", withExtension: "plist"),
-        let array = NSArray(contentsOf: url)
-        else { return [] }
+        let array = NSArray(contentsOf: url) else {
+            
+            return []
+    }
+    
     return array as? [String] ?? []
 }
 
 class ImageTypeItem: StatusItem {
+    
     let menuItem = NSMenuItem()
     private let supportTypes = loadImageTypes()
     
-    init() {        
+    init() {
+        
         menuItem.title = NSLocalizedString("Image Type", comment: "Image Type MenuItem")
         
         let ws = NSWorkspace.shared
@@ -28,38 +34,51 @@ class ImageTypeItem: StatusItem {
         supportTypes
             .filter { ws.localizedDescription(forType: $0) != nil }
             .map {
+                
                 let item = NSMenuItem()
                 item.title = ws.localizedDescription(forType: $0) ?? "Never Use Default Value"
                 item.action = #selector(selectType(_:))
                 item.target = self
                 item.representedObject = ws.preferredFilenameExtension(forType: $0)
+                
                 return item
             }
             .forEach { menuItem.submenu?.addItem($0) }
     }
     
     func update() {
+        
         let current = Screenshot.shared.type
         menuItem.submenu?.items.forEach {
+            
             if let type = $0.representedObject as? String,
                 type == current {
+                
                 $0.state = .on
+                
             } else {
+                
                 $0.state = .off
             }
         }
     }
     
     fileprivate func set(_ typeName: String) {
+        
         DispatchQueue(label: "Launch defaults").async {
+            
             Screenshot.shared.type = typeName
         }
     }
     
     @IBAction func selectType(_ sender: Any?) {
+        
         guard let item = sender as? NSMenuItem,
-            let typeName = item.representedObject as? String
-            else { return }
+            let typeName = item.representedObject as? String else {
+                
+                return
+        }
+        
         set(typeName)
     }
 }

--- a/GoInto/LimitedArray.swift
+++ b/GoInto/LimitedArray.swift
@@ -14,33 +14,43 @@ struct LimitedArray<Element: Equatable>: Collection {
     let size: Int
     
     init(_ size: Int) {
+        
         self.size = size
     }
+    
     mutating func append(_ newObject: Element) {
+        
         if let index = array.index(of: newObject) {
+            
             array.remove(at: index)
         }
         array.insert(newObject, at: 0)
         if array.count > size {
+            
             array.remove(at: size)
         }
     }
     
     // Collection
     var startIndex: Int {
+        
         return array.startIndex
     }
     var endIndex: Int {
+        
         return array.endIndex
     }
     func index(after i: Int) -> Int {
+        
         return array.index(after: i)
     }
     subscript(position: Int) -> Element {
+        
         return array[position]
     }
 }
 extension LimitedArray: CustomDebugStringConvertible {
+    
     var description: String { return array.description }
     var debugDescription: String { return array.debugDescription }
 }

--- a/GoInto/QuitItem.swift
+++ b/GoInto/QuitItem.swift
@@ -9,9 +9,11 @@
 import Cocoa
 
 class QuitItem: StatusItem {
+    
     let menuItem = NSMenuItem()
     
     init() {
+        
         let format = NSLocalizedString("Quit %@", comment: "Quit Menu Item")
         menuItem.title = String(format: format, AppDelegate.appName)
         menuItem.action = #selector(quit(_:))
@@ -19,6 +21,7 @@ class QuitItem: StatusItem {
     }
     
     @IBAction func quit(_ sender: Any?) {
+        
         NSApplication.shared.terminate(nil)
     }
 }

--- a/GoInto/Screenshot.swift
+++ b/GoInto/Screenshot.swift
@@ -11,7 +11,9 @@ import Foundation
 class Screenshot {
     
     private enum Attrubute: String {
+        
         case location = "location"
+        
         case type = "type"
     }
     
@@ -20,16 +22,19 @@ class Screenshot {
     private init() {}
     
     var location: URL {
+        
         get { return screencaptureAttribute(.location).map { URL(fileURLWithPath: $0) } ?? desktopURL() }
         set { setScreencaptureAttribute(newValue.path, for: .location) }
     }
     var type: String {
+        
         get { return screencaptureAttribute(.type) ?? "jpeg" }
         set { setScreencaptureAttribute(newValue, for: .type) }
     }
     
     @available(macOS, deprecated: 10.12)
     func apply() {
+        
         let process = Process()
         process.launchPath = "/usr/bin/killall"
         process.arguments = ["SystemUIServer"]
@@ -37,6 +42,7 @@ class Screenshot {
     }
     
     private func screencaptureAttribute(_ attr: Attrubute) -> String? {
+        
         let process = Process()
         process.launchPath = "/usr/bin/defaults"
         process.arguments = ["read", "com.apple.screencapture", attr.rawValue]
@@ -48,20 +54,26 @@ class Screenshot {
         let data = pipe.fileHandleForReading.readDataToEndOfFile()
         guard let output = String(data: data, encoding: .utf8),
             let type = output.components(separatedBy: "\n").first,
-            process.terminationStatus == 0
-            else { return nil }
+            process.terminationStatus == 0 else {
+                
+                return nil
+        }
+        
         return type
     }
+    
     private func setScreencaptureAttribute(_ value: String, for attr: Attrubute) {
+        
         let process = Process()
         process.launchPath = "/usr/bin/defaults"
         process.arguments = ["write", "com.apple.screencapture", attr.rawValue, value]
         process.launch()
         process.waitUntilExit()
         
-        guard process.terminationStatus == 0
-            else {
+        guard process.terminationStatus == 0 else {
+            
                 print("Can not set location")
+            
                 return
         }
     }

--- a/GoInto/StatusBar.swift
+++ b/GoInto/StatusBar.swift
@@ -9,15 +9,20 @@
 import Cocoa
 
 final class StatusBar: NSObject {
+    
     let myStatusBar = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
     let menu = NSMenu()
+    
     private(set) var items: [StatusItem] = []
     private(set) var recentItems = LimitedArray<FolderItem>(5) {
+        
         didSet { UserDefaults.standard.recentURLs = recentItems.map { $0.url } }
     }
     
     override init() {
+        
         super.init()
+        
         menu.delegate = self
         
         myStatusBar.menu = menu
@@ -27,6 +32,7 @@ final class StatusBar: NSObject {
     }
     
     private func build() {
+        
         items = [
             FolderItem(desktopURL()),
             FolderItem(picturesURL()),
@@ -53,26 +59,35 @@ final class StatusBar: NSObject {
         let newItem = FolderItem(url)
         recentItems.append(newItem)
         newItem.enter(menu)
+        
         return newItem
     }
     
     private func appendFolder(_ url: URL) {
+        
         _ = newFolderItem(url)
     }
     
     private func appendAndChooseFolder(_ url: URL) {
+        
         newFolderItem(url)?.set()
     }
 }
 
 extension StatusBar: NSMenuDelegate {
+    
     func menuWillOpen(_ menu: NSMenu) {
+        
         let url = Screenshot.shared.location
         recentItems.forEach { $0.update(url) }
         items.forEach { item in
+            
             switch item {
+                
             case let f as FolderItem: f.update(url)
+                
             case let i as ImageTypeItem: i.update()
+                
             default: ()
             }
         }
@@ -81,15 +96,17 @@ extension StatusBar: NSMenuDelegate {
 
 
 fileprivate func picturesURL() -> URL {
+    
     return FileManager
         .default
         .urls(for: .picturesDirectory,
-              in: .userDomainMask).last ?? URL(fileURLWithPath: NSHomeDirectory())
+              in: .userDomainMask).last ?? FileManager.default.homeDirectoryForCurrentUser
 }
 
 func desktopURL() -> URL {
+    
     return FileManager
         .default
         .urls(for: .desktopDirectory,
-              in: .userDomainMask).last ?? URL(fileURLWithPath: NSHomeDirectory())
+              in: .userDomainMask).last ?? FileManager.default.homeDirectoryForCurrentUser
 }

--- a/GoInto/StatusItem.swift
+++ b/GoInto/StatusItem.swift
@@ -9,6 +9,7 @@
 import Cocoa
 
 protocol StatusItem {
+    
     var menuItem: NSMenuItem { get }
     
     func enter(_ menu: NSMenu)
@@ -16,18 +17,25 @@ protocol StatusItem {
 }
 
 extension StatusItem {
+    
     func enter(_ menu: NSMenu) {
+        
         if let currentMenu = menuItem.menu,
             currentMenu == menu {
+            
             return
         }
+        
         menu.insertItem(menuItem, at: 0)
     }
+    
     func remove() {
+        
         menuItem.menu?.removeItem(menuItem)
     }
 }
 
 struct SeparatorItem: StatusItem {
+    
     let menuItem = NSMenuItem.separator()
 }

--- a/GoInto/UserDefaultsExtension.swift
+++ b/GoInto/UserDefaultsExtension.swift
@@ -9,22 +9,32 @@
 import Foundation
 
 extension UserDefaults {
+    
     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)
         }
     }
+    
     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/LimitedArrayTest.swift
+++ b/GoIntoTests/LimitedArrayTest.swift
@@ -13,6 +13,7 @@ import XCTest
 class LimitedArrayTest: XCTestCase {
 
     func testExample() {
+        
         var limited = LimitedArray<Int>(3)
         XCTAssertEqual(limited.array, [])
         

--- a/GoIntoTests/UserDefaultsTest.swift
+++ b/GoIntoTests/UserDefaultsTest.swift
@@ -11,19 +11,23 @@ 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() {
+        
         let urls = [URL(fileURLWithPath: "/System/"),
                     URL(fileURLWithPath: "/Users/"),
                     URL(fileURLWithPath: "/var/")]