[pull] master from lushdog:master

.dockerignore

@@ -0,0 +1 @@
+node_modules

.gitignore

@@ -2,3 +2,4 @@ config.json
 node_modules/
 data/*
 !data/.gitkeep
+test.js

Dockerfile

@@ -0,0 +1,14 @@
+FROM node:14.15.4-slim
+
+ENV NODE_ENV=production
+ENV RUN_ENV=docker
+
+WORKDIR /app
+
+COPY package.json yarn.lock ./
+
+RUN yarn install
+
+COPY . .
+
+CMD ["node", "index.js"]

README.docker.md

@@ -0,0 +1,20 @@
+# 使用docker运行
+
+首先新建配置文件config.json, 将example.config.json模版的配置复制进去然后修改
+### 运行
+`yourconfig`是配置文件的路径，`yourwatch`是下载软件监控文件夹
+
+```bash
+docker run --name ptpfl -d -v /yourconfig:/config -v /yourwatch:/watch trancelife/ptpfl
+```
+
+### 进入容器
+
+```bash
+docker exec -it ptpfl /bin/sh 
+```
+### 查看日志
+
+```bash
+ docker logs ptpfl -f
+```

README.md

@@ -1,9 +1,14 @@
+## [中文](https://github.com/lushdog/ptpfl/blob/master/README.zh-CN.md)
+## [Docker运行](https://github.com/lushdog/ptpfl/blob/master/README.docker.md)
+
 # PassThePopcorn Freeleech Automator
 
 A node.js script that automates the downloading of PassThePopcorn freeleech torrents.
 
 ### To install
 
+`npm install pm2 -g`
+
 `npm install`
 
 Copy `example.config.json` to `config.json` and fill in your apiUser and apiKey credentials from your user profile.
@@ -12,7 +17,11 @@ Add a `downloadPath` to `config.json` to have the torrents added to your torrent
 
 ### To run
 
-`npm start`
+`pm2 start index.js`
+
+### Log
+
+`pm2 log index`
 
 ### Discord notifications
 
@@ -34,7 +43,14 @@ Configuration options with defaults shown
   "maxsize": -1, // Maximum size in megabytes. Set to -1 for unlimited.
   "maxAge": -1, // Maximum time in minutes since torrent was uploaded. See below note.
   "downloadPath": "", // Path to download .torrent files to. Optional.
-  "discordWebhookUrl": "" // Discord webhook URI. Optional.
+  "discordWebhookUrl": "", // Discord webhook URI. Optional.
+  "interval": 15,// Download interval.
+  "GoldenPopcorn": true, // Download all GoldenPopcorn.
+  "page": 1, // page
+  "matchByAgeAndMaxSeeders": [
+    { "maxAge": 600, "maxSeeders": 5 },
+    { "maxAge": 1200, "maxSeeders": 2 }
+  ] // For new Freeleeh which uploaded some time ago but had a few seeders. 
 }
 ```
 

README.zh-CN.md

@@ -0,0 +1,79 @@
+# PTP免费种子下载
+
+一个自动下载ptp免费种子的nodejs程序.
+
+### 安装
+
+依赖nodejs环境, 推荐使用nvm安装。
+
+`wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash`
+
+`source .profile`
+
+然后安装nodejs
+
+`nvm install stable`
+
+安装pm2
+
+`npm install pm2 -g`
+
+下载代码
+
+`git clone https://github.com/lushdog/ptpfl.git`
+
+进入到ptpfl目录下, 安装依赖
+
+`npm install`
+
+修改配置文件: 复制`example.config.json`为`config.json`, 填上你的apiUser和apiKey(ptp网站edit-security)
+
+### 运行(ptpfl目录下)
+
+`pm2 start index.js --name "myapp"`
+
+### 查看日志
+
+`pm2 log myapp`
+
+### 暂停
+
+`pm2 stop myapp`
+
+### 重启
+
+`pm2 restart myapp`
+
+### Discord 通知
+
+需要在下载种子时收到通知的可以填上discordWebhookUrl, discord使用方法可以google
+
+### 配置说明
+
+```javascript
+{
+  "apiUser": "", // apiUser.
+  "apiKey": "", // apiKey.
+  "minseeders": -1, // 最少做种数. -1表示无限制.
+  "maxseeders": -1, // 最大做种数. -1表示无限制.
+  "minleechers": -1, // 最少下载数. -1表示无限制.
+  "maxleechers": -1, // 最大下载数. -1表示无限制.
+  "minsize": -1, // 种子最小大小（单位mb）. -1表示无限制.
+  "maxsize": -1, // 种子最大大小（单位mb）. -1表示无限制.
+  "maxAge": -1, // 种子上传最大时间（单位分钟）.
+  "downloadPath": "/watch", // 下载软件的监控文件夹路径，种子文件下载到这里.(如果用docker启动请填'/watch')
+  "discordWebhookUrl": "", // Discord机器人url, 可选.
+  "interval": 15,// 运行间隔时间. 实测一个小时超过20次管理员有可能会发私信要求调整！！，所以不要设置低于3.
+  "GoldenPopcorn": true, // 是否下载金种（会忽略所有其他条件）.
+  "page": 1, // 爬的页数，50个种子为一页，有时候免费种子会超过一页。 爬取多页会重复调用ptp的api. 实测一个小时调用超过20次管理员有可能会发私信要求调整
+  "matchByAgeAndMaxSeeders": [
+    { "maxAge": 600, "maxSeeders": 5 },
+    { "maxAge": 1200, "maxSeeders": 2 }
+  ] // 见 上传时间和做种人数组合筛选
+}
+```
+
+#### 上传时间和做种人数组合筛选
+
+根据上传时间和做种人数组合筛选，因为有很多很老的种子加为免费种，做种人数很少，也有刷的价值。上边例子的过滤为: 上传10个小时以内，做种小于5; 上传20个小时以内, 做种小于5; 可以根据自己情况调整。
+

example.config.json

@@ -9,5 +9,12 @@
 	"maxSize": -1,
 	"maxAge": -1,
 	"downloadPath": "",
-	"discordWebhookUrl": ""
+	"discordWebhookUrl": "",
+	"interval": 10,
+	"GoldenPopcorn": false,
+	"page": 1,
+	"matchByAgeAndMaxSeeders": [
+    { "maxAge": 600, "maxSeeders": 5 },
+    { "maxAge": 1200, "maxSeeders": 2 }
+  ]
 }

index.js

@@ -1 +1,13 @@
-require('./src')();
+const app = require('./src')
+const schedule = require('node-schedule')
+const RUN_ENV = process.env.RUN_ENV
+const interval = require(RUN_ENV === 'docker' ? '/config/config.json' : './config.json').interval
+
+let index = 1
+const scheduleJob = async () => { 
+  console.log(index)
+  index ++
+  await app()
+}
+
+schedule.scheduleJob(`*/${interval} * * * *`, scheduleJob)

package.json

@@ -9,9 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "dayjs": "^1.8.16",
     "directory-exists": "^2.0.1",
     "discord.js": "^11.5.1",
     "import-fresh": "^3.1.0",
-    "node-fetch": "^2.6.0"
+    "node-fetch": "^2.6.0",
+    "node-schedule": "^2.1.0"
   }
 }

src/index.js

@@ -4,9 +4,19 @@ const { validateConfig, fetchTorrents, torrentMatchesFilters, writeTorrentCache
 
 module.exports = async function() {
 	try {
-		const config = await validateConfig(),
-			{ torrents, authKey, passKey } = await fetchTorrents(config.apiUser, config.apiKey);
-
+		const config = await validateConfig()
+		const { page } = config
+		const	{ torrents, authKey, passKey, totalResults } = await fetchTorrents(config.apiUser, config.apiKey);
+		let pageNum = Math.ceil(totalResults/50)
+		if (page !== -1) {
+			pageNum = page
+		}
+		if (pageNum >= 2) {
+			for (let index = 2; index <= pageNum; index++) {
+				const result = await fetchTorrents(config.apiUser, config.apiKey, index);
+				torrents.push(...result.torrents);
+			}
+		}
 		for (const torrent of torrents) {
 			if (torrentMatchesFilters(torrent, config)) {
 				await downloadTorrent({ torrent, authKey, passKey }, config);