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-18 16:09:08 +01:00
parent 1e8d97e6d3
commit 0e55829e8e
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/intensivstationen.html
View File

@@ -465,7 +465,7 @@
<dd><a href="https://www.intensivregister.de/#/aktuelle-lage/kartenansichten" target="_blank">Kartenansichten</a> <dd><a href="https://www.intensivregister.de/#/aktuelle-lage/kartenansichten" target="_blank">Kartenansichten</a>
</dd> </dd>
<dt>Datenstand:</dt> <dt>Datenstand:</dt>
<dd id="Datenstand">17.03.2022, 12:54 Uhr</dd> <dd id="Datenstand">18.03.2022, 12:57 Uhr</dd>
</dl> </dl>
</body> </body>

28
src/intensivstationen/Intensivstationen.ipynb
View File

@@ -44,29 +44,29 @@
" INTENSIVSTATIONEN_DATE_FORMAT = \"%d.%m.%Y, %H:%M Uhr\"\n", " INTENSIVSTATIONEN_DATE_FORMAT = \"%d.%m.%Y, %H:%M Uhr\"\n",
"\n", "\n",
" def __init__(self):\n", " def __init__(self):\n",
" self.lastUpdatedIntensivstationen = None\n", " self.lastUpdated = None\n",
" self.lastUpdatedOriginal = None\n", " self.lastUpdatedDataSource = None\n",
"\n", "\n",
" def needsUpdate(self):\n", " def needsUpdate(self):\n",
" return self.getLastUpdatedIntensivstationen() < self.getLastUpdatedOriginal()\n", " return self.getLastUpdated() < self.getLastUpdatedDataSource()\n",
" \n", " \n",
" def getLastUpdatedIntensivstationen(self):\n", " def getLastUpdated(self):\n",
" if self.lastUpdatedIntensivstationen is None:\n", " if self.lastUpdated is None:\n",
" htmlContent = requests.get(\"https://knollfrank.github.io/HowBadIsMyBatch/intensivstationen.html\").text\n", " htmlContent = requests.get(\"https://knollfrank.github.io/HowBadIsMyBatch/intensivstationen.html\").text\n",
" soup = BeautifulSoup(htmlContent, \"lxml\")\n", " soup = BeautifulSoup(htmlContent, \"lxml\")\n",
" dateStr = soup.find(id = \"Datenstand\").text\n", " dateStr = soup.find(id = \"Datenstand\").text\n",
" self.lastUpdatedIntensivstationen = datetime.strptime(dateStr, DateProvider.INTENSIVSTATIONEN_DATE_FORMAT)\n", " self.lastUpdated = datetime.strptime(dateStr, DateProvider.INTENSIVSTATIONEN_DATE_FORMAT)\n",
" \n", " \n",
" return self.lastUpdatedIntensivstationen\n", " return self.lastUpdated\n",
"\n", "\n",
" def getLastUpdatedOriginal(self):\n", " def getLastUpdatedDataSource(self):\n",
" if self.lastUpdatedOriginal is None:\n", " if self.lastUpdatedDataSource is None:\n",
" html = self._getOriginalHtml()\n", " html = self._getOriginalHtml()\n",
" lastUpdatedColumn = 'Letzte Änderung'\n", " lastUpdatedColumn = 'Letzte Änderung'\n",
" dataFrame = self._asDataFrame(html, lastUpdatedColumn)\n", " dataFrame = self._asDataFrame(html, lastUpdatedColumn)\n",
" self.lastUpdatedOriginal = dataFrame.loc['Landkreis-Daten', lastUpdatedColumn].to_pydatetime()\n", " self.lastUpdatedDataSource = dataFrame.loc['Landkreis-Daten', lastUpdatedColumn].to_pydatetime()\n",
"\n", "\n",
" return self.lastUpdatedOriginal\n", " return self.lastUpdatedDataSource\n",
"\n", "\n",
" def _getOriginalHtml(self):\n", " def _getOriginalHtml(self):\n",
" options = Options()\n", " options = Options()\n",
@@ -93,8 +93,8 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"dateProvider = DateProvider()\n", "dateProvider = DateProvider()\n",
"print('lastUpdatedIntensivstationen:', dateProvider.getLastUpdatedIntensivstationen())\n", "print(' lastUpdated:', dateProvider.getLastUpdated())\n",
"print('lastUpdatedOriginal:', dateProvider.getLastUpdatedOriginal()) \n", "print('lastUpdatedDataSource:', dateProvider.getLastUpdatedDataSource()) \n",
"needsUpdate = dateProvider.needsUpdate()\n", "needsUpdate = dateProvider.needsUpdate()\n",
"print('needsUpdate: ', needsUpdate)" "print('needsUpdate: ', needsUpdate)"
] ]
@@ -147,7 +147,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"saveLastUpdatedIntensivstationen(dateProvider.getLastUpdatedOriginal())" "saveLastUpdatedIntensivstationen(dateProvider.getLastUpdatedDataSource())"
] ]
}, },
{ {