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

---
 src/HowBadIsMyBatch.ipynb | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index b18d39c17e7..758eb882374 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -113,7 +113,10 @@
     "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)"
+    "        file.write(captchaImage.screenshot_as_png)\n",
+    "\n",
+    "def existsElementWithId(id):\n",
+    "    return len(driver.find_elements(By.ID, id)) > 0"
    ]
   },
   {
@@ -139,13 +142,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "baseDir = \"~/AndroidStudioProjects/TextRecognizer\"\n",
-    "\n",
-    "def detectTextInImage(captchaImage):\n",
-    "    ! cp $captchaImage $baseDir/app/src/main/assets/captchas/captcha_image.jpeg\n",
+    "def getTextInCaptchaImage(captchaImageFile):\n",
+    "    baseDir = \"~/AndroidStudioProjects/TextRecognizer\"\n",
+    "    ! cp $captchaImageFile $baseDir/app/src/main/assets/captchas/captcha_image.jpeg\n",
     "    ! cd $baseDir;./gradlew connectedAndroidTest\n",
-    "    textInImage = ! adb shell \"run-as org.textrecognizer cat /data/data/org.textrecognizer/files/captcha_image.txt\"\n",
-    "    return textInImage"
+    "    textInCaptchaImage = ! adb shell \"run-as org.textrecognizer cat /data/data/org.textrecognizer/files/captcha_image.txt\"\n",
+    "    return textInCaptchaImage"
    ]
   },
   {
@@ -184,7 +186,7 @@
    },
    "outputs": [],
    "source": [
-    "textInImage = AndroidEmulator.runWithinEmulator(lambda: detectTextInImage(captchaImageFile))"
+    "textInCaptchaImage = AndroidEmulator.runWithinEmulator(lambda: getTextInCaptchaImage(captchaImageFile))"
    ]
   },
   {
@@ -194,7 +196,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "textInImage"
+    "textInCaptchaImage"
    ]
   },
   {
@@ -204,7 +206,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "driver.find_element(By.ID, \"verificationCode\").send_keys(textInImage)"
+    "driver.find_element(By.ID, \"verificationCode\").send_keys(textInCaptchaImage)"
    ]
   },
   {
@@ -225,7 +227,7 @@
    "outputs": [],
    "source": [
     "def isCaptchaSolved():\n",
-    "    return len(driver.find_elements(By.ID, \"wordverify\")) == 0"
+    "    return not existsElementWithId(\"wordverify\")"
    ]
   },
   {