diff --git a/.gitignore b/.gitignore index e8931f7ff21..cdbceccc8b6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ src/results/ docs/data/*.xlsx docs/data/*.html .env +src/captchaImage.jpeg diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index fbf9ed52e63..1c75676e311 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -169,7 +169,7 @@ "outputs": [], "source": [ "import time\n", - "import os.path\n", + "import os\n", "\n", "def waitUntilDownloadHasFinished(file):\n", " while not os.path.exists(file):\n", @@ -183,6 +183,8 @@ "metadata": {}, "outputs": [], "source": [ + "import os\n", + "\n", "def getTextInCaptchaImage(captchaImageFile):\n", " baseDir = \"~/AndroidStudioProjects/TextRecognizer\"\n", " ! cp $captchaImageFile $baseDir/app/src/main/assets/captchas/captcha_image.jpeg\n", @@ -197,10 +199,9 @@ " driver.find_element(By.ID, \"verificationCode\").send_keys(textInCaptchaImage)\n", " driver.find_element(By.CSS_SELECTOR, '[name=\"downloadbut\"]').click()\n", "\n", - "# FK-TODO: file is part of absoluteFile, so remove file\n", - "def downloadFile(file, absoluteFile, driver, maxTries):\n", + "def downloadFile(absoluteFile, driver, maxTries):\n", " def _downloadFile():\n", - " driver.get('https://vaers.hhs.gov/eSubDownload/index.jsp?fn=' + file)\n", + " driver.get('https://vaers.hhs.gov/eSubDownload/index.jsp?fn=' + os.path.basename(absoluteFile))\n", " solveCaptchaAndStartFileDownload(driver, 'captchaImage.jpeg')\n", "\n", " numTries = 1\n", @@ -218,7 +219,6 @@ "def downloadVAERSFile(file, downloadDir):\n", " driver = getWebDriver(downloadDir, isHeadless = False)\n", " downloadedFile = downloadFile(\n", - " file = file,\n", " absoluteFile = downloadDir + \"/\" + file,\n", " driver = driver,\n", " maxTries = None)\n", @@ -1203,6 +1203,9 @@ } ], "metadata": { + "interpreter": { + "hash": "31f2aee4e71d21fbe5cf8b01ff0e069b9275f58929596ceb00d14d90e3e16cd6" + }, "kernelspec": { "display_name": "Python 3.10.4 64-bit", "language": "python",