Enforce the code style to avoid 'get' for readonly computed properties.

GetToSet · GetToSet · commit 7fbcfadbe06d · 2022-10-28T00:24:09.000+08:00
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,4 +1,5 @@
-# https://github.com/airbnb/swift
+# This file is based on the Airbnb's Swift Style Guide
+# https://github.com/airbnb/swift/blob/master/Sources/AirbnbSwiftFormatTool/swiftlint.yml
 
 only_rules:
   - closure_spacing
@@ -7,11 +8,9 @@ only_rules:
   - extension_access_modifier
   - fatal_error_message
   - file_header
-  # - force_cast
   - force_try
-  # - force_unwrapping
-  # - implicitly_unwrapped_optional
   - generic_type_name
+  - implicit_getter
   - legacy_cggeometry_functions
   - legacy_constant
   - legacy_constructor
diff --git a/Doughnut/Library/Episode.swift b/Doughnut/Library/Episode.swift
@@ -47,10 +47,8 @@ class Episode: Record {
   var downloading: Bool = false
 
   var plainDescription: String? {
-    get {
-      guard let description = description else { return nil }
-      return description.replacingOccurrences(of: "<[^>]+>", with: "", options: String.CompareOptions.regularExpression, range: nil).trimmingCharacters(in: .whitespacesAndNewlines)
-    }
+    guard let description = description else { return nil }
+    return description.replacingOccurrences(of: "<[^>]+>", with: "", options: String.CompareOptions.regularExpression, range: nil).trimmingCharacters(in: .whitespacesAndNewlines)
   }
 
   override class var databaseTableName: String {
diff --git a/Doughnut/Library/Library.swift b/Doughnut/Library/Library.swift
@@ -72,10 +72,8 @@ class Library: NSObject {
   var podcasts = [Podcast]()
 
   var unplayedCount: Int {
-    get {
-      return podcasts.reduce(0) {
-        $0 + $1.unplayedCount
-      }
+    return podcasts.reduce(0) {
+      $0 + $1.unplayedCount
     }
   }
 
diff --git a/Doughnut/Library/Podcast.swift b/Doughnut/Library/Podcast.swift
@@ -46,44 +46,34 @@ class Podcast: Record {
   private(set) var image: NSImage?
 
   var manualReload: Bool {
-    get {
-      return reloadFrequency == -1
-    }
+    return reloadFrequency == -1
   }
 
   var defaultReload: Bool {
-    get {
-      return reloadFrequency == 0
-    }
+    return reloadFrequency == 0
   }
 
   var episodes = [Episode]()
 
   var unplayedCount: Int {
-    get {
-      return episodes.reduce(0) {
-        $0 + ($1.played == false ? 1 : 0)
-      }
+    return episodes.reduce(0) {
+      $0 + ($1.played == false ? 1 : 0)
     }
   }
 
   var favouriteCount: Int {
-    get {
-      return episodes.reduce(0) {
-        $0 + ($1.favourite ? 1 : 0)
-      }
+    return episodes.reduce(0) {
+      $0 + ($1.favourite ? 1 : 0)
     }
   }
 
   var latestEpisode: Episode? {
-    get {
-      return episodes.sorted(by: { (a, b) -> Bool in
-        guard let aD = a.pubDate else { return false }
-        guard let bD = b.pubDate else { return true }
+    return episodes.sorted(by: { (a, b) -> Bool in
+      guard let aD = a.pubDate else { return false }
+      guard let bD = b.pubDate else { return true }
 
-        return aD < bD
-      }).last
-    }
+      return aD < bD
+    }).last
   }
 
   var loading = false
diff --git a/Doughnut/Player/Player.swift b/Doughnut/Player/Player.swift
@@ -69,17 +69,13 @@ final class Player: NSObject {
   }
 
   var isPlaying: Bool {
-    get {
-      guard let av = avPlayer else { return false }
-      return av.rate != 0 && av.error == nil
-    }
+    guard let av = avPlayer else { return false }
+    return av.rate != 0 && av.error == nil
   }
 
   var canPlay: Bool {
-    get {
-      guard let av = avPlayer else { return false }
-      return av.error == nil
-    }
+    guard let av = avPlayer else { return false }
+    return av.error == nil
   }
 
   var nowPlayingEpisodeInfoDictionary = [String: Any]()
diff --git a/Doughnut/Preference/PrefGeneralViewController.swift b/Doughnut/Preference/PrefGeneralViewController.swift
@@ -30,20 +30,16 @@ final class PrefGeneralViewController: NSViewController, MASPreferencesViewContr
   @objc var viewIdentifier: String = "PrefGeneralViewController"
 
   @objc var toolbarItemImage: NSImage? {
-    get {
-      if #available(macOS 11.0, *) {
-        return NSImage(systemSymbolName: "gearshape", accessibilityDescription: nil)!
-      } else {
-        return NSImage(named: NSImage.preferencesGeneralName)
-      }
+    if #available(macOS 11.0, *) {
+      return NSImage(systemSymbolName: "gearshape", accessibilityDescription: nil)!
+    } else {
+      return NSImage(named: NSImage.preferencesGeneralName)
     }
   }
 
   @objc var toolbarItemLabel: String? {
-    get {
-      view.layoutSubtreeIfNeeded()
-      return "General"
-    }
+    view.layoutSubtreeIfNeeded()
+    return "General"
   }
 
   override func viewDidLoad() {
diff --git a/Doughnut/Preference/PrefLibraryViewController.swift b/Doughnut/Preference/PrefLibraryViewController.swift
@@ -30,20 +30,16 @@ final class PrefLibraryViewController: NSViewController, MASPreferencesViewContr
   @objc var viewIdentifier: String = "PrefLibraryViewController"
 
   @objc var toolbarItemImage: NSImage? {
-    get {
-      if #available(macOS 11.0, *) {
-        return NSImage(systemSymbolName: "square.stack", accessibilityDescription: nil)!
-      } else {
-        return NSImage(named: "PrefIcon/Library")!
-      }
+    if #available(macOS 11.0, *) {
+      return NSImage(systemSymbolName: "square.stack", accessibilityDescription: nil)!
+    } else {
+      return NSImage(named: "PrefIcon/Library")!
     }
   }
 
   @objc var toolbarItemLabel: String? {
-    get {
-      view.layoutSubtreeIfNeeded()
-      return "Library"
-    }
+    view.layoutSubtreeIfNeeded()
+    return "Library"
   }
 
   override func viewDidAppear() {
diff --git a/Doughnut/Preference/PrefPlaybackViewController.swift b/Doughnut/Preference/PrefPlaybackViewController.swift
@@ -30,20 +30,16 @@ final class PrefPlaybackViewController: NSViewController, MASPreferencesViewCont
   @objc var viewIdentifier: String = "PrefPlaybackViewController"
 
   @objc var toolbarItemImage: NSImage? {
-    get {
-      if #available(macOS 11.0, *) {
-        return NSImage(systemSymbolName: "play.circle", accessibilityDescription: nil)!
-      } else {
-        return NSImage(named: "PrefIcon/Playback")
-      }
+    if #available(macOS 11.0, *) {
+      return NSImage(systemSymbolName: "play.circle", accessibilityDescription: nil)!
+    } else {
+      return NSImage(named: "PrefIcon/Playback")
     }
   }
 
   @objc var toolbarItemLabel: String? {
-    get {
-      view.layoutSubtreeIfNeeded()
-      return "Playback"
-    }
+    view.layoutSubtreeIfNeeded()
+    return "Playback"
   }
 
   @objc var hasResizableWidth: Bool = false
diff --git a/Doughnut/Preference/Preference.swift b/Doughnut/Preference/Preference.swift
@@ -67,9 +67,7 @@ class Preference {
   static let kVolume = "Volume"
 
   static var defaultLibraryPath: URL {
-    get {
-      return Preference.userMusicPath().appendingPathComponent("Doughnut")
-    }
+    return Preference.userMusicPath().appendingPathComponent("Doughnut")
   }
 
   static let defaultPreference: [String: Any] = [
diff --git a/Doughnut/View Controllers/EpisodeViewController.swift b/Doughnut/View Controllers/EpisodeViewController.swift
@@ -76,9 +76,7 @@ final class EpisodeViewController: NSViewController, NSTableViewDelegate, NSTabl
   }
 
   var viewController: ViewController {
-    get {
-      return parent as! ViewController
-    }
+    return parent as! ViewController
   }
 
   override func viewDidLoad() {
diff --git a/Doughnut/View Controllers/PodcastViewController.swift b/Doughnut/View Controllers/PodcastViewController.swift
@@ -78,9 +78,7 @@ final class PodcastViewController: NSViewController, NSTableViewDelegate, NSTabl
   }
 
   var viewController: ViewController {
-    get {
-      return parent as! ViewController
-    }
+    return parent as! ViewController
   }
 
   override func viewDidLoad() {
diff --git a/Doughnut/View Controllers/TasksViewController.swift b/Doughnut/View Controllers/TasksViewController.swift
@@ -69,9 +69,7 @@ class TaskView: NSView, TaskProgressDelegate {
   }
 
   override var intrinsicContentSize: NSSize {
-    get {
-      return NSSize(width: bounds.size.width, height: TASK_VIEW_HEIGHT)
-    }
+    return NSSize(width: bounds.size.width, height: TASK_VIEW_HEIGHT)
   }
 
   func progressed() {
diff --git a/Doughnut/View Controllers/ViewController.swift b/Doughnut/View Controllers/ViewController.swift
@@ -31,21 +31,15 @@ final class ViewController: NSSplitViewController, LibraryDelegate {
   }
 
   var podcastViewController: PodcastViewController {
-    get {
-      return splitViewItems[0].viewController as! PodcastViewController
-    }
+    return splitViewItems[0].viewController as! PodcastViewController
   }
 
   var episodeViewController: EpisodeViewController {
-    get {
-      return splitViewItems[1].viewController as! EpisodeViewController
-    }
+    return splitViewItems[1].viewController as! EpisodeViewController
   }
 
   var detailViewController: DetailViewController {
-    get {
-      return splitViewItems[2].viewController as! DetailViewController
-    }
+    return splitViewItems[2].viewController as! DetailViewController
   }
 
   override func viewDidLoad() {
diff --git a/Doughnut/Views/SeekSlider.swift b/Doughnut/Views/SeekSlider.swift
@@ -26,9 +26,7 @@ final class SeekSlider: NSSlider {
    }
 
   override var knobThickness: CGFloat {
-    get {
-      return 3.0
-    }
+    return 3.0
   }
 
   var streamedValue: Double = 0 {
@@ -66,22 +64,18 @@ private class SeekSliderCell: NSSliderCell {
   }
 
   var percentage: CGFloat {
-    get {
-      if (self.maxValue - self.minValue) > 0 {
-        return CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))
-      } else {
-        return 0
-      }
+    if (self.maxValue - self.minValue) > 0 {
+      return CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))
+    } else {
+      return 0
     }
   }
 
   var streamedPercentage: CGFloat {
-    get {
-      if (self.maxValue - self.minValue) > 0 {
-        return CGFloat((self.streamed - self.minValue) / (self.maxValue - self.minValue))
-      } else {
-        return 0
-      }
+    if (self.maxValue - self.minValue) > 0 {
+      return CGFloat((self.streamed - self.minValue) / (self.maxValue - self.minValue))
+    } else {
+      return 0
     }
   }
 
diff --git a/Doughnut/WindowController.swift b/Doughnut/WindowController.swift
@@ -29,9 +29,7 @@ final class WindowController: NSWindowController, NSTextFieldDelegate {
   }
 
   var subscribeViewController: SubscribeViewController {
-    get {
-      return self.storyboard!.instantiateController(withIdentifier: "SubscribeViewController") as! SubscribeViewController
-    }
+    return self.storyboard!.instantiateController(withIdentifier: "SubscribeViewController") as! SubscribeViewController
   }
 
   override func windowDidLoad() {
diff --git a/Doughnut/Windows/ShowEpisodeWindow.swift b/Doughnut/Windows/ShowEpisodeWindow.swift
@@ -40,9 +40,7 @@ final class ShowEpisodeWindowController: NSWindowController {
 
 class ShowEpisodeWindow: NSWindow {
   override var canBecomeKey: Bool {
-    get {
-      return true
-    }
+    return true
   }
 }
 
diff --git a/Doughnut/Windows/ShowPodcastWindow.swift b/Doughnut/Windows/ShowPodcastWindow.swift
@@ -40,9 +40,7 @@ final class ShowPodcastWindowController: NSWindowController {
 
 class ShowPodcastWindow: NSWindow {
   override var canBecomeKey: Bool {
-    get {
-      return true
-    }
+    return true
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,8 @@ class Library: NSObject {`
`72`	`72`	`var podcasts = [Podcast]()`
`73`	`73`
`74`	`74`	`var unplayedCount: Int {`
`75`		`- get {`
`76`		`- return podcasts.reduce(0) {`
`77`		`- $0 + $1.unplayedCount`
`78`		`- }`
	`75`	`+ return podcasts.reduce(0) {`
	`76`	`+ $0 + $1.unplayedCount`
`79`	`77`	`}`
`80`	`78`	`}`
`81`	`79`
Original file line number	Diff line number	Diff line change
`@@ -69,17 +69,13 @@ final class Player: NSObject {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`var isPlaying: Bool {`
`72`		`- get {`
`73`		`- guard let av = avPlayer else { return false }`
`74`		`- return av.rate != 0 && av.error == nil`
`75`		`- }`
	`72`	`+ guard let av = avPlayer else { return false }`
	`73`	`+ return av.rate != 0 && av.error == nil`
`76`	`74`	`}`
`77`	`75`
`78`	`76`	`var canPlay: Bool {`
`79`		`- get {`
`80`		`- guard let av = avPlayer else { return false }`
`81`		`- return av.error == nil`
`82`		`- }`
	`77`	`+ guard let av = avPlayer else { return false }`
	`78`	`+ return av.error == nil`
`83`	`79`	`}`
`84`	`80`
`85`	`81`	`var nowPlayingEpisodeInfoDictionary = [String: Any]()`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,7 @@ class Preference {`
`67`	`67`	`static let kVolume = "Volume"`
`68`	`68`
`69`	`69`	`static var defaultLibraryPath: URL {`
`70`		`- get {`
`71`		`- return Preference.userMusicPath().appendingPathComponent("Doughnut")`
`72`		`- }`
	`70`	`+ return Preference.userMusicPath().appendingPathComponent("Doughnut")`
`73`	`71`	`}`
`74`	`72`
`75`	`73`	`static let defaultPreference: [String: Any] = [`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,7 @@ final class EpisodeViewController: NSViewController, NSTableViewDelegate, NSTabl`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`var viewController: ViewController {`
`79`		`- get {`
`80`		`- return parent as! ViewController`
`81`		`- }`
	`79`	`+ return parent as! ViewController`
`82`	`80`	`}`
`83`	`81`
`84`	`82`	`override func viewDidLoad() {`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,7 @@ final class PodcastViewController: NSViewController, NSTableViewDelegate, NSTabl`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`var viewController: ViewController {`
`81`		`- get {`
`82`		`- return parent as! ViewController`
`83`		`- }`
	`81`	`+ return parent as! ViewController`
`84`	`82`	`}`
`85`	`83`
`86`	`84`	`override func viewDidLoad() {`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,7 @@ class TaskView: NSView, TaskProgressDelegate {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`override var intrinsicContentSize: NSSize {`
`72`		`- get {`
`73`		`- return NSSize(width: bounds.size.width, height: TASK_VIEW_HEIGHT)`
`74`		`- }`
	`72`	`+ return NSSize(width: bounds.size.width, height: TASK_VIEW_HEIGHT)`
`75`	`73`	`}`
`76`	`74`
`77`	`75`	`func progressed() {`
Original file line number	Diff line number	Diff line change
`@@ -31,21 +31,15 @@ final class ViewController: NSSplitViewController, LibraryDelegate {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`var podcastViewController: PodcastViewController {`
`34`		`- get {`
`35`		`- return splitViewItems[0].viewController as! PodcastViewController`
`36`		`- }`
	`34`	`+ return splitViewItems[0].viewController as! PodcastViewController`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`var episodeViewController: EpisodeViewController {`
`40`		`- get {`
`41`		`- return splitViewItems[1].viewController as! EpisodeViewController`
`42`		`- }`
	`38`	`+ return splitViewItems[1].viewController as! EpisodeViewController`
`43`	`39`	`}`
`44`	`40`
`45`	`41`	`var detailViewController: DetailViewController {`
`46`		`- get {`
`47`		`- return splitViewItems[2].viewController as! DetailViewController`
`48`		`- }`
	`42`	`+ return splitViewItems[2].viewController as! DetailViewController`
`49`	`43`	`}`
`50`	`44`
`51`	`45`	`override func viewDidLoad() {`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ final class SeekSlider: NSSlider {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`override var knobThickness: CGFloat {`
`29`		`- get {`
`30`		`- return 3.0`
`31`		`- }`
	`29`	`+ return 3.0`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`var streamedValue: Double = 0 {`
`@@ -66,22 +64,18 @@ private class SeekSliderCell: NSSliderCell {`
`66`	`64`	`}`
`67`	`65`
`68`	`66`	`var percentage: CGFloat {`
`69`		`- get {`
`70`		`- if (self.maxValue - self.minValue) > 0 {`
`71`		`- return CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))`
`72`		`- } else {`
`73`		`- return 0`
`74`		`- }`
	`67`	`+ if (self.maxValue - self.minValue) > 0 {`
	`68`	`+ return CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))`
	`69`	`+ } else {`
	`70`	`+ return 0`
`75`	`71`	`}`
`76`	`72`	`}`
`77`	`73`
`78`	`74`	`var streamedPercentage: CGFloat {`
`79`		`- get {`
`80`		`- if (self.maxValue - self.minValue) > 0 {`
`81`		`- return CGFloat((self.streamed - self.minValue) / (self.maxValue - self.minValue))`
`82`		`- } else {`
`83`		`- return 0`
`84`		`- }`
	`75`	`+ if (self.maxValue - self.minValue) > 0 {`
	`76`	`+ return CGFloat((self.streamed - self.minValue) / (self.maxValue - self.minValue))`
	`77`	`+ } else {`
	`78`	`+ return 0`
`85`	`79`	`}`
`86`	`80`	`}`
`87`	`81`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ final class WindowController: NSWindowController, NSTextFieldDelegate {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`var subscribeViewController: SubscribeViewController {`
`32`		`- get {`
`33`		`- return self.storyboard!.instantiateController(withIdentifier: "SubscribeViewController") as! SubscribeViewController`
`34`		`- }`
	`32`	`+ return self.storyboard!.instantiateController(withIdentifier: "SubscribeViewController") as! SubscribeViewController`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`override func windowDidLoad() {`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,7 @@ final class ShowEpisodeWindowController: NSWindowController {`
`40`	`40`
`41`	`41`	`class ShowEpisodeWindow: NSWindow {`
`42`	`42`	`override var canBecomeKey: Bool {`
`43`		`- get {`
`44`		`- return true`
`45`		`- }`
	`43`	`+ return true`
`46`	`44`	`}`
`47`	`45`	`}`
`48`	`46`