Skip to content

Commit

Permalink
fixed a few problems and added a new case
Browse files Browse the repository at this point in the history
  • Loading branch information
@proggeramlug
proggeramlug committed Jan 18, 2021
1 parent 174acb5 commit b2fca06
Show file tree
Hide file tree
Showing 4 changed files with 233 additions and 187 deletions.
13 changes: 13 additions & 0 deletions .swiftformat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# file options

--swiftversion 5.2
--exclude .build

# format options

--self insert
--patternlet inline
--stripunusedargs unnamed-only
--ifdef no-indent

# rules
Binary file modified ...tpm/xcode/package.xcworkspace/xcuserdata/amlug.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
156 changes: 96 additions & 60 deletions Sources/String+SwiftyDates.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,100 +17,106 @@ extension String {

var cleanedTime = self.replacingOccurrences(of: "[a-zA-Z]", with: "", options: .regularExpression).replacingOccurrences(of: " ", with: "")
let sep: Character = (self.contains(".") && !self.contains(":")) ? "." : ":"
if (self.contains("-") || self.contains("+")) {
if self.contains("-") || self.contains("+") {
let sign: Double = self.contains("-") ? -1 : 1

let timeParts = split(separator: sign == 1 ? "+" : "-").map(String.init)
cleanedTime = timeParts[0]
if (timeParts[1].contains(":")) {
if timeParts[1].contains(":") {
let intervalParts = timeParts[1].split(separator: ":").compactMap(Double.init)
offset = sign * (intervalParts[0]*3600 + intervalParts[1]*60)
if (intervalParts.count > 2) {
offset = sign * (intervalParts[0] * 3600 + intervalParts[1] * 60)
if intervalParts.count > 2 {
offset = offset + intervalParts[2]
}
} else {
offset = (Double(timeParts[1]) ?? 0) * sign
if timeParts[1].count == 4 {
let s = String(timeParts[1])
let h = Double(s.prefix(2)) ?? 0
let m = Double(s.suffix(2)) ?? 0
offset = (h * 60 + m) * 60
} else {
offset = (Double(timeParts[1]) ?? 0) * 60 * sign
}
}
}
cleanedTime = cleanedTime.replacingOccurrences(of: " ", with: "")
let parts = cleanedTime.split(separator: sep).compactMap(Double.init)
if (parts.count > 0) {
if parts.count > 0 {
hour = parts[0]
}
if (parts.count > 1) {
if parts.count > 1 {
minute = parts[1]
}
if (parts.count > 2) {
if parts.count > 2 {
second = parts[2]
}
if (self.contains("pm")) {
if self.contains("pm") {
hour = hour + 12
}
return Double((hour * 3600) + (minute * 60) + second - offset)
}
public func swiftyDate(calendar:Calendar = Calendar.current) -> Date? {

public func swiftyDate(calendar: Calendar = Calendar.current) -> Date? {
// is this even a string we can work with?
if (self.count < 1) { return nil }
if self.count < 1 { return nil }

var day: Int?
var month: Int?
var year: Int?

// check for german dates ((d)d.(m)m.(yy)yy) or ((m)m.(yy)yy) or ((d)d.(m)m)
if (contains(".")) { // most obvious sign for a german date
let parts = split(separator: ".").map { Int($0) ?? 0}
if (parts.count == 3) {
if contains(".") { // most obvious sign for a german date
let parts = split(separator: ".").map { Int($0) ?? 0 }
if parts.count == 3 {
day = parts[0]
month = parts[1]
year = parts.last!
} else if (parts.count == 2) {
} else if parts.count == 2 {
// checking if the later number is a year (>12 or 4-digits)
if (parts.last! > 12) {
if parts.last! > 12 {
year = parts.last!
month = parts[0]
}
else {
} else {
month = parts.last!
day = parts[0]
}
}
} else if (contains("-") || contains("/")) {
} else if contains("-") || contains("/") {
let sep: Character = self.contains("/") ? "/" : "-"
let usWay = sep == "/"
let parts = split(separator: sep).map { Int($0) ?? 0 }
let isoOrder = parts[0] > 12 && parts[1] < 13
if (parts.count == 3) {
let usWay = parts[1] > 12
let isoOrder = parts[0] > 1000 && parts[1] < 13
if parts.count == 3 {
let reverseIsoOrder = !usWay && parts[2] > 12 && parts[1] < 13
if (isoOrder) {
if isoOrder {
year = parts[0]
month = parts[1]
day = parts[2]
} else if (reverseIsoOrder) {
} else if reverseIsoOrder {
year = parts[2]
month = parts[1]
day = parts[0]
} else {
if (usWay) {
if usWay {
day = parts[1]
month = parts[0]
}
else {
} else {
day = parts[0]
month = parts[1]
}
year = parts.last!
}
} else if (parts.count == 2) {
if (isoOrder) {
} else if parts.count == 2 {
if isoOrder {
year = parts[0]
month = parts[1]
} else {
// checking if the later number is a year (>12 or 4-digits)
if (parts.last! > 12) {
if parts.last! > 12 {
year = parts.last!
month = parts[0]
} else {
if (usWay) {
if usWay {
day = parts.last!
month = parts[0]
} else {
Expand All @@ -119,63 +125,93 @@ extension String {
}
}
}

}
} else {
let intValue = Int(self) ?? 0
print("int value is: ", intValue)
if (self.count == 4 || intValue > 12) {
if self.count == 4 || intValue > 12 {
year = intValue
} else {
month = intValue
}
}
// if no year is given we use the current year
let date = Date()
if (year == nil) {
if year == nil {
year = calendar.component(.year, from: date)
}
if (year! < 50) {
if year! < 50 {
year = 2000 + year!
}

if year! > 5000 {
if let timestamp = TimeInterval(self) {
return Date(timeIntervalSince1970: timestamp)
}
}
let components = DateComponents(calendar: calendar, year: year, month: month, day: day)

let components = DateComponents(calendar: calendar, year: year, month: month, day: day, hour: 0, minute: 0, second: 0)
return components.date
}

public func swiftyDateTime(calendar: Calendar = Calendar.current, baseDate: Date = Date()) -> Date? {
if (self == "") { return nil }
if self == "" { return nil }

var time: TimeInterval = 0
var date: Date?

// cleaning
let cleanString = replacingOccurrences(of: " am", with: "am").replacingOccurrences(of: " pm", with: "pm")

// check for iso 8601 (yyyy-MM-ddTHH:mm:ss.SSZ)
if (cleanString.contains("T")) {
let parts:[String] = split(separator: "T").map(String.init)
date = parts[0].swiftyDate()
if cleanString.contains("T") {
let parts: [String] = split(separator: "T").map(String.init)
date = parts[0].swiftyDate(calendar: calendar)
time = parts[1].swiftyTime()
} else if (cleanString.contains(" ") && (cleanString.contains(":") || cleanString.contains("am") || cleanString.contains("pm")) && (cleanString.contains("/") || cleanString.contains("-") || cleanString.contains("."))) {
if let pos = index(of: " ") {
date = String(self[..<pos]).swiftyDate()
time = String(self[pos...]).swiftyTime()
print("time: ", time, self)
} else if cleanString.contains(" ") && (cleanString.contains(":") || cleanString.contains("am") || cleanString.contains("pm")) && (cleanString.contains("/") || cleanString.contains("-") || cleanString.contains(".")) {
if cleanString.split(separator: " ").count > 1 {
// we likely have Fri, 15 Jan 2021 13:22:00 -0500 date
let cleanString_ = cleanString.lowercased()
.replacingOccurrences(of: " jan ", with: "/01/")
.replacingOccurrences(of: " feb ", with: "/02/")
.replacingOccurrences(of: " mar ", with: "/03/")
.replacingOccurrences(of: " apr ", with: "/04/")
.replacingOccurrences(of: " may ", with: "/05/")
.replacingOccurrences(of: " jun ", with: "/06/")
.replacingOccurrences(of: " jul ", with: "/07/")
.replacingOccurrences(of: " aug ", with: "/08/")
.replacingOccurrences(of: " sep ", with: "/09/")
.replacingOccurrences(of: " oct ", with: "/10/")
.replacingOccurrences(of: " nov ", with: "/11/")
.replacingOccurrences(of: " dec ", with: "/12/")
.replacingOccurrences(of: "mon, ", with: "")
.replacingOccurrences(of: "tue, ", with: "")
.replacingOccurrences(of: "wed, ", with: "")
.replacingOccurrences(of: "thu, ", with: "")
.replacingOccurrences(of: "fri, ", with: "")
.replacingOccurrences(of: "sat, ", with: "")
.replacingOccurrences(of: "sun, ", with: "")
print("new me: ", cleanString_)
if let pos = cleanString_.index(of: " ") {
date = String(cleanString_[..<pos]).swiftyDate(calendar: calendar)
time = String(cleanString_[pos...]).swiftyTime()
print("date: ", String(cleanString_[..<pos]), date)
print("time: ", String(cleanString_[pos...]), time)
} else {
date = self.swiftyDate(calendar: calendar)
}
} else {
date = swiftyDate()
if let pos = index(of: " ") {
date = String(self[..<pos]).swiftyDate()
time = String(self[pos...]).swiftyTime()
} else {
date = self.swiftyDate(calendar: calendar)
}
}
} else if (cleanString.contains(":") || cleanString.contains("pm") || cleanString.contains("am")) { // if we have a ":" it is most likely a time

} else if cleanString.contains(":") || cleanString.contains("pm") || cleanString.contains("am") { // if we have a ":" it is most likely a time
date = calendar.date(from: calendar.dateComponents([.year, .month, .day], from: baseDate))!
time = swiftyTime()
time = self.swiftyTime()
} else {
date = swiftyDate()
date = self.swiftyDate(calendar: calendar)
}

return date == nil ? nil : date! + time
Expand Down
Loading

0 comments on commit b2fca06

Please sign in to comment.