techbloc/techrec
1
0
Fork 0
Code Issues 10 Pull requests Releases Activity

Plug http retriever in current logic

Browse source
This commit is contained in:
Blallo 2021-08-26 21:47:08 -03:00
parent 1718c4c331
commit 17e3539085
No known key found for this signature in database
GPG key ID: 0CBE577C9B72DC3F
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
techrec/forge.py
View file

@ -7,19 +7,25 @@ from time import sleep
from typing import Callable, Optional from typing import Callable, Optional
from .config_manager import get_config from .config_manager import get_config
from .http_retriever import RETRIEVER
logger = logging.getLogger("forge") logger = logging.getLogger("forge")
Validator = Callable[[datetime, datetime, str], bool] Validator = Callable[[datetime, datetime, str], bool]
def get_timefile_exact(time) -> str: async def get_timefile_exact(time) -> str:
""" """
time is of type `datetime`; it is not "rounded" to match the real file; time is of type `datetime`; it is not "rounded" to match the real file;
that work is done in get_timefile(time) that work is done in get_timefile(time)
""" """
return os.path.join( remote_repo = get_config()["AUDIO_INPUT"]
get_config()["AUDIO_INPUT"], time.strftime(get_config()["AUDIO_INPUT_FORMAT"]) remote_path = os.path.join(
remote_repo, time.strftime(get_config()["AUDIO_INPUT_FORMAT"])
) )
if remote.startswith("http"):
local = await RETRIEVER.get(remote_path)
return local
return local_path
def round_timefile(exact: datetime) -> datetime: def round_timefile(exact: datetime) -> datetime:
@ -29,8 +35,9 @@ def round_timefile(exact: datetime) -> datetime:
return datetime(exact.year, exact.month, exact.day, exact.hour) return datetime(exact.year, exact.month, exact.day, exact.hour)
def get_timefile(exact: datetime) -> str: async def get_timefile(exact: datetime) -> str:
return get_timefile_exact(round_timefile(exact)) file = await get_timefile_exact(round_timefile(exact))
return file
def get_files_and_intervals(start, end, rounder=round_timefile): def get_files_and_intervals(start, end, rounder=round_timefile):
@ -93,7 +100,7 @@ def mp3_join(named_intervals):
return cmdline return cmdline
def create_mp3( async def create_mp3(
start: datetime, start: datetime,
end: datetime, end: datetime,
outfile: str, outfile: str,
@ -106,10 +113,10 @@ def create_mp3(
def validator(s, e, f): def validator(s, e, f):
return True return True
intervals = [ intervals = []
(get_timefile(begin), start_cut, end_cut) for begin, start_cut, end_cut in get_files_and_intervals(start, end):
for begin, start_cut, end_cut in get_files_and_intervals(start, end) file = await get_timefile(begin)
] interval.append(file, start_cut, end_cut)
if os.path.exists(outfile): if os.path.exists(outfile):
raise OSError("file '%s' already exists" % outfile) raise OSError("file '%s' already exists" % outfile)
for path, _s, _e in intervals: for path, _s, _e in intervals:
@ -180,8 +187,8 @@ def create_mp3(
return True return True
def main_cmd(options): async def main_cmd(options):
log = logging.getLogger("forge_main") log = logging.getLogger("forge_main")
outfile = os.path.abspath(os.path.join(options.cwd, options.outfile)) outfile = os.path.abspath(os.path.join(options.cwd, options.outfile))
log.debug("will forge an mp3 into %s" % (outfile)) log.debug("will forge an mp3 into %s" % (outfile))
create_mp3(options.starttime, options.endtime, outfile) await create_mp3(options.starttime, options.endtime, outfile)

4
techrec/server.py
View file

@ -256,7 +256,7 @@ def get_validator(expected_duration_s: float, error_threshold_s: float) -> Valid
return validator return validator
def generate_mp3(db_id: int, **kwargs): async def generate_mp3(db_id: int, **kwargs):
"""creates and mark it as ready in the db""" """creates and mark it as ready in the db"""
if get_config()["FORGE_VERIFY"]: if get_config()["FORGE_VERIFY"]:
validator = get_validator( validator = get_validator(
@ -269,7 +269,7 @@ def generate_mp3(db_id: int, **kwargs):
retries = 1 retries = 1
for i in range(retries): for i in range(retries):
result = create_mp3(validator=validator, **kwargs) result = await create_mp3(validator=validator, **kwargs)
logger.debug("Create mp3 for %d -> %s", db_id, result) logger.debug("Create mp3 for %d -> %s", db_id, result)
if result: if result:
break break