refactoring

This commit is contained in:
frankknoll
2022-11-22 21:11:17 +01:00
parent 22c41e64a7
commit 34c5bd8782
3 changed files with 27 additions and 16 deletions

View File

@@ -4,32 +4,33 @@ from CountryOptionsSetter import CountryOptionsSetter
from DateProvider import DateProvider
from HtmlUtils import getCountryOptions, getCountries
from DateProvider import DateProvider
from BatchCodeTablePersister import createAndSaveBatchCodeTables
def updateBatchCodeTableHtmlFile(internationalVaersCovid19, batchCodeTableHtmlFile):
countryOptions = getCountryOptions(getCountries(internationalVaersCovid19))
_saveCountryOptions(countryOptions, batchCodeTableHtmlFile)
_saveLastUpdatedBatchCodeTable(DateProvider().getLastUpdatedDataSource(), batchCodeTableHtmlFile)
createAndSaveBatchCodeTables(internationalVaersCovid19, minADRsForLethality=100)
_saveLastUpdatedBatchCodeTable(
DateProvider().getLastUpdatedDataSource(),
batchCodeTableHtmlFile)
def _saveCountryOptions(countryOptions, batchCodeTableHtmlFile):
HtmlTransformerUtil().applySoupTransformerToFile(
file = batchCodeTableHtmlFile,
soupTransformer =
lambda soup:
BeautifulSoup(
CountryOptionsSetter().setCountryOptions(html = str(soup), options = countryOptions),
'lxml'))
file=batchCodeTableHtmlFile,
soupTransformer=lambda soup:
BeautifulSoup(
CountryOptionsSetter().setCountryOptions(
html=str(soup),
options=countryOptions),
'lxml'))
def _saveLastUpdatedBatchCodeTable(lastUpdated, batchCodeTableHtmlFile):
def setLastUpdated(soup):
soup.find(id = "last_updated").string.replace_with(lastUpdated.strftime(DateProvider.DATE_FORMAT))
soup.find(id="last_updated").string.replace_with(
lastUpdated.strftime(DateProvider.DATE_FORMAT))
return soup
HtmlTransformerUtil().applySoupTransformerToFile(
file = batchCodeTableHtmlFile,
soupTransformer = setLastUpdated)
file=batchCodeTableHtmlFile,
soupTransformer=setLastUpdated)