karolina/avh-plan-ios
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some issues, revamped code and added a little YouTube easter egg

Browse Source
This commit is contained in:
Deniz Duezgoeren
2019-10-08 11:51:21 +02:00
parent 40250ecc7b
commit b7bc097664
13 changed files with 81 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AvH Plan/DataFetcher.swift
+8 -5
View File
@@ -140,7 +140,7 @@ class DataFetcher {
let a = String(group[...group.startIndex])
if group.count > 1, let b = Int(String(group[group.index(group.startIndex, offsetBy: 0)...group.index(group.startIndex, offsetBy: 1)])) {
return -b
} else if self.checkStringForArray(s: a, checking: juniors) == true {
} else if self.checkStringForArray(s: a, checking: juniors, lowercase: false) == true {
return -101
} else {
return -100
@@ -154,6 +154,8 @@ class DataFetcher {
if isPSA {
return -1
} else if d.isEmpty {
return 13
}
let periodIndex = d.firstIndex(of: ".")
@@ -244,9 +246,9 @@ class DataFetcher {
let foodItems = try foodDocument.select("th")
var indices = [Int]()
let daysAndVon = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "von"]
let daysAndVon = ["montag", "dienstag", "mittwoch", "donnerstag", "freitag", "von", "wünschen"]
for i in 0..<foodItems.size() {
if checkStringForArray(s: try foodItems.get(i).text(), checking: daysAndVon) {
if checkStringForArray(s: try foodItems.get(i).text(), checking: daysAndVon, lowercase: true) {
indices.append(i)
}
}
@@ -279,9 +281,10 @@ class DataFetcher {
}
}
private func checkStringForArray(s: String, checking: [String]) -> Bool {
private func checkStringForArray(s: String, checking: [String], lowercase: Bool) -> Bool {
let str = lowercase ? s.lowercased() : s
for i in checking.indices {
if s.contains(checking[i]) {
if str.contains(checking[i]) {
return true
}
}