diff --git a/webmagic-scripts/deploy.sh b/webmagic-scripts/deploy.sh new file mode 100644 index 0000000..11ff2bf --- /dev/null +++ b/webmagic-scripts/deploy.sh @@ -0,0 +1,5 @@ +#!/bin/sh +VERSION="0.4.1-SNAPTHOS" +mvn clean package +cp target/webmagic-scripts-${VERSION}.jar /usr/local/webmagic/webmagic-console.jar +rsync -avz --delete target/lib/ /usr/local/webmagic/lib/ diff --git a/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptConsole.java b/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptConsole.java index c982ea0..e487e2f 100644 --- a/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptConsole.java +++ b/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptConsole.java @@ -105,6 +105,7 @@ public class ScriptConsole { options.addOption(new Option("l", true, "language")); options.addOption(new Option("t", true, "thread")); options.addOption(new Option("f", true, "script file")); + options.addOption(new Option("s", true, "sleep time")); CommandLineParser commandLineParser = new PosixParser(); CommandLine commandLine = commandLineParser.parse(options, args); return readOptions(commandLine); diff --git a/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptProcessor.java b/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptProcessor.java index c1ec74a..a12706a 100644 --- a/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptProcessor.java +++ b/webmagic-scripts/src/main/java/us/codecraft/webmagic/scripts/ScriptProcessor.java @@ -50,7 +50,7 @@ public class ScriptProcessor implements PageProcessor { context.setAttribute("page", page, ScriptContext.ENGINE_SCOPE); context.setAttribute("config", site, ScriptContext.ENGINE_SCOPE); try { - engine.eval(defines + script, context); + engine.eval(defines + "\n" + script, context); } catch (ScriptException e) { e.printStackTrace(); } diff --git a/webmagic-scripts/src/main/resources/js/defines.js b/webmagic-scripts/src/main/resources/js/defines.js index 687edb3..a06aea9 100644 --- a/webmagic-scripts/src/main/resources/js/defines.js +++ b/webmagic-scripts/src/main/resources/js/defines.js @@ -7,4 +7,4 @@ function xpath(str){ function urls(str){ links = page.getHtml().links().regex(str).all(); page.addTargetRequests(links); -} \ No newline at end of file +}