jebbs/data-extracter-extesion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

message identities optimize

Browse Source
This commit is contained in:
jebbs
2018-05-23 11:28:17 +08:00
parent 73482174dd
commit 2cbcae6951
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/background.js
View File

@ -1,5 +1,5 @@
chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) { chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) {
if (message.from === "doExtractRequest") if (message.from === "DataExtracter:Extract")
extract(...message.args).catch( extract(...message.args).catch(
err => { err => {
console.log(err); console.log(err);

16
scripts/content.js
View File

@ -1,19 +1,14 @@
chrome.runtime.onMessage.addListener( chrome.runtime.onMessage.addListener(
function (request, sender, sendResponse) { function (request, sender, sendResponse) {
// console.log(request); // console.log(request);
if (request.from == "doExtractRequest") { if (request.from == "DataExtracter:Extract") {
// console.log(request);
let data = extractData(request.itemsSelector, request.fieldSelectors); let data = extractData(request.itemsSelector, request.fieldSelectors);
// console.log(data);
if (sendResponse) sendResponse(data); if (sendResponse) sendResponse(data);
} else if (request.from == "doExtractGotoUrl") { } else if (request.from == "DataExtracter:GotoUrl") {
// console.log(request);
window.location.replace(request.url); window.location.replace(request.url);
} else if (request.from == "doExtractReportIn") { } else if (request.from == "DataExtracter:ReportIn") {
// console.log("doExtractReportIn");
if (sendResponse) sendResponse(request.from); if (sendResponse) sendResponse(request.from);
} else if (request.from == "doExtractQueryUrl") { } else if (request.from == "DataExtracter:QueryUrl") {
// console.log("doExtractReportIn");
if (sendResponse) sendResponse(window.location.href); if (sendResponse) sendResponse(window.location.href);
} }
} }
@ -29,6 +24,7 @@ function extractData(itemsSelector, fieldSelectors) {
function extract(...args) { function extract(...args) {
let sig = `Invalid call args. let sig = `Invalid call args.
function extract(itemsSelector:string, fieldSelectors:string[]) function extract(itemsSelector:string, fieldSelectors:string[])
function extract(itemsSelector:string, fieldSelectors:string[], url:string, from:number, to:number, interval:number) function extract(itemsSelector:string, fieldSelectors:string[], url:string, from:number, to:number, interval:number)
function extract(itemsSelector:string, fieldSelectors:string, url:string, pages:number[])`; function extract(itemsSelector:string, fieldSelectors:string, url:string, pages:number[])`;
@ -41,7 +37,7 @@ function extract(itemsSelector:string, fieldSelectors:string, url:string, pages:
return; return;
} }
let message = { let message = {
from: "doExtractRequest", from: "DataExtracter:Extract",
args: args args: args
} }
chrome.runtime.sendMessage(message, r => { chrome.runtime.sendMessage(message, r => {

8
scripts/extract.js
View File

@ -55,7 +55,7 @@ function redirectTab(tab, url) {
if (url !== u) { if (url !== u) {
curUrl = u; curUrl = u;
let req = { let req = {
from: "doExtractGotoUrl", from: "DataExtracter:GotoUrl",
url: url url: url
} }
chrome.tabs.sendMessage(tab.id, req); chrome.tabs.sendMessage(tab.id, req);
@ -67,7 +67,7 @@ function redirectTab(tab, url) {
function extractData(tab, itemsSelector, fieldSelectors) { function extractData(tab, itemsSelector, fieldSelectors) {
let req = { let req = {
from: "doExtractRequest", from: "DataExtracter:Extract",
itemsSelector: itemsSelector, itemsSelector: itemsSelector,
fieldSelectors: fieldSelectors fieldSelectors: fieldSelectors
} }
@ -78,7 +78,7 @@ function extractData(tab, itemsSelector, fieldSelectors) {
function reportIn(tab) { function reportIn(tab) {
let req = { let req = {
from: "doExtractReportIn" from: "DataExtracter:ReportIn"
} }
let failMsg = "reportIn failed after 10 second."; let failMsg = "reportIn failed after 10 second.";
let cond = r => r == req.from; let cond = r => r == req.from;
@ -87,7 +87,7 @@ function reportIn(tab) {
function queryUrl(tab, urlExcluded) { function queryUrl(tab, urlExcluded) {
let req = { let req = {
from: "doExtractQueryUrl" from: "DataExtracter:QueryUrl"
} }
let failMsg = "queryUrl failed after 10 second."; let failMsg = "queryUrl failed after 10 second.";
let cond = url => url && (!urlExcluded || (urlExcluded && urlExcluded != url)); let cond = url => url && (!urlExcluded || (urlExcluded && urlExcluded != url));