close driver

engine/__init__.py

@@ -8,7 +8,7 @@ def get_engine(file, url=None, login=True):
     def inner(f):
 
         def wapper(*args, **kwargs):
-            # try:
+
             start_time = time.time()
             log_name = os.path.split(file)[-1].split(".")[0]
             # image_path = os.path.join(os.path.dirname(os.path.dirname(file)), "images")
@@ -16,15 +16,19 @@ def get_engine(file, url=None, login=True):
             # image_path += '.png'
 
             engine = BrowserEngine(url, login, log_name)
-
-            ret = f(engine, *args, **kwargs)
-            time.sleep(0.1)
-            end_time = time.time()
-            engine.logger.info(f'执行时间：{end_time-start_time}s')
-            if engine: del engine
-            return ret
-            # except Exception as e:
-            #     print(e)
+            try:
+                ret = f(engine, *args, **kwargs)
+                return ret
+            except Exception as e:
+                raise e
+            finally:
+                end_time = time.time()
+                try:
+                    engine.logger.info(f'执行时间：{end_time - start_time}s')
+                    engine.__del__()
+                    del engine
+                except:
+                    pass
 
         return wapper
 

engine/browser_engine.py

@@ -22,6 +22,7 @@ class BrowserEngine(ReadConfig):
         self.login_znfz()
         # self.format_url()
         self.get_page(self.url)
+        self.btxwk()
         self.driver.xpath = self.driver.find_elements_by_xpath
 
     def open_browser(self):
@@ -86,6 +87,15 @@ class BrowserEngine(ReadConfig):
         if ele_list:
             self.driver.find_element_by_xpath("//div[contains(text(),'上次阅卷到')]/../..//span[text()='取 消']/..").click()
 
+    def btxwk(self): # 必填项有时候打开为空
+        if self.url is not None:
+            if 'case' in self.url:
+                # 特定人员为空  影响其他框验证
+                if self.driver.find_elements_by_xpath("//div[@id='起诉意见书_犯罪嫌疑人_0_特定人员']"):
+                    if len(self.driver.find_elements_by_xpath("//div[@id='起诉意见书_犯罪嫌疑人_0_特定人员']//ul/li"))==1:
+                        self.driver.find_element_by_xpath("//div[@id='起诉意见书_犯罪嫌疑人_0_特定人员']").click()
+                        self.driver.find_element_by_xpath("//li[@data='聋哑人']").click()
+
 
     def get_page(self, url):
         time.sleep(0.5)
@@ -110,6 +120,7 @@ class BrowserEngine(ReadConfig):
     #     self.driver.get_screenshot_as_file(next_image_name)
 
     def __del__(self):
+        self.logger.info('close driver')
         try:
             self.driver.quit()
         except: