Skip to content

Commit 2b414f7

Browse files
Removed chrome driver manual setting as it's
no longer needed with the automatic downloader.
1 parent 545c50f commit 2b414f7

File tree

5 files changed

+8
-44
lines changed

5 files changed

+8
-44
lines changed

src/MainWebDriver.py

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,9 @@ def run_driver(self, chrome_service, chrome_options, manual_flag) -> None:
8383
chrome_options (Options): Set of options for the web driver
8484
manual_flag (bool): set to determine if self defined path to chrome driver
8585
"""
86-
if manual_flag:
87-
service = ChromeService(
88-
executable_path=chrome_service
89-
) # used to specify chrome driver
90-
self.driver = webdriver.Chrome(
91-
service=service, chrome_options=chrome_options
92-
)
93-
else:
94-
self.driver = webdriver.Chrome(
95-
service=chrome_service, chrome_options=chrome_options
96-
)
86+
self.driver = webdriver.Chrome(
87+
service=chrome_service, chrome_options=chrome_options
88+
)
9789

9890
def check_if_elements_exist(self):
9991
if self.elements.element_error_flag:
@@ -377,7 +369,9 @@ def login(
377369

378370
self.netsuite_sso = links_object["Netsuite_SSO"]
379371

380-
chrome_service = ChromeService("chromedriver")
372+
chrome_service = ChromeService(
373+
executable_path="./chromedriver-win64/chromedriver.exe"
374+
)
381375
chrome_service.creation_flags = CREATE_NO_WINDOW
382376
chrome_options = Options()
383377

@@ -391,11 +385,7 @@ def login(
391385
)
392386

393387
try:
394-
if links_object["Chrome_Driver"][1]:
395-
chrome_service = links_object["Chrome_Driver"][0]
396-
self.run_driver(chrome_service, chrome_options, True)
397-
else:
398-
self.run_driver(chrome_service, chrome_options, False)
388+
self.run_driver(chrome_service, chrome_options, False)
399389
except (
400390
exceptions.SessionNotCreatedException,
401391
exceptions.SeleniumManagerException,

src/SettingsScreen.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@ def __init__(self, **kw) -> None:
1212
def save_and_return(self):
1313
self.netsuite_sso = self.ids.netsuite_sso_setting.text
1414
self.netsuite = self.ids.netsuite_setting.text
15-
self.chrome_driver = self.ids.chrome_driver_setting.text
16-
self.chrome_driver_manual = self.ids.chrome_driver_manual.active
1715
self.timeout_avoidance = self.ids.timeout_avoidance_setting.active
1816
json_object = {
1917
"Netsuite_SSO": self.netsuite_sso,
2018
"Netsuite": self.netsuite,
21-
"Chrome_Driver": [self.chrome_driver, self.chrome_driver_manual],
2219
"Timeout_Avoidance": self.timeout_avoidance,
2320
}
2421

@@ -37,7 +34,6 @@ def load_settings(self):
3734
json_object = {
3835
"Netsuite_SSO": "Replace with Netsuite SSO",
3936
"Netsuite": "https://5230881.app.netsuite.com/app/center/card.nl?sc=-29&whence=",
40-
"Chrome_Driver": ["./chromedriver-win64/chromedriver.exe", False],
4137
"Timeout_Avoidance": True,
4238
}
4339
json.dump(json_object, openfile, indent=4)
@@ -47,13 +43,9 @@ def load_settings(self):
4743

4844
self.netsuite_sso = json_object["Netsuite_SSO"]
4945
self.netsuite = json_object["Netsuite"]
50-
self.chrome_driver = json_object["Chrome_Driver"][0]
51-
self.chrome_driver_manual = json_object["Chrome_Driver"][1]
5246
self.timeout_avoidance = json_object["Timeout_Avoidance"]
5347

5448
self.ids.timeout_avoidance_setting.active = self.timeout_avoidance
55-
self.ids.chrome_driver_manual.active = self.chrome_driver_manual
56-
self.ids.chrome_driver_setting.text = self.chrome_driver
5749
self.ids.netsuite_sso_setting.text = self.netsuite_sso
5850
self.ids.netsuite_setting.text = self.netsuite
5951
openfile.close()

src/kv/Login.kv

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,6 @@
161161
id: netsuite_setting
162162
size_hint_x: .58
163163

164-
BoxLayout:
165-
orientation: 'horizontal'
166-
Label:
167-
text: "Chrome Driver"
168-
size_hint_x: .3
169-
CheckBox:
170-
id: chrome_driver_manual
171-
active: False
172-
size_hint_x: .05
173-
Label:
174-
size_hint_x: .05
175-
SettingTextInput:
176-
id: chrome_driver_setting
177-
size_hint_x: .58
178164
BoxLayout:
179165
orientation: 'horizontal'
180166
Label:

src/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"Netsuite_SSO": "https://launcher.myapps.microsoft.com/api/signin/fe4da155-1607-4df4-a7aa-c8fa934170a5?tenantId=7261aa19-728c-457c-bb6e-a31f9a21516d",
33
"Netsuite": "https://5230881.app.netsuite.com/app/center/card.nl?sc=-29&whence=",
4-
"Chrome_Driver": [
5-
"./chromedriver-win64/chromedriver.exe",
6-
true
7-
],
84
"Timeout_Avoidance": true
95
}

src/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"Chrome_Driver_Version": "",
3-
"App_Version": "1.4.6"
3+
"App_Version": "1.4.7"
44
}

0 commit comments

Comments
 (0)