From 2a95ad88bf68e17f9bbcecbce6be4651182eedc5 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Fri, 13 May 2022 18:34:54 +0200
Subject: [PATCH] argh!!!

---
 src/HowBadIsMyBatch.ipynb | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index a38e071270b..96716b348bc 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -188,7 +188,7 @@
     "    ! cp $captchaImageFile $baseDir/app/src/main/assets/captchas/captcha_image.jpeg\n",
     "    ! cd $baseDir;./gradlew connectedAndroidTest\n",
     "    textInCaptchaImage = ! adb shell \"run-as org.textrecognizer cat /data/data/org.textrecognizer/files/captcha_image.txt\"\n",
-    "    return textInCaptchaImage\n",
+    "    return textInCaptchaImage[0]\n",
     "    \n",
     "def solveCaptchaAndStartFileDownload(driver, captchaImageFile):\n",
     "    saveCaptchaImageAs(driver, captchaImageFile)\n",
@@ -197,34 +197,35 @@
     "    driver.find_element(By.ID, \"verificationCode\").send_keys(textInCaptchaImage)\n",
     "    driver.find_element(By.CSS_SELECTOR, '[name=\"downloadbut\"]').click()\n",
     "\n",
-    "def downloadFile(file, driver, maxTries):\n",
-    "    captchaImageFile = 'captchaImage.jpeg'\n",
+    "# FK-TODO: file is part of absoluteFile, so remove file\n",
+    "def downloadFile(file, absoluteFile, driver, maxTries):\n",
+    "    def _downloadFile():\n",
+    "        driver.get('https://vaers.hhs.gov/eSubDownload/index.jsp?fn=' + file)\n",
+    "        solveCaptchaAndStartFileDownload(driver, 'captchaImage.jpeg')\n",
+    "\n",
     "    numTries = 1\n",
-    "    solveCaptchaAndStartFileDownload(driver, captchaImageFile)\n",
-    "    while(not isCaptchaSolved(driver) and numTries < maxTries):\n",
-    "        solveCaptchaAndStartFileDownload(driver, captchaImageFile)\n",
+    "    _downloadFile()\n",
+    "    while(not isCaptchaSolved(driver) and (maxTries is None or numTries < maxTries)):\n",
+    "        _downloadFile()\n",
     "        numTries = numTries + 1\n",
     "\n",
     "    if isCaptchaSolved(driver):\n",
-    "        waitUntilDownloadHasFinished(file)\n",
-    "        return True\n",
+    "        waitUntilDownloadHasFinished(absoluteFile)\n",
+    "        return absoluteFile\n",
     "    else:\n",
-    "        return False\n",
+    "        return None\n",
     "\n",
     "def downloadVAERSFile(file):\n",
     "    downloadDir = \"/home/frankknoll/Dokumente/Corona/projects/HowBadIsMyBatch/src/VAERS/tmp\"\n",
     "    driver = getWebDriver(downloadDir, isHeadless = False)\n",
-    "    driver.get('https://vaers.hhs.gov/eSubDownload/index.jsp?fn=' + file)\n",
     "    absoluteFile = downloadDir + \"/\" + file\n",
-    "    isFileDownloaded = downloadFile(\n",
-    "        file = absoluteFile,\n",
+    "    downloadedFile = downloadFile(\n",
+    "        file = file,\n",
+    "        absoluteFile = absoluteFile,\n",
     "        driver = driver,\n",
-    "        maxTries = 1)\n",
+    "        maxTries = None)\n",
     "    driver.quit()\n",
-    "    if isFileDownloaded:\n",
-    "        return absoluteFile\n",
-    "    else:\n",
-    "        return None"
+    "    return downloadedFile"
    ]
   },
   {