update 0.1.8

liangutil/liangutils.py

@@ -203,3 +203,20 @@ def uncompress(src_file, dest_dir_path):
  return True
 
 
+def find_all_files(directory):
+ """根据目录寻找该目录下的所有子文件
+
+ Args:
+ directory(str):目录路径
+
+ Returns:
+ list: 子文件路径
+ """
+ file_paths = []
+
+ for root, _, files in os.walk(directory):
+ for file in files:
+ file_path = os.path.join(root, file)
+ file_paths.append(file_path)
+
+ return file_paths

liangutil/requestutils.py

@@ -448,7 +448,7 @@ def get_page_source(self, url, time_sleep=0, retry_count=3, proxy=""):
  try:
  self.driver.get(url)
  except Exception as e:
- self.driver.execute("window.stop()")
+ self.driver.execute_script("window.stop()")
  return {"error":e,
  "content":"",
  "url":url}
@@ -465,6 +465,9 @@ def get_page_source(self, url, time_sleep=0, retry_count=3, proxy=""):
  "content": "",
  "url": self.driver.current_url}
 
+ return {"error": "",
+ "content": "",
+ "url": self.driver.current_url}
 
 
  def close(self):