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 13:51:06 +01:00
parent 99aebe4f66
commit e0a86efa96
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/HowBadIsMyBatch.ipynb
View File

@@ -88,14 +88,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"from VAERSFileDownloader import downloadVAERSFile\n", "from VAERSFileDownloader import downloadVAERSFileAndUnzip"
"from zipUtils import unzipAndRemove\n",
"\n",
"def downloadVAERSFileAndUnzip(file):\n",
" downloadedFile = downloadVAERSFile(file, getWorkingDirectory() + \"/VAERS/tmp\")\n",
" unzipAndRemove(\n",
" zipFile = downloadedFile,\n",
" dstDir = getWorkingDirectory() + '/VAERS/')\n"
] ]
}, },
{ {
@@ -106,8 +99,9 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"if needsUpdate:\n", "if needsUpdate:\n",
" downloadVAERSFileAndUnzip('2022VAERSData.zip')\n", " workingDirectory = getWorkingDirectory()\n",
" downloadVAERSFileAndUnzip('NonDomesticVAERSData.zip')" " downloadVAERSFileAndUnzip('2022VAERSData.zip', workingDirectory)\n",
" downloadVAERSFileAndUnzip('NonDomesticVAERSData.zip', workingDirectory)"
] ]
}, },
{ {

8
src/VAERSFileDownloader.py
View File

@@ -3,6 +3,8 @@ import time
from WebDriver import getWebDriver, isCaptchaSolved, saveCaptchaImageAs from WebDriver import getWebDriver, isCaptchaSolved, saveCaptchaImageAs
from selenium.webdriver.common.by import By from selenium.webdriver.common.by import By
from CaptchaReader import getTextInCaptchaImage from CaptchaReader import getTextInCaptchaImage
from zipUtils import unzipAndRemove
#def getTextInCaptchaImage(captchaImageFile): #def getTextInCaptchaImage(captchaImageFile):
# baseDir = "~/AndroidStudioProjects/TextRecognizer" # baseDir = "~/AndroidStudioProjects/TextRecognizer"
@@ -47,3 +49,9 @@ def downloadVAERSFile(file, downloadDir):
maxTries = None) maxTries = None)
driver.quit() driver.quit()
return downloadedFile return downloadedFile
def downloadVAERSFileAndUnzip(file, workingDirectory):
downloadedFile = downloadVAERSFile(file, workingDirectory + "/VAERS/tmp")
unzipAndRemove(
zipFile = downloadedFile,
dstDir = workingDirectory + '/VAERS/')