change relation between url and pattern

Author: jikyll

src/main/java/scheduler/DispatchScheduler.java

@@ -16,8 +16,10 @@ public class DispatchScheduler implements Scheduler {
 	private static final String getProblemLinkPath = "//table[@class='table table-striped table-centered']/tbody/tr/td/a/text()";				//得到题目名称Xpath路径
 	private static final String submissionLinkPath = "//div[@class='row']/div/div/a/@href";																		//进入题目提交页面Xpath路径
 	private static final String codePagePath = "//table[@id='result_testcases']/tbody/tr/td/a/@href";															//进入题目代码页面Xpath路径
-	private static final String codePageStatusPath = "//table[@id='result_testcases]/t"
-																							+ "body/tr/td/a[@class='status-accepted text-success']/strong/text()";                     //题目提交状态Xpath路径
+//	private static final String codePageStatusPath = "//table[@id='result_testcases]/t"
+//																							+ "body/tr/td/a[@class='status-accepted text-success']/strong/text()";                     //题目提交状态Xpath路径
+//	private static final String codePageStatusPath = "//div[@class='row']/div/div/a/@href";
+	private static final String codePageStatusPath = "//a[@class='text-danger status-accepted']/@href";
 	private Logger myLog;
 	/**
 	 * 
@@ -35,7 +37,7 @@ public void startProcess() {
 			try {
 				myLog.debug("进入startProcess，试图初始化task queue");
 				List<String> list = downloader.problemListDownloader(problemLinkPath);
-				setTask(list);
+				setTask(list, null);
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}
@@ -77,19 +79,16 @@ public void taskProcceed() {
 	 * @since  1.0.0
 	 */
 	public void getDownloadResult(ParserTask task) throws InterruptedException {
-		if (task.getType() == ParserTask.TaskType.GET_SUBMISION_URL) {
-			myLog.debug("正在获取问题提交列表url");
-			List<String> list = downloader.problemDescriptionDownloader(task.getUrl(), submissionLinkPath);
-			setTask(list);
-		} else if (task.getType() == ParserTask.TaskType.GET_CODE_URL) {
-			myLog.debug("正在获取代码页面url");
-			List<String> list = downloader.submissionListDownloader(task.getUrl(), codePagePath);
-			setTask(list);
-		} else if (task.getType() == ParserTask.TaskType.GET_CODE) {
-			myLog.debug("正在获取代码");
-			//do something to get code
+		if (task.getType().equals(ParserTask.TaskType.SUBMISION_URL)) {
+			myLog.debug("该任务为获取问题代码");
+			List<String> list = downloader.problemDescriptionDownloader(task.getUrl(), codePageStatusPath);
+			setTask(list, task.getType());
+		} else if (task.getType().equals(ParserTask.TaskType.CODE_PAGE_URL)) {
+			//获取代码
 		} else {
-			System.out.println("无法识别该url，请填写正确的url。");
+			myLog.debug("正在获取问题提交列表，url为： " + task.getUrl());
+			List<String> list = downloader.problemDescriptionDownloader(task.getUrl(), submissionLinkPath);
+			setTask(list, task.getType());
 		}
 	}
 
@@ -102,10 +101,18 @@ public void getDownloadResult(ParserTask task) throws InterruptedException {
 	 * @exception
 	 * @since  1.0.0
 	 */
-	public void setTask(List<String> list) throws InterruptedException {
+	public void setTask(List<String> list, ParserTask.TaskType type) throws InterruptedException {
+		if (list.size() == 0) return;
+		if (type != null && type.equals(ParserTask.TaskType.SUBMISION_URL)) {
+			ParserTask task = new ParserTask(new StringBuilder("https://leetcode.com").append(list.get(0)).toString());
+			myLog.debug("正在进行入栈操作，task的url为： " + task.getUrl());
+			task.isType();
+			queue.put(task);
+			return;
+		}
 		for (String value: list) {
 			ParserTask task = new ParserTask(new StringBuilder("https://leetcode.com").append(value).toString());
-			myLog.debug("task的url为： " + task.getUrl());
+			myLog.debug("正在进行入栈操作，task的url为： " + task.getUrl());
 			task.isType();
 			queue.put(task);
 		}

src/main/java/scheduler/ParserTask.java

@@ -10,6 +10,7 @@ public class ParserTask implements Comparable<ParserTask>{
 	private static final String submissionListURL = ".*/submissions/$"; // 检验是否是题目提交列表页面
 	private static final String problemCodeURL = ".*/submissions/detail/.*"; // 检验是否是题目代码页面
 	private static final String problemListURL = ".*/problemset/algorithms/$"; // 检验是否是题目列表页面
+	private static final String problemDescription = ".*/problems/.*";
 	private Logger myLog;
 
 	/**
@@ -21,7 +22,7 @@ public class ParserTask implements Comparable<ParserTask>{
 	 *
 	 */
 	static enum TaskType {
-		GET_PROBLEM_LIST_URL, GET_SUBMISION_URL, GET_CODE_URL, GET_CODE
+		PROBLEM_URL, SUBMISION_URL, CODE_PAGE_URL
 	}
 
 	private String url;
@@ -71,14 +72,15 @@ public TaskType getType() {
 	 * @since  1.0.0
 	 */
 	public void isType() {
-		if (checkPattern(url, problemListURL)) {
-			type = TaskType.GET_PROBLEM_LIST_URL;
+		if (checkPattern(url, submissionListURL)) {
+			myLog.debug("设定task类型为SUBMISION_URL");
+			type = TaskType.SUBMISION_URL;
 		} else if (checkPattern(url, problemCodeURL)) {
-			type = TaskType.GET_CODE_URL;
-		} else if (checkPattern(url, submissionListURL)) {
-			type = TaskType.GET_SUBMISION_URL;
+			myLog.debug("设定task类型为CODE_PAGE_URL");
+			type = TaskType.CODE_PAGE_URL;
 		} else {
-			type = TaskType.GET_CODE;
+			myLog.debug("设定task类型为PROBLEM_URL");
+			type = TaskType.PROBLEM_URL;
 		}
 	}
 
@@ -103,6 +105,6 @@ public boolean checkPattern(String url, String patternString) {
 	 * 复写Comparable接口方法
 	 */
 	public int compareTo(ParserTask o) {
-		return o.type.ordinal()-this.type.ordinal();
+		return this.type.ordinal()-o.type.ordinal();
 	}
 }