dnrops
/
swiftydates
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed 'pm' constant and a missed type declaration

This commit is contained in:
Caleb Kleveter 2018-05-29 09:19:32 -05:00
parent 8370d59f65
commit 6293e5f26f
No known key found for this signature in database
GPG Key ID: B38DBD5CF2C98D69
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/String+SwiftyDates.swift
View File

@ -10,7 +10,6 @@ import Foundation
extension String { extension String {
public func swiftyTime() -> TimeInterval { public func swiftyTime() -> TimeInterval {
let pm = self.contains("pm")
var hour: Double = 0 var hour: Double = 0
var minute: Double = 0 var minute: Double = 0
var second: Double = 0 var second: Double = 0
@ -22,7 +21,7 @@ extension String {
if (self.contains("-") || self.contains("+")) { if (self.contains("-") || self.contains("+")) {
let sign: Double = self.contains("-") ? -1 : 1 let sign: Double = self.contains("-") ? -1 : 1
let timeParts:[String] = split(separator: sign == 1 ? "+" : "-").map(String.init) let timeParts = split(separator: sign == 1 ? "+" : "-").map(String.init)
cleanedTime = timeParts[0] cleanedTime = timeParts[0]
if (timeParts[1].contains(":")) { if (timeParts[1].contains(":")) {
let intervalParts = timeParts[1].split(separator: ":").compactMap(Double.init) let intervalParts = timeParts[1].split(separator: ":").compactMap(Double.init)
@ -44,7 +43,7 @@ extension String {
if (parts.count > 2) { if (parts.count > 2) {
second = parts[2] second = parts[2]
} }
if (pm) { if (self.contains("pm")) {
hour = hour + 12 hour = hour + 12
} }
return Double((hour * 3600) + (minute * 60) + second - offset) return Double((hour * 3600) + (minute * 60) + second - offset)