From b057b1c836aac0347e62419ea3c0df13155e974e Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Fri, 13 May 2022 00:13:53 +0200
Subject: [PATCH] refactoring

---
 src/HowBadIsMyBatch.ipynb | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index 9e53343f76c..c93bcb6d209 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -99,18 +99,26 @@
     "from selenium.webdriver.chrome.options import Options\n",
     "from selenium.webdriver.common.by import By\n",
     "\n",
-    "options = Options()\n",
     "downloadDir = \"/home/frankknoll/Dokumente/Corona/projects/HowBadIsMyBatch/src/VAERS/tmp\"\n",
-    "prefs = {\"download.default_directory\" : downloadDir}\n",
-    "options.add_experimental_option(\"prefs\", prefs)\n",
-    "service = ChromeService(executable_path = ChromeDriverManager().install())\n",
-    "driver = webdriver.Chrome(service = service, options = options)\n",
     "file2Download = '2022VAERSData.zip'\n",
-    "driver.get('https://vaers.hhs.gov/eSubDownload/index.jsp?fn=' + file2Download)\n",
-    "captchaImage = driver.find_element(By.CSS_SELECTOR, \"img[src='captchaImage']\")\n",
     "captchaImageFile = 'captchaImage.jpeg'\n",
-    "with open(captchaImageFile, 'wb') as file:\n",
-    "    file.write(captchaImage.screenshot_as_png)"
+    "\n",
+    "def getWebDriver(downloadDir):\n",
+    "    options = Options()\n",
+    "    options.add_experimental_option(\"prefs\", {\"download.default_directory\" : downloadDir})\n",
+    "    return webdriver.Chrome(\n",
+    "        service = ChromeService(executable_path = ChromeDriverManager().install()),\n",
+    "        options = options)\n",
+    "\n",
+    "driver = getWebDriver(downloadDir)\n",
+    "driver.get('https://vaers.hhs.gov/eSubDownload/index.jsp?fn=' + file2Download)\n",
+    "\n",
+    "def saveCaptchaImageAs(captchaImageFile):\n",
+    "    captchaImage = driver.find_element(By.CSS_SELECTOR, \"img[src='captchaImage']\")\n",
+    "    with open(captchaImageFile, 'wb') as file:\n",
+    "        file.write(captchaImage.screenshot_as_png)\n",
+    "\n",
+    "saveCaptchaImageAs(captchaImageFile)"
    ]
   },
   {
@@ -1189,8 +1197,11 @@
   }
  ],
  "metadata": {
+  "interpreter": {
+   "hash": "31f2aee4e71d21fbe5cf8b01ff0e069b9275f58929596ceb00d14d90e3e16cd6"
+  },
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3.10.4 64-bit",
    "language": "python",
    "name": "python3"
   },