Skip to content
This repository has been archived by the owner on Mar 3, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/Redcxx/Pikax
Browse files Browse the repository at this point in the history
  • Loading branch information
Redcxx committed Aug 12, 2019
2 parents fb8b48c + 8bd902f commit 7511f7c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions README.en.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Pikax:unicorn:
![GitHub stars](https://img.shields.io/github/stars/Redcxx/pikax?color=000&style=flat-square) ![PyPI](https://img.shields.io/pypi/v/pikax?color=000&style=flat-square) ![PyPI - License](https://img.shields.io/pypi/l/pikax?color=000&style=flat-square) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/Redcxx/pikax?color=000&style=flat-square) ![GitHub last commit](https://img.shields.io/github/last-commit/Redcxx/pikax?color=000&style=flat-square) ![PyPI - Downloads](https://img.shields.io/pypi/dw/pikax?color=000&style=flat-square)
![GitHub stars](https://img.shields.io/github/stars/Redcxx/pikax?color=000&style=flat-square) ![PyPI](https://img.shields.io/pypi/v/pikax?color=000&style=flat-square) ![PyPI - License](https://img.shields.io/pypi/l/pikax?color=000&style=flat-square) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/Redcxx/pikax?color=000&style=flat-square) ![GitHub last commit](https://img.shields.io/github/last-commit/Redcxx/pikax?color=000&style=flat-square) ![PyPI - Downloads](https://img.shields.io/pypi/dw/pikax?color=000&style=flat-square)<br>
Pikax's aim is to provide a simple yet powerful [Pixiv](https://www.pixiv.net/) mass download tool
#### [Chinese ver](https://github.com/Redcxx/Pixiv-Crawler/blob/master/README.md)
````
Expand All @@ -16,9 +16,9 @@ Pikax's aim is to provide a simple yet powerful [Pixiv](https://www.pixiv.net/)
```
### Currently supported features
- Search
- keyword/tags, limit, type, dimension, mode, popularity, r18
- keyword/tags, limit, type, mode, popularity
- Ranking
- mode, limit, date, content, r18
- mode, limit, date, content
- Yours or others
- illustrations, mangas, bookmarks
- Multiprocessing & multithreading download
Expand All @@ -33,15 +33,15 @@ Pikax's aim is to provide a simple yet powerful [Pixiv](https://www.pixiv.net/)
### For customization visits [settings.py](https://github.com/Redcxx/Pixiv-Crawler/blob/master/pikax/settings.py)
---
## Try [demo.py](https://github.com/Redcxx/Pixiv-Crawler/blob/master/demo.py)
#### Download today's top 20 illustration
#### Download today's top 50 illustration
```
from pikax.pikax import Pikax, params
pixiv = Pikax()
results = pixiv.rank(limit=50)
pixiv.download(results)
```
#### Search and download 10 arknights related horizontal non-r18 illustrations with 10000 likes (approx)
#### Search and download 50 arknights related horizontal non-r18 illustrations with 1000 likes (approx)
```
from pikax.pikax import Pikax, settings, params
Expand Down Expand Up @@ -111,4 +111,4 @@ Pikax's aim is to provide a simple yet powerful [Pixiv](https://www.pixiv.net/)
- I removed some functions such as configure r18 settings and dimension options for search, this is because in order to solve the login issue, I had to use an Android login entry point which does not support as much functionalities as the web logged user does. So in order to provide a consistent interface, I decided to remove them. Although I had found a way to solve the login issue of web, but it require a lot time to implement the technique and it requires a extra dependency, I am still a student and need to study ... I will try to fix them in the future when I am free, no guarantee though ...
- Instead of using string as parameters now I created params.py which contains enums covering almost all input parameters
- A brand new download printing is introduced for better ux, instead of popping out skips in the process, they will pop out together at the end, and now it has a est. time left
#### You can reach me by [email](mailto:[email protected])
#### You can reach me by [email](mailto:[email protected])
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Pikax:unicorn:
![GitHub stars](https://img.shields.io/github/stars/Redcxx/pikax?color=000&style=flat-square) ![PyPI](https://img.shields.io/pypi/v/pikax?color=000&style=flat-square) ![PyPI - License](https://img.shields.io/pypi/l/pikax?color=000&style=flat-square) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/Redcxx/pikax?color=000&style=flat-square) ![GitHub last commit](https://img.shields.io/github/last-commit/Redcxx/pikax?color=000&style=flat-square) ![PyPI - Downloads](https://img.shields.io/pypi/dw/pikax?color=000&style=flat-square)
![GitHub stars](https://img.shields.io/github/stars/Redcxx/pikax?color=000&style=flat-square) ![PyPI](https://img.shields.io/pypi/v/pikax?color=000&style=flat-square) ![PyPI - License](https://img.shields.io/pypi/l/pikax?color=000&style=flat-square) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/Redcxx/pikax?color=000&style=flat-square) ![GitHub last commit](https://img.shields.io/github/last-commit/Redcxx/pikax?color=000&style=flat-square) ![PyPI - Downloads](https://img.shields.io/pypi/dw/pikax?color=000&style=flat-square) <br>
Pikax的目的是提供一个使用简单且强大的[Pixiv](https://www.pixiv.net/)\[P站\]批量下载工具。
#### [English ver](https://github.com/Redcxx/Pixiv-Crawler/blob/master/README.en.md)

Expand All @@ -17,7 +17,7 @@ Pikax的目的是提供一个使用简单且强大的[Pixiv](https://www.pixiv.n
```
### 目前支持的下载功能
- 搜索
- 关键字/标签,数量,类别,尺寸,模式,受欢迎程度
- 关键字/标签,数量,类别,模式,受欢迎程度
- 排行榜
- 日期,数量,模式,内容种类
- 你的或者别人的
Expand All @@ -41,7 +41,7 @@ Pikax的目的是提供一个使用简单且强大的[Pixiv](https://www.pixiv.n
results = pixiv.rank(limit=50)
pixiv.download(results)
````
#### 搜索并下载arknights相关,赞数约10000的10张插画
#### 搜索并下载arknights相关,赞数约1000的50张插画
````
from pikax.pikax import Pikax, settings, params
Expand Down Expand Up @@ -112,4 +112,4 @@ Pikax的目的是提供一个使用简单且强大的[Pixiv](https://www.pixiv.n
- 现在基本上所有输入的参数都可以在params.py的找到,里面几乎涵盖了所有参数的枚举
- 更棒的打印,现在跳过的画作只会在下载后显示,而且加入了剩余时间的估算

#### 联系我可发邮件只到[这里](mailto:[email protected])
#### 联系我可发邮件到[这里](mailto:[email protected])

0 comments on commit 7511f7c

Please sign in to comment.