Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions Doughnut/Library/Episode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 2 additions & 4 deletions Doughnut/Library/Library.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
32 changes: 11 additions & 21 deletions Doughnut/Library/Podcast.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 4 additions & 8 deletions Doughnut/Player/Player.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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]()
Expand Down
16 changes: 6 additions & 10 deletions Doughnut/Preference/PrefGeneralViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
16 changes: 6 additions & 10 deletions Doughnut/Preference/PrefLibraryViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
16 changes: 6 additions & 10 deletions Doughnut/Preference/PrefPlaybackViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions Doughnut/Preference/Preference.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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] = [
Expand Down
4 changes: 1 addition & 3 deletions Doughnut/View Controllers/EpisodeViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 1 addition & 3 deletions Doughnut/View Controllers/PodcastViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 1 addition & 3 deletions Doughnut/View Controllers/TasksViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
12 changes: 3 additions & 9 deletions Doughnut/View Controllers/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
24 changes: 9 additions & 15 deletions Doughnut/Views/SeekSlider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ final class SeekSlider: NSSlider {
}

override var knobThickness: CGFloat {
get {
return 3.0
}
return 3.0
}

var streamedValue: Double = 0 {
Expand Down Expand Up @@ -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
}
}

Expand Down
4 changes: 1 addition & 3 deletions Doughnut/WindowController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 1 addition & 3 deletions Doughnut/Windows/ShowEpisodeWindow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ final class ShowEpisodeWindowController: NSWindowController {

class ShowEpisodeWindow: NSWindow {
override var canBecomeKey: Bool {
get {
return true
}
return true
}
}

Expand Down
4 changes: 1 addition & 3 deletions Doughnut/Windows/ShowPodcastWindow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ final class ShowPodcastWindowController: NSWindowController {

class ShowPodcastWindow: NSWindow {
override var canBecomeKey: Bool {
get {
return true
}
return true
}
}

Expand Down