refactoring
This commit is contained in:
@@ -113,7 +113,10 @@
|
|||||||
"def saveCaptchaImageAs(captchaImageFile):\n",
|
"def saveCaptchaImageAs(captchaImageFile):\n",
|
||||||
" captchaImage = driver.find_element(By.CSS_SELECTOR, \"img[src='captchaImage']\")\n",
|
" captchaImage = driver.find_element(By.CSS_SELECTOR, \"img[src='captchaImage']\")\n",
|
||||||
" with open(captchaImageFile, 'wb') as file:\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": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
|
"def getTextInCaptchaImage(captchaImageFile):\n",
|
||||||
" baseDir = \"~/AndroidStudioProjects/TextRecognizer\"\n",
|
" baseDir = \"~/AndroidStudioProjects/TextRecognizer\"\n",
|
||||||
"\n",
|
" ! cp $captchaImageFile $baseDir/app/src/main/assets/captchas/captcha_image.jpeg\n",
|
||||||
"def detectTextInImage(captchaImage):\n",
|
|
||||||
" ! cp $captchaImage $baseDir/app/src/main/assets/captchas/captcha_image.jpeg\n",
|
|
||||||
" ! cd $baseDir;./gradlew connectedAndroidTest\n",
|
" ! cd $baseDir;./gradlew connectedAndroidTest\n",
|
||||||
" textInImage = ! adb shell \"run-as org.textrecognizer cat /data/data/org.textrecognizer/files/captcha_image.txt\"\n",
|
" textInCaptchaImage = ! adb shell \"run-as org.textrecognizer cat /data/data/org.textrecognizer/files/captcha_image.txt\"\n",
|
||||||
" return textInImage"
|
" return textInCaptchaImage"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -184,7 +186,7 @@
|
|||||||
},
|
},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"textInImage = AndroidEmulator.runWithinEmulator(lambda: detectTextInImage(captchaImageFile))"
|
"textInCaptchaImage = AndroidEmulator.runWithinEmulator(lambda: getTextInCaptchaImage(captchaImageFile))"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -194,7 +196,7 @@
|
|||||||
"metadata": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"textInImage"
|
"textInCaptchaImage"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -204,7 +206,7 @@
|
|||||||
"metadata": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"driver.find_element(By.ID, \"verificationCode\").send_keys(textInImage)"
|
"driver.find_element(By.ID, \"verificationCode\").send_keys(textInCaptchaImage)"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -225,7 +227,7 @@
|
|||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"def isCaptchaSolved():\n",
|
"def isCaptchaSolved():\n",
|
||||||
" return len(driver.find_elements(By.ID, \"wordverify\")) == 0"
|
" return not existsElementWithId(\"wordverify\")"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user