francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

27
src/BatchCodeTableHtmlUpdater.py
View File

@@ -4,32 +4,33 @@ from CountryOptionsSetter import CountryOptionsSetter
from DateProvider import DateProvider from DateProvider import DateProvider
from HtmlUtils import getCountryOptions, getCountries from HtmlUtils import getCountryOptions, getCountries
from DateProvider import DateProvider from DateProvider import DateProvider
from BatchCodeTablePersister import createAndSaveBatchCodeTables
def updateBatchCodeTableHtmlFile(internationalVaersCovid19, batchCodeTableHtmlFile): def updateBatchCodeTableHtmlFile(internationalVaersCovid19, batchCodeTableHtmlFile):
countryOptions = getCountryOptions(getCountries(internationalVaersCovid19)) countryOptions = getCountryOptions(getCountries(internationalVaersCovid19))
_saveCountryOptions(countryOptions, batchCodeTableHtmlFile) _saveCountryOptions(countryOptions, batchCodeTableHtmlFile)
_saveLastUpdatedBatchCodeTable(DateProvider().getLastUpdatedDataSource(), batchCodeTableHtmlFile) _saveLastUpdatedBatchCodeTable(
createAndSaveBatchCodeTables(internationalVaersCovid19, minADRsForLethality=100) DateProvider().getLastUpdatedDataSource(),
batchCodeTableHtmlFile)
def _saveCountryOptions(countryOptions, batchCodeTableHtmlFile): def _saveCountryOptions(countryOptions, batchCodeTableHtmlFile):
HtmlTransformerUtil().applySoupTransformerToFile( HtmlTransformerUtil().applySoupTransformerToFile(
file = batchCodeTableHtmlFile, file=batchCodeTableHtmlFile,
soupTransformer = soupTransformer=lambda soup:
lambda soup: BeautifulSoup(
BeautifulSoup( CountryOptionsSetter().setCountryOptions(
CountryOptionsSetter().setCountryOptions(html = str(soup), options = countryOptions), html=str(soup),
'lxml')) options=countryOptions),
'lxml'))
def _saveLastUpdatedBatchCodeTable(lastUpdated, batchCodeTableHtmlFile): def _saveLastUpdatedBatchCodeTable(lastUpdated, batchCodeTableHtmlFile):
def setLastUpdated(soup): 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 return soup
HtmlTransformerUtil().applySoupTransformerToFile( HtmlTransformerUtil().applySoupTransformerToFile(
file = batchCodeTableHtmlFile, file=batchCodeTableHtmlFile,
soupTransformer = setLastUpdated) soupTransformer=setLastUpdated)

3
src/BatchCodeTablePersister.py
View File

@@ -7,8 +7,7 @@ from HtmlUtils import getCountries
def createAndSaveBatchCodeTables(internationalVaersCovid19, minADRsForLethality): def createAndSaveBatchCodeTables(internationalVaersCovid19, minADRsForLethality):
batchCodeTableFactory = BatchCodeTableFactory(internationalVaersCovid19) batchCodeTableFactory = BatchCodeTableFactory(internationalVaersCovid19)
_createAndSaveBatchCodeTablesForCountries( _createAndSaveBatchCodeTablesForCountries(
createBatchCodeTableForCountry=lambda country: batchCodeTableFactory.createBatchCodeTableByCountry( createBatchCodeTableForCountry=lambda country: batchCodeTableFactory.createBatchCodeTableByCountry(country),
country),
countries=getCountries(internationalVaersCovid19), countries=getCountries(internationalVaersCovid19),
minADRsForLethality=minADRsForLethality) minADRsForLethality=minADRsForLethality)
_createAndSaveBatchCodeTableForCountry( _createAndSaveBatchCodeTableForCountry(

13
src/HowBadIsMyBatch.ipynb
View File

@@ -17,7 +17,8 @@
"from datetime import datetime\n", "from datetime import datetime\n",
"from DateProvider import DateProvider\n", "from DateProvider import DateProvider\n",
"from InternationalVaersCovid19Provider import getInternationalVaersCovid19\n", "from InternationalVaersCovid19Provider import getInternationalVaersCovid19\n",
"from BatchCodeTableHtmlUpdater import updateBatchCodeTableHtmlFile" "from BatchCodeTableHtmlUpdater import updateBatchCodeTableHtmlFile\n",
"from BatchCodeTablePersister import createAndSaveBatchCodeTables"
] ]
}, },
{ {
@@ -78,6 +79,16 @@
"updateBatchCodeTableHtmlFile(internationalVaersCovid19, batchCodeTableHtmlFile=\"../docs/batchCodeTable.html\")" "updateBatchCodeTableHtmlFile(internationalVaersCovid19, batchCodeTableHtmlFile=\"../docs/batchCodeTable.html\")"
] ]
}, },
{
"cell_type": "code",
"execution_count": null,
"id": "0915aa5a",
"metadata": {},
"outputs": [],
"source": [
"createAndSaveBatchCodeTables(internationalVaersCovid19, minADRsForLethality=100)"
]
},
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,