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-03-24 10:43:18 +01:00
parent 6c67bd601a
commit 3f4c1bdc7b
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/HowBadIsMyBatch.ipynb
View File

@@ -28,26 +28,32 @@
"\n", "\n",
"class DateProvider:\n", "class DateProvider:\n",
" \n", " \n",
" def __init__(self):\n",
" self.lastUpdated = None\n",
" self.lastUpdatedDataSource = None\n",
"\n",
" def needsUpdate(self):\n", " def needsUpdate(self):\n",
" lastUpdated = self._getLastUpdated()\n", " return self.getLastUpdated() < self.getLastUpdatedDataSource()\n",
" print(' lastUpdated:', lastUpdated)\n",
"\n",
" lastUpdatedDataSource = self._getLastUpdatedDataSource()\n",
" print('lastUpdatedDataSource:', lastUpdatedDataSource)\n",
"\n",
" return lastUpdated < lastUpdatedDataSource\n",
" \n", " \n",
" def _getLastUpdated(self):\n", " def getLastUpdated(self):\n",
" return self.__getLastUpdated(\n", " if self.lastUpdated is None:\n",
" self.lastUpdated = self.__getLastUpdated(\n",
" url = \"https://knollfrank.github.io/HowBadIsMyBatch/batchCodeTable.html\",\n", " url = \"https://knollfrank.github.io/HowBadIsMyBatch/batchCodeTable.html\",\n",
" getDateStr = lambda soup: soup.find(id = \"last_updated\").text)\n", " getDateStr = lambda soup: soup.find(id = \"last_updated\").text)\n",
" \n",
" return self.lastUpdated\n",
"\n", "\n",
" def _getLastUpdatedDataSource(self):\n", " def getLastUpdatedDataSource(self):\n",
" if self.lastUpdatedDataSource is None:\n",
" def getDateStr(soup):\n", " def getDateStr(soup):\n",
" lastUpdated = soup.find(string = re.compile(\"Last updated\"))\n", " lastUpdated = soup.find(string = re.compile(\"Last updated\"))\n",
" return re.search('Last updated: (.+).', lastUpdated).group(1)\n", " return re.search('Last updated: (.+).', lastUpdated).group(1)\n",
"\n", "\n",
" return self.__getLastUpdated(url = \"https://vaers.hhs.gov/data/datasets.html\", getDateStr = getDateStr)\n", " self.lastUpdatedDataSource = self.__getLastUpdated(\n",
" url = \"https://vaers.hhs.gov/data/datasets.html\",\n",
" getDateStr = getDateStr)\n",
"\n",
" return self.lastUpdatedDataSource\n",
"\n", "\n",
" def __getLastUpdated(self, url, getDateStr):\n", " def __getLastUpdated(self, url, getDateStr):\n",
" htmlContent = requests.get(url).text\n", " htmlContent = requests.get(url).text\n",
@@ -64,7 +70,10 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"dateProvider = DateProvider()\n", "dateProvider = DateProvider()\n",
"print('needsUpdate:', dateProvider.needsUpdate())" "print(' lastUpdated:', dateProvider.getLastUpdated())\n",
"print('lastUpdatedDataSource:', dateProvider.getLastUpdatedDataSource()) \n",
"needsUpdate = dateProvider.needsUpdate()\n",
"print('needsUpdate:', needsUpdate)"
] ]
}, },
{ {

2
src/intensivstationen/Intensivstationen.ipynb
View File

@@ -118,7 +118,7 @@
"print(' lastUpdated:', dateProvider.getLastUpdated())\n", "print(' lastUpdated:', dateProvider.getLastUpdated())\n",
"print('lastUpdatedDataSource:', dateProvider.getLastUpdatedDataSource()) \n", "print('lastUpdatedDataSource:', dateProvider.getLastUpdatedDataSource()) \n",
"needsUpdate = dateProvider.needsUpdate()\n", "needsUpdate = dateProvider.needsUpdate()\n",
"print('needsUpdate: ', needsUpdate)" "print('needsUpdate:', needsUpdate)"
] ]
}, },
{ {