tracks/swift/exercises/meetup/Sources/MeetupExample.swift in trackler-2.0.8.30 vs tracks/swift/exercises/meetup/Sources/MeetupExample.swift in trackler-2.0.8.31

- old
+ new

@@ -65,11 +65,11 @@ return "0\(input)" } else { return String(input) } } var description: String { - let date = [year, month, day, hour, mins, secs].map {addLeadingZero($0)} + let date = [year, month, day, hour, mins, secs].map { addLeadingZero($0) } let dateOnly = date[0] + "-" + date[1] + "-" + date[2] let dateTime = dateOnly + "T" + date[3] + ":" + date[4] + ":" + date[5] switch descriptionStyle { @@ -95,20 +95,20 @@ var day = Int32() var hour = Int32() var minute = Int32() var second = Int32() - let dateTime = input.characters.split(separator: "T").map {String($0)} - let date = dateTime[0].characters.split(separator: "-").map {String($0)} + let dateTime = input.characters.split(separator: "T").map { String($0) } + let date = dateTime[0].characters.split(separator: "-").map { String($0) } if date.count == 3 { year = Int32(date[0]) ?? 0 month = Int32(date[1]) ?? 0 day = Int32(date[2]) ?? 0 } if dateTime.count == 2 { - let time = dateTime[1].characters.split(separator: ":").map {String($0)} + let time = dateTime[1].characters.split(separator: ":").map { String($0) } if time.count == 3 { hour = Int32(time[0]) ?? 0 minute = Int32(time[1]) ?? 0 second = Int32(time[2]) ?? 0 @@ -132,25 +132,25 @@ var dateMonthWeekDays = [[Int32(), Int32()]] var dateWeekDays = [Int32()] let starDay = dateStart.weekday var month = Array(dateStart.day ... dateEnd.day) - month = month.map {(($0 + 5 + starDay) % 7) + 1 } + month = month.map { (($0 + 5 + starDay) % 7) + 1 } for (index, eachDay) in month.enumerated() { dateMonthWeekDays.append([Int32(index + 1), eachDay]) dateWeekDays.append(eachDay)} func which2date(_ dateInput: String) -> Date { if which == "teenth" { let teenthRange = Array(dateMonthWeekDays[13...19]) - let teenth = teenthRange.filter({$0[1] == Int32(dayOfTheWeek) })[0][0] + let teenth = teenthRange.filter({ $0[1] == Int32(dayOfTheWeek) })[0][0] return Date(from: "\(dateStart.year)-\(dateStart.month)-\(teenth)") ?? Date() } - let count = dateMonthWeekDays.filter({$0[1] == Int32(dayOfTheWeek) }).count + let count = dateMonthWeekDays.filter({ $0[1] == Int32(dayOfTheWeek) }).count var dayIndex: Int = 0 switch dateInput { case "1st": dayIndex = 0 case "2nd": dayIndex = 1 case "3rd": dayIndex = 2 @@ -158,10 +158,10 @@ case "5th": dayIndex = 4 case "last": dayIndex = (count - 1) default: dayIndex = -1 } - let first2last = dateMonthWeekDays.filter({$0[1] == Int32(dayOfTheWeek) })[dayIndex][0] + let first2last = dateMonthWeekDays.filter({ $0[1] == Int32(dayOfTheWeek) })[dayIndex][0] return Date(from:"\(dateStart.year)-\(dateStart.month)-\(first2last)") ?? Date() } return which2date(which)