change author info

2013-06-18 07:24:19 +08:00 · 2013-06-18 07:24:19 +08:00 · 8cef8774cb
parent 672db58db7
commit 8cef8774cb
49 changed files with 57 additions and 49 deletions
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/Page.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Page.java
@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午11:22
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/Request.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Request.java
@ -1,7 +1,8 @@
 package us.codecraft.webmagic;

 /**
- * User: cairne
+ * Request对象是
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午11:37
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/Site.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Site.java
@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.Set;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午12:13
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java
@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午6:53
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/Downloader.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/Downloader.java
@ -5,11 +5,18 @@ import us.codecraft.webmagic.Request;
 import us.codecraft.webmagic.Site;

 /**
- * User: cairne
+ * Downloader是webmagic抓取页面的核心接口。
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午12:14
 */
 public interface Downloader {

+    /**
+     *
+     * @param request
+     * @param site
+     * @return
+     */
    public Page download(Request request,Site site);
 }
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java
@ -14,7 +14,7 @@ import us.codecraft.webmagic.utils.UrlUtils;


 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午12:15
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientPool.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientPool.java
@ -13,7 +13,7 @@ import org.apache.http.params.*;
 import us.codecraft.webmagic.Site;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午12:29
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/pipeline/ConsolePipeline.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/pipeline/ConsolePipeline.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.selector.Selectable;
 import java.util.Map;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:45
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/pipeline/FilePipeline.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/pipeline/FilePipeline.java
@ -13,7 +13,7 @@ import java.io.PrintWriter;
 import java.util.Map;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午6:28
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/pipeline/Pipeline.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/pipeline/Pipeline.java
@ -4,7 +4,7 @@ import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:39
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/processor/PageProcessor.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/processor/PageProcessor.java
@ -4,7 +4,7 @@ import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午11:42
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/processor/SimplePageProcessor.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/processor/SimplePageProcessor.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.utils.UrlUtils;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-22
 * Time: 下午9:15
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/schedular/FileCacheQueueSchedular.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/schedular/FileCacheQueueSchedular.java
@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:13
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/schedular/QueueSchedular.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/schedular/QueueSchedular.java
@ -10,7 +10,7 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:13
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/schedular/Schedular.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/schedular/Schedular.java
@ -4,7 +4,7 @@ import us.codecraft.webmagic.Request;
 import us.codecraft.webmagic.Site;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:12
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/Html.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/Html.java
@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午7:54
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/PlainText.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/PlainText.java
@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午7:54
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexResult.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexResult.java
@ -1,7 +1,7 @@
 package us.codecraft.webmagic.selector;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午7:39
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexSelector.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexSelector.java
@ -9,7 +9,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午7:09
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/ReplaceSelector.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/ReplaceSelector.java
@ -6,7 +6,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午7:09
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/Selectable.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/Selectable.java
@ -3,7 +3,7 @@ package us.codecraft.webmagic.selector;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-20
 * Time: 下午7:51
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/Selector.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/Selector.java
@ -3,7 +3,7 @@ package us.codecraft.webmagic.selector;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-20
 * Time: 下午8:02
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/SelectorFactory.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/SelectorFactory.java
@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午7:56
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/SmartContentSelector.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/SmartContentSelector.java
@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
 * readability算法，基础是找到所有p标签的父节点
 * 写的比较乱，最终效果还在尝试中
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午4:42
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/selector/XpathSelector.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/selector/XpathSelector.java
@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午9:39
 */
--- a/webmagic-core/src/main/java/us/codecraft/webmagic/utils/UrlUtils.java
+++ b/webmagic-core/src/main/java/us/codecraft/webmagic/utils/UrlUtils.java
@ -6,7 +6,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:52
 */
--- a/webmagic-core/src/test/java/us/codecraft/webmagic/HtmlTest.java
+++ b/webmagic-core/src/test/java/us/codecraft/webmagic/HtmlTest.java
@ -5,7 +5,7 @@ import org.junit.Test;
 import us.codecraft.webmagic.selector.Html;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午8:42
 */
--- a/webmagic-core/src/test/java/us/codecraft/webmagic/selector/RegexSelectorTest.java
+++ b/webmagic-core/src/test/java/us/codecraft/webmagic/selector/RegexSelectorTest.java
@ -4,7 +4,7 @@ import junit.framework.Assert;
 import org.junit.Test;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 上午7:13
 */
--- a/webmagic-core/src/test/java/us/codecraft/webmagic/selector/XpathSelectorTest.java
+++ b/webmagic-core/src/test/java/us/codecraft/webmagic/selector/XpathSelectorTest.java
@ -4,7 +4,7 @@ import org.junit.Assert;
 import org.junit.Test;

 /**
- * User: cairne Date: 13-4-21 Time: 上午10:06
+ * Author: code4crafter@gmail.com Date: 13-4-21 Time: 上午10:06
 */
 public class XpathSelectorTest {

--- a/webmagic-core/src/test/java/us/codecraft/webmagic/utils/UrlUtilsTest.java
+++ b/webmagic-core/src/test/java/us/codecraft/webmagic/utils/UrlUtilsTest.java
@ -4,7 +4,7 @@ import org.junit.Assert;
 import org.junit.Test;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午2:22
 */
--- a/webmagic-plugin/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java
+++ b/webmagic-plugin/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java
@ -11,7 +11,7 @@ import us.codecraft.webmagic.utils.UrlUtils;
 import java.io.*;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-6-8
 * Time: 下午9:00
 */
--- a/webmagic-plugin/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java
+++ b/webmagic-plugin/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java
@ -6,7 +6,7 @@ import us.codecraft.webmagic.pipeline.FreemarkerPipeline;
 import java.io.IOException;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-6-9
 * Time: 上午7:14
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/DiandianBlogProcessor.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/DiandianBlogProcessor.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午8:08
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/DianpingBlogProcessor.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/DianpingBlogProcessor.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午8:08
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/DiaoyuwengProcessor.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/DiaoyuwengProcessor.java
@ -8,7 +8,7 @@ import us.codecraft.webmagic.selector.PlainText;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午8:08
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/F58PageProcesser.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/F58PageProcesser.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:48
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/HuxiuProcessor.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/HuxiuProcessor.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午8:08
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/KaichibaProcessor.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/KaichibaProcessor.java
@ -5,7 +5,7 @@ import us.codecraft.webmagic.Site;
 import us.codecraft.webmagic.processor.PageProcessor;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-5-20
 * Time: 下午5:31
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/MeicanProcessor.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/MeicanProcessor.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-5-20
 * Time: 下午5:31
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/NjuBBSProcessor.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/NjuBBSProcessor.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午8:08
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/OschinaBlogPageProcesser.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/OschinaBlogPageProcesser.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:48
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/OschinaPageProcesser.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/OschinaPageProcesser.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:48
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/QzoneBlogProcessor.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/QzoneBlogProcessor.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午8:08
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/SinaBlogProcesser.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/SinaBlogProcesser.java
@ -5,7 +5,7 @@ import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.processor.PageProcessor;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:48
 */
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/TianyaPageProcesser.java
+++ b/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/TianyaPageProcesser.java
@ -7,7 +7,7 @@ import us.codecraft.webmagic.processor.PageProcessor;
 import java.util.List;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-21
 * Time: 下午1:48
 */
--- a/webmagic-samples/src/test/java/us/codecraft/webmagic/SpiderTest.java
+++ b/webmagic-samples/src/test/java/us/codecraft/webmagic/SpiderTest.java
@ -8,7 +8,7 @@ import us.codecraft.webmagic.samples.HuxiuProcessor;
 import us.codecraft.webmagic.schedular.FileCacheQueueSchedular;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-4-20
 * Time: 下午7:46
 */
--- a/webmagic-samples/src/test/java/us/codecraft/webmagic/processor/DiandianProcessorTest.java
+++ b/webmagic-samples/src/test/java/us/codecraft/webmagic/processor/DiandianProcessorTest.java
@ -11,7 +11,7 @@ import us.codecraft.webmagic.schedular.FileCacheQueueSchedular;
 import java.io.IOException;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-6-9
 * Time: 上午8:02
 */
--- a/webmagic-samples/src/test/java/us/codecraft/webmagic/processor/DiaoyuwengProcessorTest.java
+++ b/webmagic-samples/src/test/java/us/codecraft/webmagic/processor/DiaoyuwengProcessorTest.java
@ -11,7 +11,7 @@ import us.codecraft.webmagic.schedular.FileCacheQueueSchedular;
 import java.io.IOException;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-6-9
 * Time: 上午8:02
 */
--- a/webmagic-samples/src/test/java/us/codecraft/webmagic/processor/SinablogProcessorTest.java
+++ b/webmagic-samples/src/test/java/us/codecraft/webmagic/processor/SinablogProcessorTest.java
@ -11,7 +11,7 @@ import us.codecraft.webmagic.schedular.FileCacheQueueSchedular;
 import java.io.IOException;

 /**
- * User: cairne
+ * Author: code4crafter@gmail.com
 * Date: 13-6-9
 * Time: 上午8:02
 */