Commit: 8a1c5a21267791dae4ac4061e1efc8932c390e21 - GoInto (git)

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

Commit MetaInfo

• Revision: 8a1c5a21267791dae4ac4061e1efc8932c390e21 (tree)
• Time: 2017-11-05 09:18:20
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

起動時に保存フォルダが変わってしまう問題を修正

Change Summary

• modified: GoInto/StatusBar.swift

Incremental Difference

--- a/GoInto/StatusBar.swift
+++ b/GoInto/StatusBar.swift
@@ -31,7 +31,7 @@ final class StatusBar: NSObject {
             FolderItem(desktopURL()),
             FolderItem(picturesURL()),
             SeparatorItem(),
-            ChooseFolderItem(appendFolder),
+            ChooseFolderItem(appendAndChooseFolder),
             SeparatorItem(),
             ImageTypeItem(),
             SeparatorItem(),
@@ -45,11 +45,23 @@ final class StatusBar: NSObject {
         appendFolder(Screenshot.shared.location)
     }
     
-    private func appendFolder(_ url: URL) {
+    private func newFolderItem(_ url: URL) -> FolderItem? {
+        
+        guard url != desktopURL() else { return nil }
+        guard url != picturesURL() else { return nil }
+        
         let newItem = FolderItem(url)
         recentItems.append(newItem)
         newItem.enter(menu)
-        newItem.set()
+        return newItem
+    }
+    
+    private func appendFolder(_ url: URL) {
+        _ = newFolderItem(url)
+    }
+    
+    private func appendAndChooseFolder(_ url: URL) {
+        newFolderItem(url)?.set()
     }
 }