Quick SwiftLint tidy-ups

bcmn · bcmn · commit 697071e1b683 · 2018-01-22T18:32:36.000Z
diff --git a/ConfCore/DateAdapter.swift b/ConfCore/DateAdapter.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public let ConfCoreDateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
+public let confCoreDateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
 
 final class DateAdapter: Adapter {
     typealias InputType = String
@@ -34,7 +34,7 @@ final class DateTimeAdapter: Adapter {
 
     func adapt(_ input: String) -> Result<Date, AdapterError> {
         let formatter = DateFormatter()
-        formatter.dateFormat = ConfCoreDateFormat
+        formatter.dateFormat = confCoreDateFormat
         formatter.locale = Locale(identifier: "en-US")
         formatter.timeZone = TimeZone.current
 
diff --git a/ConfCoreTests/AdapterTests.swift b/ConfCoreTests/AdapterTests.swift
@@ -14,7 +14,7 @@ class AdapterTests: XCTestCase {
 
     private let dateTimeFormatter: DateFormatter = {
         let formatter = DateFormatter()
-        formatter.dateFormat = ConfCoreDateFormat
+        formatter.dateFormat = confCoreDateFormat
         formatter.locale = Locale(identifier: "en-US")
         formatter.timeZone = TimeZone.current
         return formatter
diff --git a/PlayerUI/Protocols/PUIPlayerViewDelegates.swift b/PlayerUI/Protocols/PUIPlayerViewDelegates.swift
@@ -28,6 +28,6 @@ public protocol PUIPlayerViewAppearanceDelegate: class {
     func playerViewShouldShowTimestampLabels(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowExternalPlaybackControls(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowFullScreenButton(_ playerView: PUIPlayerView) -> Bool
-    func PlayerViewShouldShowBackAndForward30SecondsButtons(_ playerView: PUIPlayerView) -> Bool
+    func playerViewShouldShowBackAndForward30SecondsButtons(_ playerView: PUIPlayerView) -> Bool
 
 }
diff --git a/PlayerUI/Util/DebugLog.swift b/PlayerUI/Util/DebugLog.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-func DebugLog(_ items: Any...) {
+func debugLog(_ items: Any...) {
     #if DEBUG
         print(items)
     #endif
diff --git a/PlayerUI/Views/PUIButton.swift b/PlayerUI/Views/PUIButton.swift
@@ -148,8 +148,8 @@ public final class PUIButton: NSControl {
         shouldDrawHighlighted = true
 
         if !sendsActionOnMouseDown {
-            window?.trackEvents(matching: [.leftMouseUp, .leftMouseDragged], timeout: NSEvent.foreverDuration, mode: .eventTrackingRunLoopMode) { e, stop in
-                if e?.type == .leftMouseUp {
+            window?.trackEvents(matching: [.leftMouseUp, .leftMouseDragged], timeout: NSEvent.foreverDuration, mode: .eventTrackingRunLoopMode) { event, stop in
+                if event?.type == .leftMouseUp {
                     self.shouldDrawHighlighted = false
                     stop.pointee = true
                 }
diff --git a/PlayerUI/Views/PUIPlayerView.swift b/PlayerUI/Views/PUIPlayerView.swift
@@ -736,7 +736,7 @@ public final class PUIPlayerView: NSView {
         backButton.isHidden = disableBackAndForward
         forwardButton.isHidden = disableBackAndForward
 
-        let skipBy30 = d.PlayerViewShouldShowBackAndForward30SecondsButtons(self)
+        let skipBy30 = d.playerViewShouldShowBackAndForward30SecondsButtons(self)
         backButton.image = skipBy30 ? .PUIBack30s : .PUIBack15s
         backButton.action = skipBy30 ? #selector(goBackInTime30) : #selector(goBackInTime15)
         backButton.toolTip = skipBy30 ? "Go back 30s" : "Go back 15s"
@@ -778,10 +778,10 @@ public final class PUIPlayerView: NSView {
 
     fileprivate func updateExternalPlaybackMenus() {
         // clean menu
-        extrasMenuContainerView.arrangedSubviews.enumerated().forEach { idx, v in
+        extrasMenuContainerView.arrangedSubviews.enumerated().forEach { idx, view in
             guard idx < extrasMenuContainerView.arrangedSubviews.count - 1 else { return }
 
-            extrasMenuContainerView.removeArrangedSubview(v)
+            extrasMenuContainerView.removeArrangedSubview(view)
         }
 
         // repopulate
diff --git a/PlayerUI/Views/PUIPlayerWindow.swift b/PlayerUI/Views/PUIPlayerWindow.swift
@@ -183,8 +183,8 @@ open class PUIPlayerWindow: NSWindow {
         }, completionHandler: nil)
     }
 
-    open override func standardWindowButton(_ b: NSWindow.ButtonType) -> NSButton? {
-        guard let button = super.standardWindowButton(b) else { return nil }
+    open override func standardWindowButton(_ type: NSWindow.ButtonType) -> NSButton? {
+        guard let button = super.standardWindowButton(type) else { return nil }
 
         titlebarWidgets.insert(button)
 
diff --git a/PlayerUI/Views/PUITimelineView.swift b/PlayerUI/Views/PUITimelineView.swift
@@ -236,11 +236,11 @@ public final class PUITimelineView: NSView {
 
         var startedInteractiveSeek = false
 
-        window?.trackEvents(matching: [.pressure, .leftMouseUp, .leftMouseDragged, .tabletPoint], timeout: NSEvent.foreverDuration, mode: .eventTrackingRunLoopMode) { e, stop in
-            let point = self.convert((e?.locationInWindow)!, from: nil)
+        window?.trackEvents(matching: [.pressure, .leftMouseUp, .leftMouseDragged, .tabletPoint], timeout: NSEvent.foreverDuration, mode: .eventTrackingRunLoopMode) { event, stop in
+            let point = self.convert((event?.locationInWindow)!, from: nil)
             let progress = Double(point.x / self.bounds.width)
 
-            switch e?.type {
+            switch event?.type {
             case .leftMouseUp?:
                 if startedInteractiveSeek {
                     self.viewDelegate?.timelineViewDidFinishInteractiveSeek()
@@ -251,7 +251,7 @@ public final class PUITimelineView: NSView {
 
                 stop.pointee = true
             case .pressure?, .tabletPoint?:
-                switch e?.touchForce {
+                switch event?.touchForce {
                 case .forceTouch?:
                     guard self.hasValidMediaDuration else {
                         stop.pointee = true
@@ -260,7 +260,7 @@ public final class PUITimelineView: NSView {
 
                     let timestamp = self.mediaDuration * progress
 
-                    DebugLog("Force touch at \(timestamp)s")
+                    debugLog("Force touch at \(timestamp)s")
 
                     self.viewDelegate?.timelineDidReceiveForceTouch(at: timestamp)
 
diff --git a/WWDC/AppCoordinator.swift b/WWDC/AppCoordinator.swift
@@ -86,7 +86,7 @@ final class AppCoordinator {
 
         self.windowController = windowController
 
-        liveObserver = LiveObserver(dateProvider: Today, storage: storage)
+        liveObserver = LiveObserver(dateProvider: today, storage: storage)
 
         setupBindings()
         setupDelegation()
diff --git a/WWDC/DateProvider.swift b/WWDC/DateProvider.swift
@@ -11,10 +11,10 @@ import ConfCore
 
 typealias DateProvider = () -> Date
 
-let Today: DateProvider = {
+let today: DateProvider = {
     if let fakeDate = Arguments.deloreanDate {
         let formatter = DateFormatter()
-        formatter.dateFormat = ConfCoreDateFormat
+        formatter.dateFormat = confCoreDateFormat
         return formatter.date(from: fakeDate)!
     } else {
         return Date()
diff --git a/WWDC/DeepLink.swift b/WWDC/DeepLink.swift
@@ -49,7 +49,7 @@ struct DeepLink {
         }
 
         guard let yearNumber = Int(fullYear) else { return nil }
-        let currentYear = "\(Calendar.current.component(.year, from: Today()))"
+        let currentYear = "\(Calendar.current.component(.year, from: today()))"
         let currentYearDigits = String(currentYear[currentYear.index(currentYear.startIndex, offsetBy: 2)...])
 
         self.year = yearNumber
diff --git a/WWDC/LiveObserver.swift b/WWDC/LiveObserver.swift
@@ -111,7 +111,7 @@ private extension SessionAsset {
         self.init()
 
         assetType = .liveStreamVideo
-        year = Calendar.current.component(.year, from: Today())
+        year = Calendar.current.component(.year, from: today())
         sessionId = "\(number)"
         remoteURL = hls
         identifier = generateIdentifier()
diff --git a/WWDC/SessionsTableViewController.swift b/WWDC/SessionsTableViewController.swift
@@ -123,9 +123,9 @@ class SessionsTableViewController: NSViewController {
             DispatchQueue.main.sync {
 
                 // Preserve selected rows
-                let selectedRows = self.tableView.selectedRowIndexes.flatMap { (i) -> IndexedSessionRow? in
-                    guard i < oldValue.endIndex else { return nil }
-                    return IndexedSessionRow(sessionRow: oldValue[i], index: i)
+                let selectedRows = self.tableView.selectedRowIndexes.flatMap { (index) -> IndexedSessionRow? in
+                    guard index < oldValue.endIndex else { return nil }
+                    return IndexedSessionRow(sessionRow: oldValue[index], index: index)
                 }
 
                 var selectedIndexes = IndexSet(newRowsSet.intersection(selectedRows).map { $0.index })
@@ -208,7 +208,7 @@ class SessionsTableViewController: NSViewController {
     func scrollToToday() {
         guard let sections = scheduleSections else { return }
 
-        guard let section = sections.filter("representedDate >= %@", Today()).first else { return }
+        guard let section = sections.filter("representedDate >= %@", today()).first else { return }
 
         guard let identifier = section.instances.first?.session?.identifier else { return }
 
diff --git a/WWDC/VideoPlayerViewController.swift b/WWDC/VideoPlayerViewController.swift
@@ -323,7 +323,7 @@ extension VideoPlayerViewController: PUIPlayerViewAppearanceDelegate {
         return !sessionViewModel.sessionInstance.isCurrentlyLive
     }
 
-    func PlayerViewShouldShowBackAndForward30SecondsButtons(_ playerView: PUIPlayerView) -> Bool {
+    func playerViewShouldShowBackAndForward30SecondsButtons(_ playerView: PUIPlayerView) -> Bool {
         return Preferences.shared.skipBackAndForwardBy30Seconds
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ public protocol PUIPlayerViewAppearanceDelegate: class {`
`28`	`28`	`func playerViewShouldShowTimestampLabels(_ playerView: PUIPlayerView) -> Bool`
`29`	`29`	`func playerViewShouldShowExternalPlaybackControls(_ playerView: PUIPlayerView) -> Bool`
`30`	`30`	`func playerViewShouldShowFullScreenButton(_ playerView: PUIPlayerView) -> Bool`
`31`		`- func PlayerViewShouldShowBackAndForward30SecondsButtons(_ playerView: PUIPlayerView) -> Bool`
	`31`	`+ func playerViewShouldShowBackAndForward30SecondsButtons(_ playerView: PUIPlayerView) -> Bool`
`32`	`32`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,8 @@ open class PUIPlayerWindow: NSWindow {`
`183`	`183`	`}, completionHandler: nil)`
`184`	`184`	`}`
`185`	`185`
`186`		`- open override func standardWindowButton(_ b: NSWindow.ButtonType) -> NSButton? {`
`187`		`- guard let button = super.standardWindowButton(b) else { return nil }`
	`186`	`+ open override func standardWindowButton(_ type: NSWindow.ButtonType) -> NSButton? {`
	`187`	`+ guard let button = super.standardWindowButton(type) else { return nil }`
`188`	`188`
`189`	`189`	`titlebarWidgets.insert(button)`
`190`	`190`