diff --git a/.gitignore b/.gitignore index 4ab1305..2d6a4d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ data/ -generator.conf presentation.pdf diff --git a/generator.conf.example b/generator.conf similarity index 82% rename from generator.conf.example rename to generator.conf index 5ee6d63..33c32ab 100644 --- a/generator.conf.example +++ b/generator.conf @@ -1,9 +1,18 @@ redeleitung: - name: ./data/redeleitung - email: rede.leitung@fsmi.uni-karlsruhe.de + name: "@file(data/redeleitung)" + email: "@import(personal.conf:email_redeleitung)" protokoll: - name: ./data/protokoll + name: "@file(data/protokoll)" + +default_weekday: 2 #Mittwoch +default_time: "18:00" +meeting_link: https://meet.vs.kit.edu/b/len-prm-rv4 +place: "@file(data/ort)" +mm_url: "@import(personal.conf:mattermost_url)" + +invite_mail: fsr-einladung@fsmi.uni-karlsruhe.de +invite_subject: 'Einladung zum Fachschaftsrat am {{date|weekday}}, dem {{date|date}}' pre_tops: - title: Begrüßung @@ -62,6 +71,12 @@ presentation_template_file: templates/fsr_presentation.tex.j2 protocol_template_file: templates/fsr_protokoll.j2 top_mbox_file: data/fsr_tops.mbox +mbox_out: data/invitemail.mbox +top_inbox_maildir: "@import(personal.conf:top_inbox_maildir)" +ubmails_inbox_maildir: "@import(personal.conf:ubmails_inbox_maildir)" + +last_date_file: data/last_date + protoreplace: Beschlussvorlage: "{{Beschluss |text= @@ -69,18 +84,7 @@ protoreplace: Beschlussvorlage" - -mbox_out: data/invitemail.mbox - -default_weekday: 2 #Mittwoch -default_time: "17:30" -meeting_link: https://meet.vs.kit.edu/b/abc-def-ghi -place: ./data/ort - -invite_mail: fsr-einladung@fsmi.uni-karlsruhe.de -invite_subject: 'Einladung zum Fachschaftsrat am {{date|weekday}}, dem {{date|date}}' sendmail: ["/usr/sbin/sendmail"] -mm_url: https://mattermost.fsmi.uni-karlsruhe.de/hooks/whatever # vim: filetype=yaml diff --git a/read_topmails.py b/read_topmails.py index 1476304..b97337b 100755 --- a/read_topmails.py +++ b/read_topmails.py @@ -25,9 +25,9 @@ def decode_header(header): return decoded_header[0].decode(encoding, errors="replace") if isinstance(decoded_header[0], bytes) else decoded_header[0] if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument("--config", "-c", default=CONFIG_FILE) - args = parser.parse_args() + aparser = argparse.ArgumentParser() + aparser.add_argument("--config", "-c", default=CONFIG_FILE) + args = aparser.parse_args() config = generate.get_config(args.config) in_mbox = mailbox.Maildir(config["top_inbox_maildir"]) diff --git a/read_ubmails.py b/read_ubmails.py index 84570ba..86d794e 100755 --- a/read_ubmails.py +++ b/read_ubmails.py @@ -24,9 +24,9 @@ def decode_header(header): return decoded_header[0].decode(encoding, errors="replace") if isinstance(decoded_header[0], bytes) else decoded_header[0] if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument("--config", "-c", default=CONFIG_FILE) - args = parser.parse_args() + aparser = argparse.ArgumentParser() + aparser.add_argument("--config", "-c", default=CONFIG_FILE) + args = aparser.parse_args() config = generate.get_config(args.config) mbox = mailbox.Maildir(config["ubmails_inbox_maildir"])