marton levente 9 сар өмнө
parent
commit
a17ed7021c

+ 4 - 4
anafapi/anafspv.py

@@ -37,7 +37,7 @@ class anafSPV(object):
         self.session.mount('http://', adapter)
         self.session.mount('https://', adapter)
 
-    def get_cookies_from_browser(self):
+    def get_cookies_from_browser(self, window_title):
         chrome_options = ChromeOptions()
         chrome_options.add_argument('--disable-dev-shm-usage')
         chrome_options.add_argument('--no-sandbox')
@@ -46,7 +46,7 @@ class anafSPV(object):
         chrome_options.add_experimental_option('excludeSwitches', ['enable-automation'])
 
         driver = webdriver.Chrome(options=chrome_options)
-        thread = Thread(target=self.accept_cert, args=())
+        thread = Thread(target=self.accept_cert, args=(window_title))
         thread.start()
         driver.get(self.KEYURL)
         self.cookies = driver.get_cookies()
@@ -56,7 +56,7 @@ class anafSPV(object):
             self.requests_cookies[c['name']] = c['value']
         return self.requests_cookies
 
-    def accept_cert(self):
+    def accept_cert(self, window_title):
         # brave_ready.wait()
         sleep(2)
         win_2 = gw.getWindowsWithTitle('data:,', condition=gw.Re.CONTAINS)[0]
@@ -67,7 +67,7 @@ class anafSPV(object):
             try:
                 if t_ >= 1.5:
                     break
-                win_ = gw.getWindowsWithTitle('Windows Security', condition=gw.Re.CONTAINS)[0]
+                win_ = gw.getWindowsWithTitle(window_title, condition=gw.Re.CONTAINS)[0]
                 if not win_.isActive:
                     win_.activate()
                     win_.acceptInput(True)

+ 3 - 3
tests/test_anafspv.py

@@ -10,7 +10,7 @@ class spvTest(unittest.TestCase):
     spv = anafSPV()
 
     def test_get_messages(self):
-        requests_cookies = self.spv.get_cookies_from_browser()
+        requests_cookies = self.spv.get_cookies_from_browser('Windows Security')
         messages = self.spv.get_messages(10)
         pprint.pprint(messages)
         # for message in messages['mesaje'][-1:]:  # -1:
@@ -18,12 +18,12 @@ class spvTest(unittest.TestCase):
         # self.spv.download_message('27100508', id_='556755658', details=message['tip'])
 
     def test_get_fin_sheet(self):
-        requests_cookies = self.spv.get_cookies_from_browser()
+        requests_cookies = self.spv.get_cookies_from_browser('Windows Security')
         response = self.spv.get_fin_sheet(cui='27100508')
         pprint.pprint(response)
 
     def test_get_vector(self):
-        requests_cookies = self.spv.get_cookies_from_browser()
+        requests_cookies = self.spv.get_cookies_from_browser('Windows Security')
         response = self.spv.get_vector(cui='17259191')
         pprint.pprint(response)