refactoring

src/HowBadIsMyBatch.ipynb

@@ -88,14 +88,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from VAERSFileDownloader import downloadVAERSFile\n",
-    "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"
+    "from VAERSFileDownloader import downloadVAERSFileAndUnzip"
    ]
   },
   {
@@ -106,8 +99,9 @@
    "outputs": [],
    "source": [
     "if needsUpdate:\n",
-    "    downloadVAERSFileAndUnzip('2022VAERSData.zip')\n",
-    "    downloadVAERSFileAndUnzip('NonDomesticVAERSData.zip')"
+    "    workingDirectory = getWorkingDirectory()\n",
+    "    downloadVAERSFileAndUnzip('2022VAERSData.zip', workingDirectory)\n",
+    "    downloadVAERSFileAndUnzip('NonDomesticVAERSData.zip', workingDirectory)"
    ]
   },
   {

src/VAERSFileDownloader.py

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