spider/EasySpider
1
0
Fork 0
mirror of https://github.com/NaiboWang/EasySpider.git synced 2025-04-20 10:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix

Browse Source
This commit is contained in:
naibo 2023-07-23 20:42:50 +08:00
parent 09ccb5d56f
commit 99cd755031
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElectronJS/src/taskGrid/FlowChart.html
View File

@ -636,7 +636,7 @@ If the expression returns a value greater than 0 or evaluates to True, the opera
<input onkeydown="inputDelete(event)" id="serviceDescription" name="serviceDescription" class="form-control"></input> <input onkeydown="inputDelete(event)" id="serviceDescription" name="serviceDescription" class="form-control"></input>
<label>Export Data Format (Excel/CSV/TXT/Database):</label> <label>Export Data Format (Excel/CSV/TXT/Database):</label>
<select id="outputFormat" class="form-control"> <select id="outputFormat" class="form-control">
<option value = "xlsx">XLSX (EXCEL, note that a single Excel cell can accommodate up to 32767 characters)</option> <option value = "xlsx">XLSX (EXCEL, note that a single Excel cell can save up to 32767 characters)</option>
<option value = "csv">CSV</option> <option value = "csv">CSV</option>
<option value = "txt">TXT</option> <option value = "txt">TXT</option>
<option value = "mysql">MySQL Database</option> <option value = "mysql">MySQL Database</option>

2
ElectronJS/src/taskGrid/FlowChart_CN.html
View File

@ -637,7 +637,7 @@ print(emotlib.emoji()) # 使用其中的函数。
<input onkeydown="inputDelete(event)" id="serviceDescription" name="serviceDescription" class="form-control"></input> <input onkeydown="inputDelete(event)" id="serviceDescription" name="serviceDescription" class="form-control"></input>
<label>导出数据格式（Excel/CSV/TXT/数据库，<a href="https://www.bilibili.com/video/BV1os4y1679S/" target="_blank">查看MySQL操作教程</a>）：</label> <label>导出数据格式（Excel/CSV/TXT/数据库，<a href="https://www.bilibili.com/video/BV1os4y1679S/" target="_blank">查看MySQL操作教程</a>）：</label>
<select id="outputFormat" class="form-control"> <select id="outputFormat" class="form-control">
<option value = "xlsx">XLSX（即EXCEL文件，注意Excel单个单元格最多可容纳32767字符）</option> <option value = "xlsx">XLSX（即EXCEL文件，注意Excel单个单元格最多可存储32767字符）</option>
<option value = "csv">CSV</option> <option value = "csv">CSV</option>
<option value = "txt">TXT</option> <option value = "txt">TXT</option>
<option value = "mysql">MySQL数据库</option> <option value = "mysql">MySQL数据库</option>

2
ElectronJS/tasks/101.json
View File

File diff suppressed because one or more lines are too long

1
ElectronJS/tasks/197.json Normal file
View File

File diff suppressed because one or more lines are too long

1
ElectronJS/tasks/198.json Normal file
View File

File diff suppressed because one or more lines are too long

2
ExecuteStage/.vscode/launch.json vendored
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", "[98]", "--headless", "0", "--user_data", "1", "--keyboard", "0"] "args": ["--id", "[7]", "--headless", "0", "--user_data", "1", "--keyboard", "0"]
} }
] ]
} }

6
ExecuteStage/easyspider_executestage.py
View File

@ -82,8 +82,8 @@ class BrowserThread(Thread):
now = datetime.now().strftime("%Y_%m_%d_%H_%M_%S") now = datetime.now().strftime("%Y_%m_%d_%H_%M_%S")
self.saveName = self.saveName.replace("current_time", now) self.saveName = self.saveName.replace("current_time", now)
self.print_and_log("Save Name for task ID", i, "is:", self.saveName)
self.print_and_log("任务ID", i, "的保存文件名为:", self.saveName) self.print_and_log("任务ID", i, "的保存文件名为:", self.saveName)
self.print_and_log("Save Name for task ID", i, "is:", self.saveName)
if not os.path.exists("Data/Task_" + str(i)): if not os.path.exists("Data/Task_" + str(i)):
os.mkdir("Data/Task_" + str(i)) os.mkdir("Data/Task_" + str(i))
if not os.path.exists("Data/Task_" + str(i) + "/" + self.saveName): if not os.path.exists("Data/Task_" + str(i) + "/" + self.saveName):
@ -990,7 +990,7 @@ class BrowserThread(Thread):
# else: # else:
# time.sleep(2) # time.sleep(2)
# 切换历史记录等待： # 切换历史记录等待：
self.recordLog("Change history back time or: " + self.recordLog("Change history back time or: ",
node["parameters"]["historyWait"]) node["parameters"]["historyWait"])
try: try:
self.browser.execute_script('window.stop()') self.browser.execute_script('window.stop()')
@ -1051,7 +1051,7 @@ class BrowserThread(Thread):
time.sleep(node["parameters"]["historyWait"]) time.sleep(node["parameters"]["historyWait"])
# else: # else:
# time.sleep(2) # time.sleep(2)
self.recordLog("Change history back time or: " + self.recordLog("Change history back time or: ",
node["parameters"]["historyWait"]) node["parameters"]["historyWait"])
try: try:
self.browser.execute_script('window.stop()') self.browser.execute_script('window.stop()')