From e0ec6e81c232c782220934c12719ecdfe49f236f Mon Sep 17 00:00:00 2001 From: "user@node5.net" Date: Wed, 16 Jul 2025 20:35:49 +0200 Subject: Spacing, show days as line, 2025 theming --- src/app.py | 2 +- src/program_parser.py | 10 +++++----- src/static/main.css | 9 ++++++--- src/static/title_headline.png | Bin 2255 -> 12481 bytes src/templates/base.html | 2 +- src/templates/index.html | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/app.py b/src/app.py index c5c1e76..977288b 100644 --- a/src/app.py +++ b/src/app.py @@ -49,7 +49,7 @@ def top(): @app.route('/program.json') def program(): - events_to_show: list[Event] = program_parser.get_events_to_show(program_parser.program, programs_to_show_count = 1000) + events_to_show: list[Event] = program_parser.get_events_to_show(program_parser.get_program(), programs_to_show_count = 1000) #{event.title} {day} {start_time}-{end_time} {icon} json = [{'title': a.title, 'day': a.day, 'time': a.time, 'progress': a.progress, 'icon': a.icon} for a in events_to_show] return json diff --git a/src/program_parser.py b/src/program_parser.py index 1735244..67103b1 100755 --- a/src/program_parser.py +++ b/src/program_parser.py @@ -7,8 +7,7 @@ import dataclasses input_file_path = './program.json' -title_max_length = 30 -#current_date = datetime.datetime(year=2024, month=7, day=18, hour=14, minute=59) # DEBUG +title_max_length = 34 @dataclasses.dataclass class Event: @@ -63,13 +62,14 @@ def get_program() -> list[Event]: return program def get_events_to_show(program: list[Event], programs_to_show_count=4) -> list[Event]: - current_date = datetime.datetime.now() + current_datetime = datetime.datetime.now() + #current_datetime = datetime.datetime(year=2025, month=7, day=18, hour=15, minute=30) # DEBUG # Get events to show events_to_show = [] for event in program: if len(events_to_show) >= programs_to_show_count: break - if event.end_date > current_date: + if event.end_date > current_datetime: events_to_show.append(event) def format_program(event: Event, cli=False) -> str: @@ -90,7 +90,7 @@ def get_events_to_show(program: list[Event], programs_to_show_count=4) -> list[E for event_to_show in events_to_show: event_to_show.pretty = format_program(event_to_show) duration_sec = (event_to_show.end_date - event_to_show.start_date).total_seconds() - progress_sec = (datetime.datetime.now() - event_to_show.end_date).total_seconds() + progress_sec = (current_datetime - event_to_show.end_date).total_seconds() event_to_show.progress = 100 + (progress_sec / duration_sec) * 100 return events_to_show diff --git a/src/static/main.css b/src/static/main.css index 5aa2f84..e821b65 100644 --- a/src/static/main.css +++ b/src/static/main.css @@ -20,11 +20,9 @@ body { } #program { - font-size: 0.82em; + font-size: 0.81em; } - - #news { font-size: 1.36em; text-align: left; @@ -52,3 +50,8 @@ input[type=submit] { width: fit-content; } +hr { + border: none; + height: 1px; + background-color: #333; +} diff --git a/src/static/title_headline.png b/src/static/title_headline.png index dec80be..e53e0cf 100644 Binary files a/src/static/title_headline.png and b/src/static/title_headline.png differ diff --git a/src/templates/base.html b/src/templates/base.html index ac28685..54c9c5e 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -3,7 +3,7 @@ {% block head %} - Text TV - Bornhack 24 + Text TV - Bornhack 25 diff --git a/src/templates/index.html b/src/templates/index.html index e4b0aff..8d39bba 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -6,7 +6,7 @@ - 
{% for event in parts.program %}{% if loop.previtem and loop.previtem.day != event.day %}
{% endif %}
{{event.title}}  {{event.day}} {{ event.time}}  {{ event.icon }}

{% endfor %}
+ 
{% for event in parts.program %}{% if loop.previtem and loop.previtem.day != event.day %}
{{ event.day }}
{% endif %}
{{event.title}}  {{ event.time}}  {{ event.icon }}

{% endfor %}
{# -- cgit v1.2.3