Ma63d · Kherrisan · Feb 11, 2019 · Feb 12, 2019 · Feb 21, 2019 · Mar 29, 2020
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@ private.*
 log/*
 .DS_Store
 result.json
-npm-debug.log
+npm-debug.log
+.vscode
+config.json
diff --git a/README.md b/README.md
@@ -1,115 +1,35 @@
-# 此项目已不再维护，有需要者，欢迎 fork
-苦于工作繁忙，我已经不刷题很久了，没有使用需求就难以保持爬虫逻辑紧跟 leetcode 官网更新。欢迎 fork，解决需求。
-
-# leetcode-spider [![npm package](https://img.shields.io/npm/v/leetcode-spider.svg)](https://www.npmjs.com/package/leetcode-spider)
-
-使用 JS 编写的 leetcode 解题源码爬虫.爬取你自己的 leetcode 解题源码.
-
-如果你也想把你在 [leetcode](https://leetcode.com/) 上提交且 accepted 的解题代码爬下来,那么本工具就是为此需求而生!爬下来的代码可以放在 github 上管理和开源出来,可以作为个人展示,更可以借助 [leetcode-viewer](https://github.com/Ma63d/leetcode-viewer) 将代码通过一个单页应用完美展现,几条命令就可以呈现一个 leetcode 源码博客,交流和展示搞起来!
-
-## 新版本来了
-
-- 支持使用模板语法来配置你自己的 README.md 模板了！
-- 新增部分配置项
-- 优化 README.md 输出:
-  ![](img/example.png)
-- 优化网络错误处理机制
-
-
-**需要 Node 4.0 及以上版本!**
-
-## 安装 Installation
-
-```
-npm i leetcode-spider -g
-```
-
-
-## 使用 Usage
-
-请事先建立好如下 json 文件(以命名为 config.json 为例):
-
-
-```
-{
-	"username" : "hello@gmail.com",
-	"password" : "xxxxxxxxx",
-	"language": ["java","c++","c"],
-	"outputDir": "./solutions", (可选字段)
-	"template": "./README.tpl" (可选字段)
-}
-```
-
-- `username` 和 `password` 对应你的的 leetcode 账户.
-
-
-- `language` 对应于你用来解 leetcode 的编程语言,该项为一个数组,即使只有一种语言.
-目前 `language` 字段支持填写所有 leetcode 的编程语言:
-    - `c++`(别填`cpp`)
-    - `c`
-    - `java`
-    - `javascript` (别填`js`)
-    - `python`
-    - `c#` (别填`csharp`)
-    - `ruby`
-    - `swift`
-    - `go`
-
-- `outputDir` **选填**，表示你希望存放源码文件的目录，默认`"./solutions"`
-- `template` **选填**，表示你自己定义的 README.tpl 路径，默认 "./README.tpl"
-
-
-## 运行 Execution
-
-```
-lc-spider // 默认使用config.json为配置文件运行爬虫
-```
-**程序会记录上一次爬取了哪些题目,之前爬取过的题目再次运行的时候不会爬取,除非你通过-n选项手动指定.**
-
-**这也意味着,当你在进行增量爬取时,根本不需要去指定要爬哪些题目, leetcode-spider 会自动知道哪些题目需要爬.**
-
-举个例子,按照我们的日常使用:
-
-* 当你昨天 A 了5道题,你用爬虫爬了下来
-* 然后今天你 A 了6道题,你今天再次运行程序
-
-程序此时会自动检查你跟上一次爬取结果相比多写了哪些题,然后把这些新增的代码爬取下来,不会重复的去爬取,你也不用手工指定你今天 AC 了哪些题.
-
-永远只用一行命令: `lc-spider`.(除非你想要再去爬以前爬过的题,比如你改进了修改了原先AC的代码,想把新代码爬下来,或者你新增了另一种语言的解法, 那么这种时候可以用-n选项指定具体要爬取的题目,请参考[选项](https://github.com/Ma63d/leetcode-spider#选项)章节的具体内容.)
-
-此外源码对应的 leetcode 的题目,也会爬取下来,放在代码目录, markdown 格式.
-
-爬取完成后会自动生成 README.md 文件,当你把爬下来的代码放在 github 上时,README.md 起一个介绍和导航的作用.另外，有的同学的 config.json 文件是直接放在当前的代码存放目录的，那你在把这个目录上传到 github 上之前，请记得写 `.gitignore` 文件，在里面忽略掉你的 config.json 文件！不然你的用户名和密码也传到 github 上公开给大家了（虽然 leetcode 账户屁用没有）。
-
-如果你运行 lc-spider 却显示无法找到命令,首先请确认一下你在 npm 安装 lc-spider 的时候是否是全局安装(也就是有没有那个`-g`),如果你是全局安装的,那就是你的 npm 的环境变量配置得不对了,请参考百度的 fis 团队写的 [这篇文章](https://github.com/fex-team/fis/issues/565),方便不熟悉 npm 的同学解决自己遇到的问题.
-
-## 模板功能
-
-嫌默认生成自带的 README.md 不好看？嫌我写的文案不够好？ 
-没关系，现在你可以自定义你的 README.md 模板，使用 [mustache](https://github.com/janl/mustache.js) 语法（就是 vue 用的那一套），自己书写你的 README.md 模板： 
-
-leetcode-spider 第一次运行之后会在你运行命令的目录下生成 [README.tpl](https://github.com/Ma63d/leetcode-spider/blob/master/lib/README.tpl) 文件，如果你对默认生成的 README.md 文件不满意，那你自行修改这个 README.tpl 模板文件即可。程序会在下次运行时使用这个模板文件来生成  README.md .
-
-
-
-## 帮助 Help
-```
-lc-spider -h
-```
-
-## 选项
-
-### -config or -c
-```
-lc-spider -c xxx.json
-```
-
-使用指定的配置文件运行 lc-spider. 默认使用的是 config.json.
-
-### -number or -n
-```
-lc-spider -n 2-15 3 78-101
-```
-
-只爬取你指定的题目,可以使用连字符(如15-100),此处指定的是需要爬取的题号.程序会检查哪些题目你 AC 了,因此你可以放心的填写.比如你a了200-300之间的某几道题,但是不想一个个的指定出来,那你就大胆的写上200-300,程序会查找200-300范围内你 AC 的源码,并爬取下来.
+<p align="center"><img width="300" src="https://raw.githubusercontent.com/Ma63d/leetcode-spider/master/img/site-logo.png"></p>
+<p align="center">
+    <img src="https://img.shields.io/badge/Solved/Total(Locked)-16/1586(294)-green.svg?style=flat-square" alt="">
+    <img src="https://img.shields.io/badge/Hard-0-blue.svg?style=flat-square" alt="">
+    <img src="https://img.shields.io/badge/Medium-6-blue.svg?style=flat-square" alt="">
+    <img src="https://img.shields.io/badge/Easy-8-blue.svg?style=flat-square" alt="">
+</p>
+<h3 align="center">My leetcode solutions</h3>
+
+<p align="center">
+    <b>Language: java c++</b>
+    <br>
+    <b>Last updated: 2020-03-29</b>
+    <br><br>
+</p>
+<!--请保留下面这行信息，让更多用户了解到这个小爬虫，衷心感谢您的支持-->
+<p align="center">The source code is fetched using the tool <a href="https://github.com/Ma63d/leetcode-spider">leetcode-spider</a>.</p>
+
+| # | Problems | Solutions | Difficulty | Acceptance | Paid-Only
+|:--:|:-----:|:---------:|:----:|:----:|:----:|
+|169|[majority-element](https://leetcode-cn.com/problems/majority-element/)| [java](.&#x2F;solutions&#x2F;169.majority-element&#x2F;majority-element.java)|Easy|62.80%||
+|300|[longest-increasing-subsequence](https://leetcode-cn.com/problems/longest-increasing-subsequence/)| [java](.&#x2F;solutions&#x2F;300.longest-increasing-subsequence&#x2F;longest-increasing-subsequence.java)|Medium|44.00%||
+|365|[water-and-jug-problem](https://leetcode-cn.com/problems/water-and-jug-problem/)| [java](.&#x2F;solutions&#x2F;365.water-and-jug-problem&#x2F;water-and-jug-problem.java)|Medium|35.11%||
+|409|[longest-palindrome](https://leetcode-cn.com/problems/longest-palindrome/)| [java](.&#x2F;solutions&#x2F;409.longest-palindrome&#x2F;longest-palindrome.java)|Easy|54.93%||
+|695|[max-area-of-island](https://leetcode-cn.com/problems/max-area-of-island/)| [java](.&#x2F;solutions&#x2F;695.max-area-of-island&#x2F;max-area-of-island.java)|Medium|63.12%||
+|820|[short-encoding-of-words](https://leetcode-cn.com/problems/short-encoding-of-words/)| [java](.&#x2F;solutions&#x2F;820.short-encoding-of-words&#x2F;short-encoding-of-words.java)|Medium|48.32%||
+|836|[rectangle-overlap](https://leetcode-cn.com/problems/rectangle-overlap/)| [java](.&#x2F;solutions&#x2F;836.rectangle-overlap&#x2F;rectangle-overlap.java)|Easy|49.87%||
+|876|[middle-of-the-linked-list](https://leetcode-cn.com/problems/middle-of-the-linked-list/)| [java](.&#x2F;solutions&#x2F;876.middle-of-the-linked-list&#x2F;middle-of-the-linked-list.java)|Easy|68.67%||
+|892|[surface-area-of-3d-shapes](https://leetcode-cn.com/problems/surface-area-of-3d-shapes/)| [java](.&#x2F;solutions&#x2F;892.surface-area-of-3d-shapes&#x2F;surface-area-of-3d-shapes.java)|Easy|64.39%||
+|914|[x-of-a-kind-in-a-deck-of-cards](https://leetcode-cn.com/problems/x-of-a-kind-in-a-deck-of-cards/)| [java](.&#x2F;solutions&#x2F;914.x-of-a-kind-in-a-deck-of-cards&#x2F;x-of-a-kind-in-a-deck-of-cards.java)|Easy|39.32%||
+|945|[minimum-increment-to-make-array-unique](https://leetcode-cn.com/problems/minimum-increment-to-make-array-unique/)| [java](.&#x2F;solutions&#x2F;945.minimum-increment-to-make-array-unique&#x2F;minimum-increment-to-make-array-unique.java)|Medium|47.56%||
+|999|[available-captures-for-rook](https://leetcode-cn.com/problems/available-captures-for-rook/)| [java](.&#x2F;solutions&#x2F;999.available-captures-for-rook&#x2F;available-captures-for-rook.java)|Easy|69.37%||
+|1160|[find-words-that-can-be-formed-by-characters](https://leetcode-cn.com/problems/find-words-that-can-be-formed-by-characters/)| [java](.&#x2F;solutions&#x2F;1160.find-words-that-can-be-formed-by-characters&#x2F;find-words-that-can-be-formed-by-characters.java)|Easy|69.48%||
+|1162|[as-far-from-land-as-possible](https://leetcode-cn.com/problems/as-far-from-land-as-possible/)| [java](.&#x2F;solutions&#x2F;1162.as-far-from-land-as-possible&#x2F;as-far-from-land-as-possible.java)|Medium|43.93%||
 
diff --git a/README.tpl b/README.tpl
@@ -0,0 +1,24 @@
+<p align="center"><img width="300" src="https://raw.githubusercontent.com/Ma63d/leetcode-spider/master/img/site-logo.png"></p>
+<p align="center">
+    <img src="https://img.shields.io/badge/Solved/Total(Locked)-{{solved}}/{{total}}({{locked}})-green.svg?style=flat-square" alt="">
+    <img src="https://img.shields.io/badge/Hard-{{hard}}-blue.svg?style=flat-square" alt="">
+    <img src="https://img.shields.io/badge/Medium-{{medium}}-blue.svg?style=flat-square" alt="">
+    <img src="https://img.shields.io/badge/Easy-{{easy}}-blue.svg?style=flat-square" alt="">
+</p>
+<h3 align="center">My leetcode solutions</h3>
+
+<p align="center">
+    <b>Language: {{language}}</b>
+    <br>
+    <b>Last updated: {{time}}</b>
+    <br><br>
+</p>
+<!--请保留下面这行信息，让更多用户了解到这个小爬虫，衷心感谢您的支持-->
+<p align="center">The source code is fetched using the tool <a href="https://github.com/Ma63d/leetcode-spider">leetcode-spider</a>.</p>
+
+| # | Problems | Solutions | Difficulty | Acceptance | Paid-Only
+|:--:|:-----:|:---------:|:----:|:----:|:----:|
+{{#solutions}}
+|{{id}}|[{{title}}](https://leetcode-cn.com/problems/{{title}}/)|{{solutionLinks}}|{{difficulty}}|{{acceptance}}|{{paidOnly}}|
+{{/solutions}}
+
diff --git a/lib/README.tpl b/lib/README.tpl
@@ -19,6 +19,6 @@
 | # | Problems | Solutions | Difficulty | Acceptance | Paid-Only
 |:--:|:-----:|:---------:|:----:|:----:|:----:|
 {{#solutions}}
-|{{id}}|[{{title}}](https://leetcode.com/problems/{{title}}/)|{{solutionLinks}}|{{difficulty}}|{{acceptance}}|{{paidOnly}}|
+|{{id}}|[{{title}}](https://leetcode-cn.com/problems/{{title}}/)|{{solutionLinks}}|{{difficulty}}|{{acceptance}}|{{paidOnly}}|
 {{/solutions}}
 
diff --git a/lib/file.js b/lib/file.js
@@ -31,7 +31,7 @@ let write = co.wrap(function * (pathToWrite, content) {
  * @api public
  */
 exports.writeToFile = co.wrap(function * (languageCodeMap, solutionsDirPath) {
-    const outputPath = path.resolve(solutionsDirPath, formatId(languageCodeMap._id) + '.' + languageCodeMap._title)
+    const outputPath = path.resolve(solutionsDirPath, languageCodeMap._frontendId + '.' + languageCodeMap._title)
     ensureDirectoryExists(outputPath)
     try {
         let solveLang = []
@@ -51,19 +51,19 @@ exports.writeToFile = co.wrap(function * (languageCodeMap, solutionsDirPath) {
     }
 })
 
-/**
- * Format id to 3-bit.
- *
- * @param {Number} id
- * @return {String}
- * @api public
- */
-function formatId (id) {
-    if (id < 10) {
-        return '00' + id
-    } else if (id < 100) {
-        return '0' + id
-    } else {
-        return '' + id
-    }
-}
+// /**
+//  * Format id to 3-bit.
+//  *
+//  * @param {Number} id
+//  * @return {String}
+//  * @api public
+//  */
+// function formatId (id) {
+//     if (id < 10) {
+//         return '00' + id
+//     } else if (id < 100) {
+//         return '0' + id
+//     } else {
+//         return '' + id
+//     }
+// }
diff --git a/lib/generateMD.js b/lib/generateMD.js
@@ -39,7 +39,7 @@ exports.generateMarkdown = co.wrap(function * (resultObj, leetcodeNumObj, output
     }).sort()
     let solutions = []
     problemNumbers.forEach(id => {
-        let idStr = formatId(id)
+        let idStr = id
         let solutionLinks = ``
         resultObj[id].language.forEach(lang => {
             solutionLinks += ` [${lang}](./${outputDir}/${idStr}.${resultObj[id].title}/${resultObj[id].title}.${language.nameMap[lang]})`
@@ -102,15 +102,15 @@ function getTimeStr (fmt) {
     return fmt
 }
 
-function formatId (id) {
-    if (id < 10) {
-        return '00' + id
-    } else if (id < 100) {
-        return '0' + id
-    } else {
-        return '' + id
-    }
-}
+// function formatId (id) {
+//     if (id < 10) {
+//         return '00' + id
+//     } else if (id < 100) {
+//         return '0' + id
+//     } else {
+//         return '' + id
+//     }
+// }
 function leveToStr (level) {
     switch (level) {
     case 1: return 'Easy'

diff --git a/lib/result.js b/lib/result.js
@@ -3,6 +3,7 @@ const fs = require('fs')
 const co = require('co')
 const thenifyAll = require('thenify-all')
 const thenFs = thenifyAll(fs, {}, ['stat', 'unlink', 'writeFile'])
+const logger = require('log4js').getLogger('layout-pattern')
 
 let result
 
@@ -14,7 +15,7 @@ let result
  *      @return {Object} last spider result
  * @api public
  */
-exports.getResult = co.wrap(function * (resultJsonPath) {
+exports.getResult = co.wrap(function* (resultJsonPath) {
     try {
         let stats = yield thenFs.stat(resultJsonPath)
         if (stats.isFile()) {
@@ -39,20 +40,22 @@ exports.getResult = co.wrap(function * (resultJsonPath) {
  *      @return {Object} result
  * @api public
  */
-exports.writeResult = co.wrap(function * (languageCodeMapArr, leetcodeNumObj, resultJsonPath) {
+exports.writeResult = co.wrap(function* (languageCodeMapArr, leetcodeNumObj, resultJsonPath) {
+    logger.info("Build result.json")
     languageCodeMapArr.forEach(element => {
         let ele = {}
-        result[element['_id']] = ele
+        result[element['_frontendId']] = ele
         ele.id = element['_id']
         ele.level = element['_level']
         ele.title = element['_title']
         ele.paidOnly = element['_paid_only']
         ele.acceptance = element['_acceptance']
         ele.language = element['_solveLang']
     })
-    yield thenFs.unlink(resultJsonPath).catch(function () {})
+    yield thenFs.unlink(resultJsonPath).catch(function () { })
     result.lastUpdatedTime = getTimeStr('yyyy-MM-dd')
     Object.assign(result, leetcodeNumObj)
+    logger.info("Write to result.json : " + JSON.stringify(result))
     yield thenFs.writeFile(resultJsonPath, JSON.stringify(result))
     return result
 })
@@ -64,7 +67,7 @@ exports.writeResult = co.wrap(function * (languageCodeMapArr, leetcodeNumObj, re
  * @return {String}
  * @api public
  */
-function getTimeStr (fmt) {
+function getTimeStr(fmt) {
     let time = new Date()
     let o = {
         'M+': time.getMonth() + 1, // 月份

diff --git a/lib/runtimeConf.js b/lib/runtimeConf.js
@@ -1,4 +1,4 @@
 'use strict'
 module.exports = {
-    concurrency: 30
+    concurrency: 4
 }