From ee3789aab9026e01c87d5fd7184489bca987f402 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 19 Nov 2023 16:55:42 +0100 Subject: [PATCH] Increase consistency of chceks --- src/solo_turnier/worker.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/solo_turnier/worker.py b/src/solo_turnier/worker.py index c4527b0..e87d48d 100644 --- a/src/solo_turnier/worker.py +++ b/src/solo_turnier/worker.py @@ -535,13 +535,20 @@ class Worker: ret = [] - self.l.log(5, 'Table %s', pformat(importedData.htmlResults.tabges)) - self.l.log(5, 'Results %s', pformat(importedData.htmlResults.results)) + # self.l.log(5, 'Table %s', pformat(importedData.htmlResults.tabges)) + # self.l.log(5, 'Results %s', pformat(importedData.htmlResults.results)) for tup in importedData.htmlResults.results.keys(): - gr = groupParser.parseClass(tup[0]) - if not gr == group: + currentGroup = groupParser.parseClass(tup[0]) + activeGroups = currentGroup.getContainedGroups() + if group not in activeGroups: continue + + fixture = importedData.htmlResults.tabges[tup] + if fixture[2] is not None and fixture[2] != group: + self.l.log(5, 'Skipping id %s in group %s as not part', tup[3], group) + continue + part = importedData.htmlResults.results[tup][0] part.id = int(tup[3]) ret.append(part)