diff options
| -rw-r--r-- | flake.nix | 14 | ||||
| -rw-r--r-- | pyproject.toml | 4 | ||||
| -rw-r--r-- | src/program.py (renamed from src/get_program_for_pixel_flut.py) | 3 | ||||
| -rwxr-xr-x | src/program_parser.py | 4 | ||||
| -rw-r--r-- | src/text_tv.py (renamed from src/text_tv_bornhack.py) | 0 |
5 files changed, 15 insertions, 10 deletions
@@ -31,7 +31,7 @@ description = "Bornhack schedule web displayer with a teletext theme"; homepage = "https://text-tv.bornhack.node5.net/"; changelog = "https://git.node5.net/misc/text-tv.bornhack.node5.net/log/"; - mainProgram = "node5_text-tv_bornhack"; + mainProgram = "node5-text-tv"; }; propagatedBuildInputs = (attrs.propagatedBuildInputs or []) ++ [ pkgs.git ]; # Make git binary available postInstall = '' @@ -39,22 +39,22 @@ echo $out cp -r $src/src/static/ $out/${python.sitePackages} cp -r $src/src/templates/ $out/${python.sitePackages} - cp $src/fetch_program.sh $out/bin/ + cp $src/fetch_program.sh $out/bin/node5-text-tv-fetch ''; }); in { packages.x86_64-linux.default = pkg; apps.x86_64-linux = { - node5_text-tv_bornhack = { + node5-text-tv = { type = "app"; - program = "${pkg}/bin/node5_text-tv_bornhack"; + program = "${pkg}/bin/node5-text-tv"; }; - node5_text-tv_bornhack_pixel-flut-program = { + node5-text-tv-program = { type = "app"; - program = "${pkg}/bin/node5_text-tv_bornhack_pixel-flut-program"; + program = "${pkg}/bin/node5-text-tv-program"; }; - node5_text-tv_bornhack_fetch_program = { + node5-text-tv-fetch = { type = "app"; program = "${pkg}/bin/fetch_program.sh"; }; diff --git a/pyproject.toml b/pyproject.toml index 1d3b0cb..d11abf4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,5 +14,5 @@ dependencies = [ # define the CLI executable # Here, we define the entry point to be the 'main()' function in the module 'app/main.py' [project.scripts] -node5_text-tv_bornhack = "text_tv_bornhack:main" -node5_text-tv_bornhack_pixel-flut-program = "get_program_for_pixel_flut:main" +node5-text-tv = "text_tv:main" +node5-text-tv-program = "program:main" diff --git a/src/get_program_for_pixel_flut.py b/src/program.py index e86489c..b70e501 100644 --- a/src/get_program_for_pixel_flut.py +++ b/src/program.py @@ -3,6 +3,9 @@ import os from program_parser import program_parser_factory, Event def main(): + ''' + Get program in text for, for pixel flut client + ''' program_parser = program_parser_factory() lines: int = int(os.environ["LINES"]) if "LINES" in os.environ else 100 diff --git a/src/program_parser.py b/src/program_parser.py index f47a0f8..7233c49 100755 --- a/src/program_parser.py +++ b/src/program_parser.py @@ -3,7 +3,6 @@ import json import datetime import dataclasses import logging -import pathlib logger = logging.getLogger(__name__) # Set the logger name, to the name of the module @@ -23,6 +22,9 @@ class Event: class ProgramParser: + ''' + Parse the JSON program into dataformat for easy processing + ''' def __init__(self, program_path:os.PathLike=None, title_max_length:int=34, override_date:datetime.datetime|None=None): self.program_path = program_path self.title_max_length = title_max_length diff --git a/src/text_tv_bornhack.py b/src/text_tv.py index 1a5a290..1a5a290 100644 --- a/src/text_tv_bornhack.py +++ b/src/text_tv.py |