use Config.ticker_separator value
This commit is contained in:
parent
ea462b7459
commit
972551d170
3 changed files with 6 additions and 4 deletions
|
@ -50,7 +50,6 @@ class ImageConfig(BaseModel):
|
||||||
|
|
||||||
class Config(BaseModel):
|
class Config(BaseModel):
|
||||||
ticker_separator: str = " +++ "
|
ticker_separator: str = " +++ "
|
||||||
cache_seconds: int = 30
|
|
||||||
|
|
||||||
image: ImageConfig = ImageConfig()
|
image: ImageConfig = ImageConfig()
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ from typing import Iterator
|
||||||
from fastapi import APIRouter, Depends
|
from fastapi import APIRouter, Depends
|
||||||
from markdown import markdown
|
from markdown import markdown
|
||||||
|
|
||||||
from ..settings import SETTINGS
|
from ..config import Config
|
||||||
from ..dav_file import DavFile
|
from ..dav_file import DavFile
|
||||||
from ._common import FileNameLister, PrefixFinder, PrefixUnique
|
from ._common import FileNameLister, PrefixFinder, PrefixUnique
|
||||||
|
|
||||||
|
@ -46,8 +46,12 @@ async def get_ticker_content_lines(
|
||||||
async def get_ticker_content(
|
async def get_ticker_content(
|
||||||
ticker_content_lines: Iterator[str] = Depends(get_ticker_content_lines),
|
ticker_content_lines: Iterator[str] = Depends(get_ticker_content_lines),
|
||||||
) -> str:
|
) -> str:
|
||||||
|
cfg = await Config.get()
|
||||||
|
ticker_content_lines = ["", *ticker_content_lines, ""]
|
||||||
|
ticker_content = cfg.ticker_separator.join(ticker_content_lines)
|
||||||
|
|
||||||
return markdown(
|
return markdown(
|
||||||
SETTINGS.ticker_separator.join(ticker_content_lines)
|
ticker_content.strip()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@ class Settings(BaseSettings):
|
||||||
dav_password: str = "changeme"
|
dav_password: str = "changeme"
|
||||||
dav_path: str = "ovdashboard"
|
dav_path: str = "ovdashboard"
|
||||||
|
|
||||||
ticker_separator: str = " +++ "
|
|
||||||
cache_seconds: int = 30
|
cache_seconds: int = 30
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|
Loading…
Reference in a new issue