New mime type criteria for the plain files.

Author: sbarex

Application/PlainSettingsEditorViewController.swift

@@ -10,6 +10,7 @@ import AppKit
 
 class PlainSettingsEditorViewController: NSViewController {
     @IBOutlet weak var patternTextField: NSTextField!
+    @IBOutlet weak var patternMimeTextField: NSTextField!
     @IBOutlet weak var regExpButton: NSButton!
     @IBOutlet weak var caseSensitiveButton: NSButton!
     @IBOutlet weak var syntaxPopupButton: NSPopUpButton!
@@ -63,7 +64,8 @@ class PlainSettingsEditorViewController: NSViewController {
     }
 
     func initSettings() {
-        patternTextField?.stringValue = plainSettings?.pattern ?? ""
+        patternTextField?.stringValue = plainSettings?.patternFile ?? ""
+        patternMimeTextField?.stringValue = plainSettings?.patternMime ?? ""
         regExpButton?.state = plainSettings?.isRegExp ?? false ? .on : .off
         caseSensitiveButton?.state = plainSettings?.isCaseSensitive ?? false ? .on : .off
         availableSyntax = HighlightWrapper.shared.languages
@@ -96,7 +98,7 @@ class PlainSettingsEditorViewController: NSViewController {
         tableView?.selectRowIndexes(IndexSet(integer: index), byExtendingSelection: false)
         tableView?.scrollRowToVisible(index)
 
-        doneButton?.isEnabled = !(plainSettings?.pattern ?? "").isEmpty
+        doneButton?.isEnabled = !(plainSettings?.patternFile ?? "").isEmpty || !(plainSettings?.patternMime ?? "").isEmpty
     }
 
     @IBAction func handleCancel(_ sender: Any) {
@@ -124,7 +126,7 @@ class PlainSettingsEditorViewController: NSViewController {
             uti = allFileTypes[tableView.selectedRow - 2].UTI
         }
 
-        handler?(PlainSettings(pattern: self.patternTextField.stringValue, isRegExp: regExpButton.state == .on, isCaseInsensitive: caseSensitiveButton.state == .off, UTI: uti, syntax: stx))
+        handler?(PlainSettings(patternFile: self.patternTextField.stringValue, patternMime: self.patternMimeTextField.stringValue, isRegExp: regExpButton.state == .on, isCaseInsensitive: caseSensitiveButton.state == .off, UTI: uti, syntax: stx))
 
         self.dismiss(self)
     }
@@ -184,10 +186,10 @@ extension PlainSettingsEditorViewController: NSTableViewDelegate {
 
 extension PlainSettingsEditorViewController: NSTextFieldDelegate {
     func controlTextDidChange(_ obj: Notification) {
-        guard let textFiled = obj.object as? NSTextField, textFiled == patternTextField else {
+        guard let textFiled = obj.object as? NSTextField, textFiled == patternTextField || textFiled == patternMimeTextField else {
             return
         }
-        doneButton.isEnabled = !textFiled.stringValue.isEmpty
+        doneButton.isEnabled = !patternTextField.stringValue.isEmpty || !patternMimeTextField.stringValue.isEmpty
     }
 }
 

Application/PlainSettingsView.swift

@@ -189,10 +189,12 @@ extension PlainSettingsView: NSTableViewDelegate {
             let s: String
             switch column {
             case 0:
-                s = setting.pattern
+                s = setting.patternFile
             case 1:
-                s = setting.UTI.isEmpty ? "General" : setting.UTI
+                s = setting.patternMime
             case 2:
+                s = setting.UTI.isEmpty ? "General" : setting.UTI
+            case 3:
                 s = setting.syntax.isEmpty ? "Plain text" : setting.syntax
             default:
                 break outerLoop
@@ -219,7 +221,9 @@ extension PlainSettingsView: NSTableViewDataSource {
 
     func tableView(_ tableView: NSTableView, objectValueFor tableColumn: NSTableColumn?, row: Int) -> Any? {
         if tableColumn?.identifier.rawValue == "pattern" {
-            return self.plainSettings[row].pattern
+            return self.plainSettings[row].patternFile
+        } else if tableColumn?.identifier.rawValue == "mime" {
+            return self.plainSettings[row].patternMime
         } else if tableColumn?.identifier.rawValue == "uti" {
             return self.plainSettings[row].UTI.isEmpty ? "General" : self.plainSettings[row].UTI
         } else if tableColumn?.identifier.rawValue == "syntax" {
@@ -232,7 +236,13 @@ extension PlainSettingsView: NSTableViewDataSource {
     func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
         if tableColumn?.identifier.rawValue == "pattern" {
             let cellView = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "PatternCell"), owner: nil) as! PatternTableCellView
-            cellView.textField?.stringValue = self.plainSettings[row].pattern
+            cellView.textField?.stringValue = self.plainSettings[row].patternFile
+            cellView.caseSensitiveImageView.isHidden = !self.plainSettings[row].isCaseSensitive
+            cellView.regExpImageView.isHidden = !self.plainSettings[row].isRegExp
+            return cellView
+        } else if tableColumn?.identifier.rawValue == "mime" {
+            let cellView = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "PatternCell"), owner: nil) as! PatternTableCellView
+            cellView.textField?.stringValue = self.plainSettings[row].patternMime
             cellView.caseSensitiveImageView.isHidden = !self.plainSettings[row].isCaseSensitive
             cellView.regExpImageView.isHidden = !self.plainSettings[row].isRegExp
             return cellView