Auto update with Sparkle framework.

Author: sbarex

Application/AppDelegate.swift

@@ -21,12 +21,16 @@
 //  along with SyntaxHighlight. If not, see <http://www.gnu.org/licenses/>.
 
 import Cocoa
+import Sparkle
 import Syntax_Highlight_XPC_Service
 
 typealias ExampleItem = (url: URL, title: String, uti: String)
 
 @NSApplicationMain
-class AppDelegate: NSObject, NSApplicationDelegate {
+class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation {
+    var userDriver: SPUStandardUserDriver?
+    var updater: SPUUpdater?
+    
     lazy var connection: NSXPCConnection = {
         let connection = NSXPCConnection(serviceName: "org.sbarex.SourceCodeSyntaxHighlight.XPCService")
         connection.remoteObjectInterface = NSXPCInterface(with: SCSHXPCServiceProtocol.self)
@@ -47,6 +51,37 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         if #available(OSX 10.12.2, *) {
             NSApplication.shared.isAutomaticCustomizeTouchBarMenuItemEnabled = true
         }
+        
+        let hostBundle = Bundle.main
+        let applicationBundle = hostBundle;
+        
+        self.userDriver = SPUStandardUserDriver(hostBundle: hostBundle, delegate: nil)
+        self.updater = SPUUpdater(hostBundle: hostBundle, applicationBundle: applicationBundle, userDriver: self.userDriver!, delegate: nil)
+        
+        do {
+            try self.updater!.start()
+        } catch {
+            print("Failed to start updater with error: \(error)")
+            
+            let alert = NSAlert()
+            alert.messageText = "Updater Error"
+            alert.informativeText = "The Updater failed to start. For detailed error information, check the Console.app log."
+            alert.addButton(withTitle: "OK")
+            alert.runModal()
+        }
+    }
+    
+    @IBAction func checkForUpdates(_ sender: Any)
+    {
+        self.updater?.checkForUpdates()
+    }
+
+    func validateMenuItem(_ menuItem: NSMenuItem) -> Bool
+    {
+        if menuItem.action == #selector(self.checkForUpdates(_:)) {
+            return self.userDriver?.canCheckForUpdates ?? false
+        }
+        return true
     }
 
     func applicationWillTerminate(_ aNotification: Notification) {

Application/Assets.xcassets/ext-ON.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ext_on.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Application/Assets.xcassets/ext-ON.imageset/ext_on.pdf

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "ext.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Application/Assets.xcassets/ext.imageset/Contents.json

@@ -37,7 +37,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2019 SBAREX. All rights reserved.</string>
+	<string>Copyright © 2020 SBAREX. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>
@@ -51,7 +51,7 @@
 	<key>SUPublicEDKey</key>
 	<string>J+ikFQXeR6eaUV0jvyfZAJKeYh+9UKGJuD/kJSIXnZk=</string>
 	<key>SUScheduledCheckInterval</key>
-	<integer>604800</integer>
+	<integer>86400</integer>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

Application/Assets.xcassets/ext.imageset/ext.pdf

@@ -106,6 +106,7 @@ class PreferencesViewController: NSViewController {
     /// Search field for filter the UTI list.
     @IBOutlet weak var searchField: NSSearchField!
     @IBOutlet weak var filterButton: NSButton!
+    @IBOutlet weak var extensionButton: NSButton!
 
     /// Preview view.
     @IBOutlet weak var previewView: PreviewView!
@@ -125,6 +126,15 @@ class PreferencesViewController: NSViewController {
 
     internal var initialized = false
 
+    /// Show UTI instead of extensions.
+    var showUTI: Bool = false {
+        didSet {
+            self.extensionButton.image = NSImage(named: !showUTI ? "ext-ON" : "ext")
+            self.extensionButton.contentTintColor = !showUTI ? NSColor.controlAccentColor : NSColor.secondaryLabelColor
+            self.tableView.reloadData()
+        }
+    }
+    
     internal var isDirty = false {
         didSet {
             self.view.window?.isDocumentEdited = isDirty
@@ -273,6 +283,8 @@ class PreferencesViewController: NSViewController {
 
     // MARK: -
     override func viewDidLoad() {
+        self.showUTI = false // Force the button refresh.
+        
         globalSettingsView.delegate = self
         appearanceView.delegate = self
         extraSettingsView.delegate = self
@@ -598,6 +610,11 @@ class PreferencesViewController: NSViewController {
         sender.contentTintColor = sender.state == .on ? NSColor.controlAccentColor : NSColor.secondaryLabelColor
     }
 
+    /// Show UTIs or extensions.
+    @IBAction func handleExtensionButton(_ sender: NSButton) {
+        self.showUTI = sender.state == .off
+    }
+    
     // MARK: -
 
     @IBAction func showHelp(_ sender: Any) {
@@ -830,7 +847,7 @@ extension PreferencesViewController: NSTableViewDataSource {
     }
 }
 
-// MARK: - NSTableViewDelegate
+// MARK: NSTableViewDelegate
 extension PreferencesViewController: NSTableViewDelegate {
     func tableViewSelectionIsChanging(_ notification: Notification) {
         if currentUTI == nil {
@@ -861,7 +878,7 @@ extension PreferencesViewController: NSTableViewDelegate {
     }
 
     func tableView(_ tableView: NSTableView, heightOfRow row: Int) -> CGFloat {
-        return row == 0 || row == 2 ? 30 : 38
+        return row == 0 || row == 2 ? 30 : 42
     }
 
     func tableView(_ tableView: NSTableView, shouldSelectRow row: Int) -> Bool {
@@ -881,17 +898,21 @@ extension PreferencesViewController: NSTableViewDelegate {
             } else if column.identifier == NSUserInterfaceItemIdentifier("Name") {
                 if row > 2 {
                     let suppressed = fileTypes[row - 3].extensions.count > 0 && fileTypes[row - 3].suppressedExtensions.count == fileTypes[row - 3].extensions.count
+                    v.textField?.stringValue = fileTypes[row - 3].description
+                    v.textField?.textColor = suppressed ? .disabledControlTextColor : .labelColor
                     if let cell = v as? UTITableCellView {
-                        v.textField?.stringValue = fileTypes[row - 3].description
-                        cell.extensionTextField.stringValue = fileTypes[row - 3].extensions.count > 0 ? "." + fileTypes[row - 3].extensions.joined(separator: ", .") : ""
+                        let extensions = fileTypes[row - 3].extensions.count > 0 ? "." + fileTypes[row - 3].extensions.joined(separator: ", .") : ""
+                        if showUTI {
+                            cell.extensionTextField.stringValue = fileTypes[row - 3].uti.UTI
+                        } else {
+                            cell.extensionTextField.stringValue = extensions
+                        }
                         cell.extensionTextField.isHidden = false
                         cell.extensionTextField.textColor = suppressed ?  .disabledControlTextColor : .labelColor
+                        cell.extensionTextField.toolTip = showUTI ? extensions : self.fileTypes[row - 3].uti.UTI
                     } else {
-                        v.textField?.stringValue = fileTypes[row - 3].fullDescription
+                        v.toolTip = self.fileTypes[row - 3].uti.UTI
                     }
-                    v.toolTip = self.fileTypes[row - 3].uti.UTI
-                    
-                    v.textField?.textColor = suppressed ? .disabledControlTextColor : .labelColor
                 } else if row == 1 {
                     v.textField?.stringValue = "Global"
                     v.textField?.textColor = .labelColor
@@ -918,6 +939,7 @@ extension PreferencesViewController: NSTabViewDelegate {
 
 }
 
+// MARK: - AppearanceViewDelegate
 extension PreferencesViewController: AppearanceViewDelegate {
     func appearance(appearanceView: AppearanceView, requestBrowserForTheme theme: SCSHTheme?, mode: ThemeStyleFilterEnum, fromView: NSView,  onComplete: @escaping (_ theme: SCSHTheme?)->Void) {
         guard let vc = self.storyboard?.instantiateController(withIdentifier:"ThemeSelector") as? ThemeSelectorViewController else {
@@ -950,12 +972,14 @@ extension PreferencesViewController: AppearanceViewDelegate {
     }
 }
 
+// MARK: ExtraSettingsViewDelegate
 extension PreferencesViewController: ExtraSettingsViewDelegate {
     func extraSettingsRequestRefreshPreview(extraSettingsView: ExtraSettingsView) {
         previewView.refresh(extraSettingsView)
     }
 }
 
+// MARK: GlobalSettingsViewDelegate
 extension PreferencesViewController: GlobalSettingsViewDelegate {
     /// Shows the about highlight window,
     func globalSettings(globalSettingsView: GlobalSettingsView, showHighlightInfoForPath path: String?) {
@@ -1002,7 +1026,7 @@ extension PreferencesViewController: GlobalSettingsViewDelegate {
     }
 }
 
-
+// MARK: - NSTouchBarDelegate
 extension PreferencesViewController: NSTouchBarDelegate {
 
 }

Application/Base.lproj/Main.storyboard

@@ -6,6 +6,8 @@
 	<true/>
 	<key>com.apple.security.automation.apple-events</key>
 	<true/>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
 	<key>com.apple.security.get-task-allow</key>