Browse Source

Bug fix

pull/129/head
naibo 1 year ago
parent
commit
37d4aa337f
4 changed files with 15 additions and 3 deletions
  1. +1
    -1
      ElectronJS/tasks/127.json
  2. +1
    -1
      ElectronJS/tasks/177.json
  3. +1
    -1
      ExecuteStage/.vscode/launch.json
  4. +12
    -0
      ExecuteStage/easyspider_executestage.py

+ 1
- 1
ElectronJS/tasks/127.json
File diff suppressed because it is too large
View File


+ 1
- 1
ElectronJS/tasks/177.json
File diff suppressed because it is too large
View File


+ 1
- 1
ExecuteStage/.vscode/launch.json View File

@ -12,7 +12,7 @@
"justMyCode": false, "justMyCode": false,
// "args": ["--id", "[7]", "--read_type", "remote", "--headless", "0"] // "args": ["--id", "[7]", "--read_type", "remote", "--headless", "0"]
// "args": ["--id", "[9]", "--read_type", "remote", "--headless", "0", "--saved_file_name", "YOUTUBE"] // "args": ["--id", "[9]", "--read_type", "remote", "--headless", "0", "--saved_file_name", "YOUTUBE"]
"args": ["--id", "[65]", "--headless", "0", "--user_data", "1"]
"args": ["--id", "[71]", "--headless", "0", "--user_data", "1"]
} }
] ]
} }

+ 12
- 0
ExecuteStage/easyspider_executestage.py View File

@ -54,6 +54,7 @@ class BrowserThread(Thread):
Thread.__init__(self) Thread.__init__(self)
self.browser = browser_t self.browser = browser_t
self.config = config self.config = config
self.version = version
self.totalSteps = 0 self.totalSteps = 0
self.id = id self.id = id
self.event = event self.event = event
@ -114,6 +115,7 @@ class BrowserThread(Thread):
except: except:
self.outputFormat = "csv" self.outputFormat = "csv"
try: try:
self.task_version = service["version"] # 任务版本
if service["version"] >= "0.3.1": # 0.3.1及以上版本以上的EasySpider兼容从0.3.1版本开始的所有版本 if service["version"] >= "0.3.1": # 0.3.1及以上版本以上的EasySpider兼容从0.3.1版本开始的所有版本
pass pass
else: # 0.3.1以下版本的EasySpider不兼容0.3.1及以上版本的EasySpider else: # 0.3.1以下版本的EasySpider不兼容0.3.1及以上版本的EasySpider
@ -202,6 +204,11 @@ class BrowserThread(Thread):
cookies = node["parameters"]["cookies"] cookies = node["parameters"]["cookies"]
except: except:
node["parameters"]["cookies"] = "" node["parameters"]["cookies"] = ""
if node["option"] == 2: # 点击操作
if node["parameters"]["useLoop"]:
if self.task_version <= "0.3.5":
node["parameters"]["xpath"] = "" # 0.3.5及以下版本的EasySpider下的循环点击不支持相对XPath
print("您的任务版本号为" + self.task_version + ",循环点击不支持相对XPath写法,已自动切换为纯循环的XPath")
elif node["option"] == 3: # 提取数据操作 elif node["option"] == 3: # 提取数据操作
node["parameters"]["recordASField"] = 0 node["parameters"]["recordASField"] = 0
paras = node["parameters"]["paras"] paras = node["parameters"]["paras"]
@ -239,6 +246,11 @@ class BrowserThread(Thread):
clear = node["parameters"]["clear"] clear = node["parameters"]["clear"]
except: except:
node["parameters"]["clear"] = 0 node["parameters"]["clear"] = 0
elif node["option"] == 7: # 移动到元素
if node["parameters"]["useLoop"]:
if self.task_version <= "0.3.5":
node["parameters"]["xpath"] = "" # 0.3.5及以下版本的EasySpider下的循环点击不支持相对XPath
print("您的任务版本号为" + self.task_version + ",循环点击不支持相对XPath写法,已自动切换为纯循环的XPath")
def run(self): def run(self):

Loading…
Cancel
Save