From 644156e1d8946aa8f587e29dcea79902098ee6fc Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sat, 13 Jan 2024 22:51:08 +0100 Subject: [PATCH 1/9] Create basic structure for list of Turniermeldungen --- .../page/aktuell/turniermeldungen/_index.md | 17 ++++++++++++++++- themes/tsc_vfl/archetypes/turniermeldung.md | 12 ++++++++++++ themes/tsc_vfl/assets/css/main.scss | 19 +++++++++++++++++++ .../layouts/_default/turniermeldungen.html | 19 +++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 themes/tsc_vfl/archetypes/turniermeldung.md create mode 100644 themes/tsc_vfl/layouts/_default/turniermeldungen.html diff --git a/content/page/aktuell/turniermeldungen/_index.md b/content/page/aktuell/turniermeldungen/_index.md index 2b62f1ed..6dca76e6 100644 --- a/content/page/aktuell/turniermeldungen/_index.md +++ b/content/page/aktuell/turniermeldungen/_index.md @@ -1,7 +1,8 @@ --- title: "Turniermeldungen" date: 2023-01-20T16:27:40+01:00 -draft: true +layout: turniermeldungen +draft: false # type: home menu: main: @@ -9,3 +10,17 @@ menu: parent: aktuell --- +## Linkliste + +- {{< tsc/link-external url="https://www.tbw.de/" >}}TBW{{< /tsc/link-external >}} +- {{< tsc/link-external url="http://www.tanzsport.de/" >}}Deutscher Tanzsportverband e.V. (DTV){{< /tsc/link-external >}} +- {{< tsc/link-external url="http://appsrv.tanzsport.de/dtv-webdbs/turnier/suche.spf" >}}Turnierdatenbank des DTV{{< /tsc/link-external >}} +- {{< tsc/link-external url="https://ev.tanzsport-portal.de/" >}}für Aktive: ESV-Anmeldung{{< /tsc/link-external >}} +- {{< tsc/link-external url="http://de.dancesportinfo.net/SearchCouples.aspx" >}}de.dancesportinfo.net{{< /tsc/link-external >}} + + + + + + + diff --git a/themes/tsc_vfl/archetypes/turniermeldung.md b/themes/tsc_vfl/archetypes/turniermeldung.md new file mode 100644 index 00000000..016db399 --- /dev/null +++ b/themes/tsc_vfl/archetypes/turniermeldung.md @@ -0,0 +1,12 @@ +--- +dateCompetition: 2024-01-13 +partner: Westerhoff, Frank +partnerin: Westerhff, Anja Dr. +ort: GGC Clubheim, Wuppertal +telefon: 0202 712476 +gruppe: Mas III +klasse: S +sektion: Std +titel: GGC Seniorentag Standard +nummer: 113904 +--- diff --git a/themes/tsc_vfl/assets/css/main.scss b/themes/tsc_vfl/assets/css/main.scss index 7290cae6..192ded63 100644 --- a/themes/tsc_vfl/assets/css/main.scss +++ b/themes/tsc_vfl/assets/css/main.scss @@ -905,6 +905,25 @@ table.time { } } +.turniermeldung-list { + .turniermeldung { + display: flex; + .date { + font-weight: bold; + flex: auto 0 0; + } + .ort { + margin: 0 0 0 10px; + flex: auto 1 0; + + a { + width: 100%; + height: 100%; + } + } + } +} + .iframe-generic { display: block; width: 100%; diff --git a/themes/tsc_vfl/layouts/_default/turniermeldungen.html b/themes/tsc_vfl/layouts/_default/turniermeldungen.html new file mode 100644 index 00000000..7543c0ce --- /dev/null +++ b/themes/tsc_vfl/layouts/_default/turniermeldungen.html @@ -0,0 +1,19 @@ +{{ define "main" }} + +

{{ .Title }}

+ + {{ $meldungen := where .Site.RegularPages "Section" "==" "turniermeldung" }} +
+ {{ range (sort $meldungen ".Params.dateCompetition" "asc") }} + {{ $date := time.AsTime .Params.dateCompetition }} + {{ if ge $date (now.AddDate 0 0 -1) }} +
+
{{ $date.Format "02.01.2006" }}
+
{{ .Params.ort }}
+
+ {{ end }} + {{ end }} +
+ {{ .Content }} + {{ partial "totop" }} +{{ end }} From ffb4353273cdc12dc22398c91221971acd91244a Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sat, 13 Jan 2024 22:51:18 +0100 Subject: [PATCH 2/9] Create some dumy data --- ...-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md | 12 ++++++++++++ ...t-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md create mode 100644 content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md diff --git a/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md b/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md new file mode 100644 index 00000000..016db399 --- /dev/null +++ b/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md @@ -0,0 +1,12 @@ +--- +dateCompetition: 2024-01-13 +partner: Westerhoff, Frank +partnerin: Westerhff, Anja Dr. +ort: GGC Clubheim, Wuppertal +telefon: 0202 712476 +gruppe: Mas III +klasse: S +sektion: Std +titel: GGC Seniorentag Standard +nummer: 113904 +--- diff --git a/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md b/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md new file mode 100644 index 00000000..be471892 --- /dev/null +++ b/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md @@ -0,0 +1,12 @@ +--- +dateCompetition: 2024-01-24 +partner: Kohler, Jürgen +partnerin: Kohler, Petra +ort: Saalbau Haus Nidda, Frankfurt a.M. +telefon: 0176 61745268 +gruppe: Mas III +klasse: B +sektion: Std +titel: Die Goldene Schuhbürste 2024 +nummer: 115126 +--- From c63dac6e7f8ad3b02fa375ad17c63f57f29510a5 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 14 Jan 2024 09:47:56 +0100 Subject: [PATCH 3/9] Enable menus in new taxonomy pages --- themes/tsc_vfl/layouts/partials/page/header.html | 3 ++- themes/tsc_vfl/layouts/partials/page/left_menu.html | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/themes/tsc_vfl/layouts/partials/page/header.html b/themes/tsc_vfl/layouts/partials/page/header.html index bdb3d2e6..7958084b 100644 --- a/themes/tsc_vfl/layouts/partials/page/header.html +++ b/themes/tsc_vfl/layouts/partials/page/header.html @@ -30,7 +30,8 @@ {{/*{{ if .Pre }} {{ $icon := printf " " .Pre | safeHTML }} diff --git a/themes/tsc_vfl/layouts/partials/page/left_menu.html b/themes/tsc_vfl/layouts/partials/page/left_menu.html index 83e8c99f..10a0b575 100644 --- a/themes/tsc_vfl/layouts/partials/page/left_menu.html +++ b/themes/tsc_vfl/layouts/partials/page/left_menu.html @@ -4,6 +4,7 @@ ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) (and (eq $currentPage.Type "news") (eq .Identifier "aktuell") ) + (and (eq $currentPage.Type "turniermeldung") (eq .Identifier "aktuell") ) }} {{ if .HasChildren }} {{ range .Children }} From a793d2da8785eef470cc0c935f9670fa2d61a1c7 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 14 Jan 2024 11:54:58 +0100 Subject: [PATCH 4/9] Create basic structure to show turniermeldungen --- themes/tsc_vfl/assets/css/main.scss | 19 +++++++++++++++ .../layouts/turniermeldung/single.html | 23 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 themes/tsc_vfl/layouts/turniermeldung/single.html diff --git a/themes/tsc_vfl/assets/css/main.scss b/themes/tsc_vfl/assets/css/main.scss index 192ded63..2bb23bb6 100644 --- a/themes/tsc_vfl/assets/css/main.scss +++ b/themes/tsc_vfl/assets/css/main.scss @@ -924,6 +924,25 @@ table.time { } } +.turnier-details { + .title { + font-weight: 600; + } + .turnier { + font-weight: bold; + .nummer { + font-weight: normal; + font-style: italic; + } + } + .verein { + margin: 20px 0 0; + } + .contact { + font-style: italic; + } +} + .iframe-generic { display: block; width: 100%; diff --git a/themes/tsc_vfl/layouts/turniermeldung/single.html b/themes/tsc_vfl/layouts/turniermeldung/single.html new file mode 100644 index 00000000..7783d437 --- /dev/null +++ b/themes/tsc_vfl/layouts/turniermeldung/single.html @@ -0,0 +1,23 @@ +{{ define "main" }} + {{ $datum := time.AsTime .Params.dateCompetition }} + +

{{ .Params.ort }} am {{ $datum.Format "02.01.2006" }}

+ +

{{ .Params.partner }} / {{ .Params.partnerin }}

+
+ {{ with .Params.titel }} +
{{ . }}
+ {{ end }} +
+ {{ .Params.gruppe }} {{ .Params.klasse }} {{ .Params.sektion }} + {{ with .Params.nummer }} + ({{ . }}) + {{ end }} +
+
{{ .Params.verein }}
+
{{ .Params.ort }}
+
Telefon am Turniertag: {{ .Params.telefon }}
+
+ {{ .Content }} + {{ partial "totop" }} +{{ end }} From a33273d8ba72d5db71ccfcd8e74a7a19a22038c8 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 14 Jan 2024 11:55:07 +0100 Subject: [PATCH 5/9] Add some test data --- ...-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md | 3 ++- ...4-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md b/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md index 016db399..70276fac 100644 --- a/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md +++ b/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md @@ -2,7 +2,8 @@ dateCompetition: 2024-01-13 partner: Westerhoff, Frank partnerin: Westerhff, Anja Dr. -ort: GGC Clubheim, Wuppertal +ort: Wuppertal +verein: GGC Clubheim telefon: 0202 712476 gruppe: Mas III klasse: S diff --git a/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md b/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md index be471892..221d5a42 100644 --- a/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md +++ b/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md @@ -2,7 +2,8 @@ dateCompetition: 2024-01-24 partner: Kohler, Jürgen partnerin: Kohler, Petra -ort: Saalbau Haus Nidda, Frankfurt a.M. +verein: Saalbau Haus Nidda +ort: Frankfurt a.M. telefon: 0176 61745268 gruppe: Mas III klasse: B From e5b3a1babbc6b699748ecb79da11f535fb66b67e Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 14 Jan 2024 11:58:05 +0100 Subject: [PATCH 6/9] Fix archetype --- themes/tsc_vfl/archetypes/turniermeldung.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/themes/tsc_vfl/archetypes/turniermeldung.md b/themes/tsc_vfl/archetypes/turniermeldung.md index 016db399..221d5a42 100644 --- a/themes/tsc_vfl/archetypes/turniermeldung.md +++ b/themes/tsc_vfl/archetypes/turniermeldung.md @@ -1,12 +1,13 @@ --- -dateCompetition: 2024-01-13 -partner: Westerhoff, Frank -partnerin: Westerhff, Anja Dr. -ort: GGC Clubheim, Wuppertal -telefon: 0202 712476 +dateCompetition: 2024-01-24 +partner: Kohler, Jürgen +partnerin: Kohler, Petra +verein: Saalbau Haus Nidda +ort: Frankfurt a.M. +telefon: 0176 61745268 gruppe: Mas III -klasse: S +klasse: B sektion: Std -titel: GGC Seniorentag Standard -nummer: 113904 +titel: Die Goldene Schuhbürste 2024 +nummer: 115126 --- From 05285d29d49f571d211032c484bb2ab090665ce0 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 14 Jan 2024 12:00:14 +0100 Subject: [PATCH 7/9] Fix some arhetypes (side-effect) --- archetypes/default.md | 6 ------ themes/tsc_vfl/archetypes/news.md | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 archetypes/default.md diff --git a/archetypes/default.md b/archetypes/default.md deleted file mode 100644 index 00e77bd7..00000000 --- a/archetypes/default.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: "{{ replace .Name "-" " " | title }}" -date: {{ .Date }} -draft: true ---- - diff --git a/themes/tsc_vfl/archetypes/news.md b/themes/tsc_vfl/archetypes/news.md index cebfb020..1638fdba 100644 --- a/themes/tsc_vfl/archetypes/news.md +++ b/themes/tsc_vfl/archetypes/news.md @@ -1,6 +1,6 @@ --- -title: "" -date: 2023-11-11T00:00:00+01:00 +title: "{{ replace .Name "-" " " | title }}" +date: {{ .Date }} summary: |- Hier kommt die Zusammenfassung hin draft: false From 55e3efb3a8d4e8e2ca4cd07c03882c746d6a1f2c Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 14 Jan 2024 20:41:17 +0100 Subject: [PATCH 8/9] Create a basic code snippet to parse mails automatically Start of #27 --- .vscode/launch.json | 24 ++++ .../read-competition-notification/.gitignore | 1 + .../competitionNotificationReader/__init__.py | 50 +++++++ .../competitionNotificationReader/__main__.py | 3 + .../competitionNotificationReader/cli.py | 11 ++ .../competitionParser.py | 132 ++++++++++++++++++ .../contenttemplate.md.tmpl | 13 ++ .../headerExtractor.py | 30 ++++ .../competitionNotificationReader/mail.py | 11 ++ .../mailParser.py | 113 +++++++++++++++ .../mboxReader.py | 49 +++++++ .../requirements.txt | 5 + 12 files changed, 442 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 scripts/read-competition-notification/.gitignore create mode 100644 scripts/read-competition-notification/competitionNotificationReader/__init__.py create mode 100644 scripts/read-competition-notification/competitionNotificationReader/__main__.py create mode 100644 scripts/read-competition-notification/competitionNotificationReader/cli.py create mode 100644 scripts/read-competition-notification/competitionNotificationReader/competitionParser.py create mode 100644 scripts/read-competition-notification/competitionNotificationReader/contenttemplate.md.tmpl create mode 100644 scripts/read-competition-notification/competitionNotificationReader/headerExtractor.py create mode 100644 scripts/read-competition-notification/competitionNotificationReader/mail.py create mode 100644 scripts/read-competition-notification/competitionNotificationReader/mailParser.py create mode 100644 scripts/read-competition-notification/competitionNotificationReader/mboxReader.py create mode 100644 scripts/read-competition-notification/requirements.txt diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..50193e7e --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Python: Remote Attach", + "type": "python", + "request": "attach", + "connect": { + "host": "localhost", + "port": 5678 + }, + "pathMappings": [ + // { + // "localRoot": "${workspaceFolder}", + // "remoteRoot": "." + // } + ], + "justMyCode": true + } + ] +} diff --git a/scripts/read-competition-notification/.gitignore b/scripts/read-competition-notification/.gitignore new file mode 100644 index 00000000..c18dd8d8 --- /dev/null +++ b/scripts/read-competition-notification/.gitignore @@ -0,0 +1 @@ +__pycache__/ diff --git a/scripts/read-competition-notification/competitionNotificationReader/__init__.py b/scripts/read-competition-notification/competitionNotificationReader/__init__.py new file mode 100644 index 00000000..2fce7e53 --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/__init__.py @@ -0,0 +1,50 @@ +from . import cli +from . import mail +from . import headerExtractor +from . import mailParser +from . import competitionParser +from . import mboxReader + +import logging +import debugpy +import os + +def main(): + args = cli.getArgs() + + logging.basicConfig() + logger = logging.getLogger(__name__) + + verbosityMap = { + 0: logging.WARNING, + 1: logging.INFO, + } + rootLogger = logging.getLogger() + rootLogger.setLevel(verbosityMap.get(args.verbose, logging.DEBUG)) + + if args.debug: + debugpy.listen(5678) + debugpy.wait_for_client() + + mp = mailParser.MailParser() + cp = competitionParser.CompetitionParser() + + if args.read_mbox is not None: + if args.output_folder is None: + logger.error('Cannot use batch mode without explicit output folder.') + exit(1) + + reader = mboxReader.MBocReader() + mails = reader.parseMBoxFile(args.read_mbox[0]) + for mail in mails: + body = mp.parseMail(mail) + cp.parseMail(body) + filename = cp.getFilename(args.output_folder[0]) + logger.info('Using file %s to generate the output.', filename) + folder = os.path.dirname(filename) + os.makedirs(folder, exist_ok=True) + with open(filename, 'w') as fp: + fp.write(cp.getContent()) + else: + raise Exception('Not yet implemented') + diff --git a/scripts/read-competition-notification/competitionNotificationReader/__main__.py b/scripts/read-competition-notification/competitionNotificationReader/__main__.py new file mode 100644 index 00000000..de550854 --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/__main__.py @@ -0,0 +1,3 @@ +import competitionNotificationReader + +competitionNotificationReader.main() diff --git a/scripts/read-competition-notification/competitionNotificationReader/cli.py b/scripts/read-competition-notification/competitionNotificationReader/cli.py new file mode 100644 index 00000000..b27237e6 --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/cli.py @@ -0,0 +1,11 @@ +import argparse + +def getArgs(): + parser = argparse.ArgumentParser() + + parser.add_argument('--read-mbox', nargs=1, help='Read mails from mbox file instead of stdin') + parser.add_argument('-o', '--output-folder', nargs=1, help='Set the output folder of the generated files.') + parser.add_argument('-v', '--verbose', action='count', default=0, help='Increase the verbosity') + parser.add_argument('--debug', action='store_true', help='Enable python debugger') + + return parser.parse_args() diff --git a/scripts/read-competition-notification/competitionNotificationReader/competitionParser.py b/scripts/read-competition-notification/competitionNotificationReader/competitionParser.py new file mode 100644 index 00000000..17282a46 --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/competitionParser.py @@ -0,0 +1,132 @@ +import bs4 +import logging +import re +import os +import jinja2 + +class ParsingFailedEception(Exception): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + +class CompetitionParser: + + def __init__(self): + self._l = logging.getLogger(__name__) + + self._partner = '' + self._partnerin = '' + self._date = '' + self._title = '' + self._number = '' + self._group = '' + self._class = '' + self._section = '' + self._ort = '' + self._verein = '' + self._telefon = '' + + self._reName = re.compile('Neue Meldung für (.*) / (.*)!') + self._reDate = re.compile('([0-9]+)\.([0-9]+)\.([0-9]+)') + self._reNumber = re.compile('Turnier: ([0-9]+)') + self._rePhone = re.compile('Telefon: ([0-9 /]+)') + self._rePlace = re.compile('Ort: (.*), (.*)') + self._reCompetition = re.compile('(.*) ([A-ES]) ((?:Std)|(?:Lat)|(?:Kombi))') + + self._reCleaningString = re.compile('[^a-z0-9-]') + self._reDashes = re.compile('-+') + + def parseMail(self, body: str): + parser = bs4.BeautifulSoup(body, 'html.parser') + self._getNames(parser.h2) + self._parseTable(parser.table) + + def _getNames(self, h2): + matcher = self._reName.match(h2.string) + if matcher is None: + self._l.error('Parsing of header "%s" failed.', h2) + raise ParsingFailedEception('Header could not be successfully parsed') + self._partner = matcher.group(1) + self._partnerin = matcher.group(2) + + def _parseTable(self, table): + def parseDate(date): + match = self._reDate.fullmatch(date) + if match is None: + raise ParsingFailedEception('Cannot parse date %s in mail' % date) + self._date = f'{match.group(3)}-{match.group(2)}-{match.group(1)}' + + def parseNumber(content): + match = self._reNumber.fullmatch(content) + if match is None: + raise ParsingFailedEception(f'Cannot parse the turnier number in field {content}') + self._number = match.group(1) + + def parseCompetition(competition): + match = self._reCompetition.fullmatch(competition) + if match is None: + raise ParsingFailedEception(f'Cannot parse the competition line {competition}') + self._group = match.group(1) + self._class = match.group(2) + self._section = match.group(3) + + def parsePlace(place): + match = self._rePlace.fullmatch(place) + if match is None: + raise ParsingFailedEception(f'Cannot parse the place entry {place}') + self._verein = match.group(1) + self._ort = match.group(2) + + def parsePhone(phone): + match = self._rePhone.fullmatch(phone) + if match is None: + raise ParsingFailedEception(f'Cannot parse the phone line {phone}') + self._telefon = match.group(1) + + tds = table('td') + parseDate(tds[0].string.strip()) + self._title = tds[1].string.strip() + parseNumber(tds[2].string.strip()) + parseCompetition(tds[3].string.strip()) + parsePlace(tds[4].string.strip()) + parsePhone(tds[5].string.strip()) + + def _cleanName(self, name: str) -> str: + cleanedName = name.lower() + cleanedName = re.sub('ä', 'ae', cleanedName) + cleanedName = re.sub('ö', 'oe', cleanedName) + cleanedName = re.sub('ü', 'ue', cleanedName) + cleanedName = re.sub('ß', 'ss', cleanedName) + cleanedName = re.sub(self._reCleaningString, '-', cleanedName) + cleanedName = re.sub(self._reDashes, '-', cleanedName) + return cleanedName.lower() + + def getFilename(self, prefix: str) -> str: + namePartner = self._cleanName(self._partner) + namePartnerin = self._cleanName(self._partnerin) + competition = f'{self._group} {self._class} {self._section}' + competitionName = self._cleanName(competition) + + return os.path.join( + prefix, + self._date[0:4], + f'{self._date}-{self._ort.lower()}-{namePartner}-{namePartnerin}-{competitionName}.md' + ) + + def getContent(self) -> str: + with open(os.path.join(os.path.dirname(__file__), 'contenttemplate.md.tmpl')) as fp: + tpl = fp.read() + j2 = jinja2.Template(tpl) + vars = { + 'date': self._date, + 'partner': self._partner, + 'partnerin': self._partnerin, + 'verein': self._verein, + 'ort': self._ort, + 'telefon': self._telefon, + 'group': self._group, + 'class': self._class, + 'section': self._section, + 'title': self._title, + 'number': self._number, + } + return j2.render(**vars) diff --git a/scripts/read-competition-notification/competitionNotificationReader/contenttemplate.md.tmpl b/scripts/read-competition-notification/competitionNotificationReader/contenttemplate.md.tmpl new file mode 100644 index 00000000..66288716 --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/contenttemplate.md.tmpl @@ -0,0 +1,13 @@ +--- +dateCompetition: {{ date }} +partner: "{{ partner }}" +partnerin: "{{ partnerin }}" +verein: "{{ verein }}" +ort: "{{ ort }}" +telefon: "{{ telefon }}" +gruppe: "{{ group }}" +klasse: "{{ class }}" +sektion: "{{ section }}" +titel: "{{ title }}" +nummer: {{ number }} +--- diff --git a/scripts/read-competition-notification/competitionNotificationReader/headerExtractor.py b/scripts/read-competition-notification/competitionNotificationReader/headerExtractor.py new file mode 100644 index 00000000..d3d6adfc --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/headerExtractor.py @@ -0,0 +1,30 @@ +import competitionNotificationReader as cnr +import logging + +def splitHeaders(lines: list[str]) -> cnr.mail.Mail: + l = logging.getLogger(__name__) + + l.debug('Separating headers of an email') + + def _getHeaders(lines: list[str]): + headerLines = [] + for idx,l in enumerate(lines): + if l == '': + remainingLines = lines[idx+1:] + for j,rl in enumerate(remainingLines): + if rl.strip() != '': + return headerLines, remainingLines[j:] + return headerLines, [] + + if l.startswith('\t') or l.startswith(' '): + lastLine = headerLines.pop() + newLine = f'{lastLine[1]} {l.strip()}' + headerLines.append(tuple([lastLine[0], newLine])) + else: + parts = l.split(':', 1) + headerLines.append(tuple([parts[0].strip(), parts[1].strip()])) + + headerLines, bodyLines = _getHeaders(lines) + + mail = cnr.mail.Mail(headerLines, bodyLines) + return mail diff --git a/scripts/read-competition-notification/competitionNotificationReader/mail.py b/scripts/read-competition-notification/competitionNotificationReader/mail.py new file mode 100644 index 00000000..f60c5bfd --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/mail.py @@ -0,0 +1,11 @@ +import dataclasses + +HeaderName_t = str +HeaderValue_t = str +HeaderEntry_t = tuple[HeaderName_t, HeaderValue_t] + +@dataclasses.dataclass +class Mail: + headers: list[HeaderEntry_t] + body: list[str] + diff --git a/scripts/read-competition-notification/competitionNotificationReader/mailParser.py b/scripts/read-competition-notification/competitionNotificationReader/mailParser.py new file mode 100644 index 00000000..6052ea1a --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/mailParser.py @@ -0,0 +1,113 @@ +import competitionNotificationReader as cnr +import logging +import re + +class MailParser: + def __init__(self): + self._l = logging.getLogger(__name__) + + def parseMail(self, rawMail: cnr.mail.Mail): + # Look for the correct Mail encoding + contentType, boundary = self._getContentType(rawMail) + subMails = self._splitMultipartBody(rawMail.body, boundary) + + def isCorrectContentType(mail): + for header in mail.headers: + if header[0].lower() != 'content-type': + continue + return header[1].startswith('text/html') + return False + subMails = list(filter(isCorrectContentType, subMails)) + + def isCorrectContentEncoding(mail): + for header in mail.headers: + if header[0].lower() != 'content-transfer-encoding': + continue + return header[1] == 'quoted-printable' + return False + subMails = list(filter(isCorrectContentEncoding, subMails)) + + if len(subMails) != 1: + raise Exception('Not implemented') + + body = self._mapQuotedrintable(subMails[0].body) + return body + + + def _getContentType(self, rawMail: cnr.mail.Mail) -> str: + ctHeaders = list(filter(lambda x: x[0].lower() == 'content-type', rawMail.headers)) + if len(ctHeaders) != 1: + self._l.error('No unique content type of the mail was found.') + exit(1) + + ct = ctHeaders[0][1] + if not ct.startswith('multipart/alternative'): + raise Exception('Not yet implemented') + + parser = re.compile('.*boundary="([^"]+)"') + matcher = parser.match(ct) + if matcher is None: + self._l.error('Cannot extract boundary from mail header.') + exit(1) + + boundary = matcher.group(1) + + return 'multipart/alternative', boundary + + def _splitMultipartBody(self, bodyLines: list[str], boundary: str): + parts = [] + subBody = [] + for line in bodyLines: + if line.startswith(f'--{boundary}'): + if len(subBody) > 0: + parts.append(subBody) + subBody = [] + else: + subBody.append(line) + return list(map(lambda x: cnr.headerExtractor.splitHeaders(x), parts)) + + def _mapQuotedrintable(self, lines: list[str]): + def mergeLines(): + # Drop terminating newlines + ret = [l for l in lines] + r = list(range(len(ret))) + r.reverse() + for i in r: + currentLine = ret[i] + if currentLine.endswith('='): + currentLine = currentLine[:-1] + ret.pop(i+1) + ret[i] = currentLine + + return ret + + mergedLines = mergeLines() + + def mapUnicodeChars(): + ret = [] + for line in mergedLines: + i = 0 + chars = [] + while i < len(line): + if line[i] != '=': + chars.extend(list(line[i].encode())) + else: + hexChars = line[i+1:i+3] + value = int(hexChars, 16) + # print(f'{hexChars} -> {value}') + chars.append(value) + i += 2 + i += 1 + ret.append(chars) + + return ret + + mappedLines = mapUnicodeChars() + + def decodeLine(l): + bytes = [x.to_bytes(1, 'big') for x in l] + decodedLine = b''.join(bytes).decode() + return decodedLine + decodedLines = list(map(decodeLine, mappedLines)) + + return ''.join(decodedLines) + diff --git a/scripts/read-competition-notification/competitionNotificationReader/mboxReader.py b/scripts/read-competition-notification/competitionNotificationReader/mboxReader.py new file mode 100644 index 00000000..2ce0e1f6 --- /dev/null +++ b/scripts/read-competition-notification/competitionNotificationReader/mboxReader.py @@ -0,0 +1,49 @@ +import logging +import re +import io + +import competitionNotificationReader as cnr + +class MBocReader: + + def __init__(self): + self._l = logging.getLogger(__name__) + + def parseMBoxFile(self, filename: str) -> list[cnr.mail.Mail]: + self._l.debug('Reading MBox file "%s"', filename) + + mails = [] + with open(filename) as fp: + return self._parseMails(fp) + + def _isNewMailLine(self, line: str): + return line.startswith('From ') + + def _fixSingleLine(self, line: str) -> str: + regex = re.compile('^>+From ') + matcher = regex.match(line) + + if matcher is None: + return line + + return line[1:] + + def _parseMails(self, fp: io.FileIO) -> list[cnr.mail.Mail]: + lines = [] + mails = [] + while True: + line = fp.readline() + if line == '': + if len(lines) > 0: + mails.append(self._parseSingleMail(lines)) + return mails + + if self._isNewMailLine(line): + if len(lines) > 0: + mails.append(self._parseSingleMail(lines)) + lines = [] + else: + lines.append(self._fixSingleLine(line[0:-1])) + + def _parseSingleMail(self, lines: list[str]) -> cnr.mail.Mail: + return cnr.headerExtractor.splitHeaders(lines) diff --git a/scripts/read-competition-notification/requirements.txt b/scripts/read-competition-notification/requirements.txt new file mode 100644 index 00000000..8582984b --- /dev/null +++ b/scripts/read-competition-notification/requirements.txt @@ -0,0 +1,5 @@ +beautifulsoup4==4.12.2 +debugpy==1.8.0 +Jinja2==3.1.3 +MarkupSafe==2.1.3 +soupsieve==2.5 From 533caad2957c6b8b0ce6919fa1a04b609d8cd430 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sun, 14 Jan 2024 20:43:30 +0100 Subject: [PATCH 9/9] Create automatically generated data --- ...Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md | 13 ------------- ...rhoff-frank-westerhoff-anja-dr--mas-iii-s-std.md | 13 +++++++++++++ ....m.-kohler-juergen-kohler-petra-mas-iii-b-std.md | 13 +++++++++++++ ...-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md | 13 ------------- ...ng-kieper-alexander-hehl-carolin-mas-ii-a-std.md | 13 +++++++++++++ ...remseck-baal-philipp-lis-letizia-jun-ii-b-lat.md | 13 +++++++++++++ ...hein-alexander-muehlschein-maren-hgr-ii-a-lat.md | 13 +++++++++++++ ...chein-alexander-muehlschein-maren-mas-i-a-lat.md | 13 +++++++++++++ ...eier-kohler-juergen-kohler-petra-mas-iii-b-std.md | 13 +++++++++++++ ...eim-kohler-juergen-kohler-petra-mas-iii-b-std.md | 13 +++++++++++++ ...nn-christopher-broschell-silvia-mas-iii-b-std.md | 13 +++++++++++++ ...ten-kohler-juergen-kohler-petra-mas-iii-b-std.md | 13 +++++++++++++ 12 files changed, 130 insertions(+), 26 deletions(-) delete mode 100644 content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md create mode 100644 content/turniermeldung/2024/2024-01-13-wuppertal-westerhoff-frank-westerhoff-anja-dr--mas-iii-s-std.md create mode 100644 content/turniermeldung/2024/2024-01-21-frankfurt a.m.-kohler-juergen-kohler-petra-mas-iii-b-std.md delete mode 100644 content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md create mode 100644 content/turniermeldung/2024/2024-02-03-botnang-kieper-alexander-hehl-carolin-mas-ii-a-std.md create mode 100644 content/turniermeldung/2024/2024-02-03-remseck-baal-philipp-lis-letizia-jun-ii-b-lat.md create mode 100644 content/turniermeldung/2024/2024-02-04-remseck-muehlschein-alexander-muehlschein-maren-hgr-ii-a-lat.md create mode 100644 content/turniermeldung/2024/2024-02-17-holzgerlingen-muehlschein-alexander-muehlschein-maren-mas-i-a-lat.md create mode 100644 content/turniermeldung/2024/2024-02-24-achern-grooßweier-kohler-juergen-kohler-petra-mas-iii-b-std.md create mode 100644 content/turniermeldung/2024/2024-02-25-sinsheim-kohler-juergen-kohler-petra-mas-iii-b-std.md create mode 100644 content/turniermeldung/2024/2024-02-25-sinsheim-lehmann-christopher-broschell-silvia-mas-iii-b-std.md create mode 100644 content/turniermeldung/2024/2024-03-02-heidenheim-mergelstetten-kohler-juergen-kohler-petra-mas-iii-b-std.md diff --git a/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md b/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md deleted file mode 100644 index 70276fac..00000000 --- a/content/turniermeldung/2024/2024-01-13-Wuppertal-Frank-Westerhoff-Anja-Westerhoff_MASIII_S_Std.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -dateCompetition: 2024-01-13 -partner: Westerhoff, Frank -partnerin: Westerhff, Anja Dr. -ort: Wuppertal -verein: GGC Clubheim -telefon: 0202 712476 -gruppe: Mas III -klasse: S -sektion: Std -titel: GGC Seniorentag Standard -nummer: 113904 ---- diff --git a/content/turniermeldung/2024/2024-01-13-wuppertal-westerhoff-frank-westerhoff-anja-dr--mas-iii-s-std.md b/content/turniermeldung/2024/2024-01-13-wuppertal-westerhoff-frank-westerhoff-anja-dr--mas-iii-s-std.md new file mode 100644 index 00000000..c703577c --- /dev/null +++ b/content/turniermeldung/2024/2024-01-13-wuppertal-westerhoff-frank-westerhoff-anja-dr--mas-iii-s-std.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-01-13 +partner: "Westerhoff, Frank" +partnerin: "Westerhoff, Anja Dr." +verein: "GGC Clubheim" +ort: "Wuppertal" +telefon: "0202 712476" +gruppe: "Mas III" +klasse: "S" +sektion: "Std" +titel: "GGC Seniorentag Standard" +nummer: 113904 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-01-21-frankfurt a.m.-kohler-juergen-kohler-petra-mas-iii-b-std.md b/content/turniermeldung/2024/2024-01-21-frankfurt a.m.-kohler-juergen-kohler-petra-mas-iii-b-std.md new file mode 100644 index 00000000..4fe2a05e --- /dev/null +++ b/content/turniermeldung/2024/2024-01-21-frankfurt a.m.-kohler-juergen-kohler-petra-mas-iii-b-std.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-01-21 +partner: "Kohler, Jürgen" +partnerin: "Kohler, Petra" +verein: "Saalbau Haus Nidda" +ort: "Frankfurt a.M." +telefon: "0176 61745268" +gruppe: "Mas III" +klasse: "B" +sektion: "Std" +titel: "Die Goldene Schuhbürste 2024" +nummer: 115126 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md b/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md deleted file mode 100644 index 221d5a42..00000000 --- a/content/turniermeldung/2024/2024-01-24-frankfurt-a-m-kohler-juergen-kohler-petra-MASIII-B-Std.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -dateCompetition: 2024-01-24 -partner: Kohler, Jürgen -partnerin: Kohler, Petra -verein: Saalbau Haus Nidda -ort: Frankfurt a.M. -telefon: 0176 61745268 -gruppe: Mas III -klasse: B -sektion: Std -titel: Die Goldene Schuhbürste 2024 -nummer: 115126 ---- diff --git a/content/turniermeldung/2024/2024-02-03-botnang-kieper-alexander-hehl-carolin-mas-ii-a-std.md b/content/turniermeldung/2024/2024-02-03-botnang-kieper-alexander-hehl-carolin-mas-ii-a-std.md new file mode 100644 index 00000000..b461d2d4 --- /dev/null +++ b/content/turniermeldung/2024/2024-02-03-botnang-kieper-alexander-hehl-carolin-mas-ii-a-std.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-02-03 +partner: "Kieper, Alexander" +partnerin: "Hehl, Carolin" +verein: "Turnhalle Botnang" +ort: "Botnang" +telefon: "0170 8631320" +gruppe: "Mas II" +klasse: "A" +sektion: "Std" +titel: "Sportveranstaltung 2024" +nummer: 113800 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-02-03-remseck-baal-philipp-lis-letizia-jun-ii-b-lat.md b/content/turniermeldung/2024/2024-02-03-remseck-baal-philipp-lis-letizia-jun-ii-b-lat.md new file mode 100644 index 00000000..b4ca5e08 --- /dev/null +++ b/content/turniermeldung/2024/2024-02-03-remseck-baal-philipp-lis-letizia-jun-ii-b-lat.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-02-03 +partner: "Baal, Philipp" +partnerin: "Lis, Letizia" +verein: "Stadthalle" +ort: "Remseck" +telefon: "0173 3015671" +gruppe: "Jun II" +klasse: "B" +sektion: "Lat" +titel: "Landesmeisterschaft TBW Latein" +nummer: 115314 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-02-04-remseck-muehlschein-alexander-muehlschein-maren-hgr-ii-a-lat.md b/content/turniermeldung/2024/2024-02-04-remseck-muehlschein-alexander-muehlschein-maren-hgr-ii-a-lat.md new file mode 100644 index 00000000..f51513c8 --- /dev/null +++ b/content/turniermeldung/2024/2024-02-04-remseck-muehlschein-alexander-muehlschein-maren-hgr-ii-a-lat.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-02-04 +partner: "Mühlschein, Alexander" +partnerin: "Mühlschein, Maren" +verein: "Stadthalle" +ort: "Remseck" +telefon: "0173 3015671" +gruppe: "Hgr II" +klasse: "A" +sektion: "Lat" +titel: "Landesmeisterschaft TBW Latein" +nummer: 115316 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-02-17-holzgerlingen-muehlschein-alexander-muehlschein-maren-mas-i-a-lat.md b/content/turniermeldung/2024/2024-02-17-holzgerlingen-muehlschein-alexander-muehlschein-maren-mas-i-a-lat.md new file mode 100644 index 00000000..dbb52d6c --- /dev/null +++ b/content/turniermeldung/2024/2024-02-17-holzgerlingen-muehlschein-alexander-muehlschein-maren-mas-i-a-lat.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-02-17 +partner: "Mühlschein, Alexander" +partnerin: "Mühlschein, Maren" +verein: "Stadthalle Holzgerlingen" +ort: "Holzgerlingen" +telefon: "0162 8202156" +gruppe: "Mas I" +klasse: "A" +sektion: "Lat" +titel: "Landesmeisterschaft TBW Latein der Mas I-III D-S" +nummer: 114741 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-02-24-achern-grooßweier-kohler-juergen-kohler-petra-mas-iii-b-std.md b/content/turniermeldung/2024/2024-02-24-achern-grooßweier-kohler-juergen-kohler-petra-mas-iii-b-std.md new file mode 100644 index 00000000..f1e611b8 --- /dev/null +++ b/content/turniermeldung/2024/2024-02-24-achern-grooßweier-kohler-juergen-kohler-petra-mas-iii-b-std.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-02-24 +partner: "Kohler, Jürgen" +partnerin: "Kohler, Petra" +verein: "Schlossfeldhalle" +ort: "Achern-Grooßweier" +telefon: "0157 35720521" +gruppe: "Mas III" +klasse: "B" +sektion: "Std" +titel: "ATaTa 2024" +nummer: 114270 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-02-25-sinsheim-kohler-juergen-kohler-petra-mas-iii-b-std.md b/content/turniermeldung/2024/2024-02-25-sinsheim-kohler-juergen-kohler-petra-mas-iii-b-std.md new file mode 100644 index 00000000..9dd32e52 --- /dev/null +++ b/content/turniermeldung/2024/2024-02-25-sinsheim-kohler-juergen-kohler-petra-mas-iii-b-std.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-02-25 +partner: "Kohler, Jürgen" +partnerin: "Kohler, Petra" +verein: "Tanz Sport Zentrum Sinsheim" +ort: "Sinsheim" +telefon: "0160 97701166" +gruppe: "Mas III" +klasse: "B" +sektion: "Std" +titel: "Sinsheimer Tanzsporttage 2024" +nummer: 115291 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-02-25-sinsheim-lehmann-christopher-broschell-silvia-mas-iii-b-std.md b/content/turniermeldung/2024/2024-02-25-sinsheim-lehmann-christopher-broschell-silvia-mas-iii-b-std.md new file mode 100644 index 00000000..d323565a --- /dev/null +++ b/content/turniermeldung/2024/2024-02-25-sinsheim-lehmann-christopher-broschell-silvia-mas-iii-b-std.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-02-25 +partner: "Lehmann, Christopher" +partnerin: "Broschell, Silvia" +verein: "Tanz Sport Zentrum Sinsheim" +ort: "Sinsheim" +telefon: "0160 97701166" +gruppe: "Mas III" +klasse: "B" +sektion: "Std" +titel: "Sinsheimer Tanzsporttage 2024" +nummer: 115291 +--- \ No newline at end of file diff --git a/content/turniermeldung/2024/2024-03-02-heidenheim-mergelstetten-kohler-juergen-kohler-petra-mas-iii-b-std.md b/content/turniermeldung/2024/2024-03-02-heidenheim-mergelstetten-kohler-juergen-kohler-petra-mas-iii-b-std.md new file mode 100644 index 00000000..7b2bf0a0 --- /dev/null +++ b/content/turniermeldung/2024/2024-03-02-heidenheim-mergelstetten-kohler-juergen-kohler-petra-mas-iii-b-std.md @@ -0,0 +1,13 @@ +--- +dateCompetition: 2024-03-02 +partner: "Kohler, Jürgen" +partnerin: "Kohler, Petra" +verein: "Sport- und Festhalle Mergelstetten" +ort: "Heidenheim-Mergelstetten" +telefon: "0162 6845232" +gruppe: "Mas III" +klasse: "B" +sektion: "Std" +titel: "Mergelpokal 2024" +nummer: 115204 +--- \ No newline at end of file