Merge remote-tracking branch 'origin/master'

pull/2176/head
kunfei 2 years ago
commit c80a0905d6
  1. 2
      .github/workflows/autoupdatefork.yml
  2. 4
      .github/workflows/cronet.yml
  3. 6
      .github/workflows/release.yml
  4. 2
      .github/workflows/stale.yml
  5. 12
      .github/workflows/test.yml
  6. 33
      English.md

@ -11,7 +11,7 @@ jobs:
if: ${{ github.event.repository.owner.id == github.event.sender.id && github.actor != 'gedoor' }} if: ${{ github.event.repository.owner.id == github.event.sender.id && github.actor != 'gedoor' }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install git - name: Install git

@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.actor == 'gedoor' }} if: ${{ github.actor == 'gedoor' }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
fetch-depth: 1 fetch-depth: 1
@ -22,7 +22,7 @@ jobs:
echo "PR_BODY=Changes in the [Git log](https://chromium.googlesource.com/chromium/src/+log/$current_cronet_version..$lastest_cronet_version)" >> $GITHUB_ENV echo "PR_BODY=Changes in the [Git log](https://chromium.googlesource.com/chromium/src/+log/$current_cronet_version..$lastest_cronet_version)" >> $GITHUB_ENV
- name: Create Pull Request - name: Create Pull Request
uses: peter-evans/create-pull-request@v3 uses: peter-evans/create-pull-request@v4
continue-on-error: true continue-on-error: true
with: with:
token: ${{ secrets.ACTIONS_TOKEN }} token: ${{ secrets.ACTIONS_TOKEN }}

@ -42,11 +42,11 @@ jobs:
VERSION: ${{ needs.prepare.outputs.version }} VERSION: ${{ needs.prepare.outputs.version }}
play: ${{ needs.prepare.outputs.play }} play: ${{ needs.prepare.outputs.play }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
fetch-depth: 1 fetch-depth: 1
- uses: actions/cache@v2 - uses: actions/cache@v3
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches
@ -81,7 +81,7 @@ jobs:
cp -rf ${{ github.workspace }}/app/build/outputs/apk/*/*/*.apk ${{ github.workspace }}/apk/ cp -rf ${{ github.workspace }}/app/build/outputs/apk/*/*/*.apk ${{ github.workspace }}/apk/
- name: Upload App To Artifact - name: Upload App To Artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: legado_${{ env.product }} name: legado_${{ env.product }}
path: ${{ github.workspace }}/apk/*.apk path: ${{ github.workspace }}/apk/*.apk

@ -18,7 +18,7 @@ jobs:
issues: write issues: write
steps: steps:
- uses: actions/stale@v3 - uses: actions/stale@v5
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: '由于长期没有状态更新,该问题将于5天后自动关闭。如有需要可重新打开。' stale-issue-message: '由于长期没有状态更新,该问题将于5天后自动关闭。如有需要可重新打开。'

@ -47,10 +47,10 @@ jobs:
VERSION: ${{ needs.prepare.outputs.version }} VERSION: ${{ needs.prepare.outputs.version }}
VERSIONL: ${{ needs.prepare.outputs.versionL }} VERSIONL: ${{ needs.prepare.outputs.versionL }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/cache@v2 - uses: actions/cache@v3
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches
@ -90,7 +90,7 @@ jobs:
mv "$file" ${{ github.workspace }}/apk/legado_${{ env.product }}_${{ env.VERSIONL }}_$typeName.apk mv "$file" ${{ github.workspace }}/apk/legado_${{ env.product }}_${{ env.VERSIONL }}_$typeName.apk
done done
- name: Upload App To Artifact - name: Upload App To Artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: legado.${{ env.product }}.${{ env.type }} name: legado.${{ env.product }}.${{ env.type }}
path: ${{ github.workspace }}/apk/*.apk path: ${{ github.workspace }}/apk/*.apk
@ -106,7 +106,7 @@ jobs:
# 蓝奏云里的文件夹ID(阅读3测试版:2670621) # 蓝奏云里的文件夹ID(阅读3测试版:2670621)
LANZOU_FOLDER_ID: '2670621' LANZOU_FOLDER_ID: '2670621'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
with: with:
path: apk/ path: apk/
@ -124,7 +124,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' && github.actor == 'gedoor' }} if: ${{ github.event_name != 'pull_request' && github.actor == 'gedoor' }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
with: with:
path: apk/ path: apk/
@ -150,7 +150,7 @@ jobs:
CHANNEL_ID: ${{ secrets.CHANNEL_ID }} CHANNEL_ID: ${{ secrets.CHANNEL_ID }}
BOT_TOKEN: ${{ secrets.BOT_TOKEN }} BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
with: with:
path: apk/ path: apk/

@ -1,9 +1,6 @@
# [English](English.md) [中文](README.md) # [English](English.md) [中文](README.md)
[![icon_android](https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/icon_android.png)](https://play.google.com/store/apps/details?id=io.legado.play.release) [![icon_android](https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/icon_android.png)](https://play.google.com/store/apps/details?id=io.legado.play.release)
<a href="https://data.newrank.cn/m/s.html?s=NykyOzI9MS5LNQ%3D%3D" target="_blank">
<img src="https://img.shields.io/badge/-微信关注“开源阅读”公众号-orange.svg" alt="#" align="right">
</a>
<div align="center"> <div align="center">
<img width="125" height="125" src="https://github.com/gedoor/legado/raw/master/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" alt="legado"/> <img width="125" height="125" src="https://github.com/gedoor/legado/raw/master/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" alt="legado"/>
@ -49,11 +46,13 @@ You can customize the book source, set your own rules, and capture web page data
<a href="#readme"> <a href="#readme">
<img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="#" align="right"> <img src="https://img.shields.io/badge/-Top-orange.svg" alt="#" align="right">
</a> </a>
# Download [![](https://img.shields.io/badge/-Download-F5F5F5.svg)](#Download-) # Download [![](https://img.shields.io/badge/-Download-F5F5F5.svg)](#Download-)
#### Android #### Android
* [Releases](https://github.com/gedoor/legado/releases/latest) * [Releases](https://github.com/gedoor/legado/releases/latest)
* [Google play - $1.99](https://play.google.com/store/apps/details?id=io.legado.play.release) * [Google play - $1.99](https://play.google.com/store/apps/details?id=io.legado.play.release)
* [Coolapk](https://www.coolapk.com/apk/io.legado.app.release) * [Coolapk](https://www.coolapk.com/apk/io.legado.app.release)
@ -63,51 +62,61 @@ You can customize the book source, set your own rules, and capture web page data
#### IOS #### IOS
* Stopped(No release) - [Github](https://github.com/gedoor/YueDuFlutter) * Stopped(No release) - [Github](https://github.com/gedoor/YueDuFlutter)
<a href="#readme"> <a href="#readme">
<img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="#" align="right"> <img src="https://img.shields.io/badge/-Top-orange.svg" alt="#" align="right">
</a> </a>
# Community [![](https://img.shields.io/badge/-Community-F5F5F5.svg)](#Community-) # Community [![](https://img.shields.io/badge/-Community-F5F5F5.svg)](#Community-)
#### Telegram #### Telegram
[![Telegram-group](https://img.shields.io/badge/Telegram-%E7%BE%A4%E7%BB%84-blue)](https://t.me/yueduguanfang) [![Telegram-channel](https://img.shields.io/badge/Telegram-%E9%A2%91%E9%81%93-blue)](https://t.me/legado_channels)
[![Telegram-group](https://img.shields.io/badge/Telegram-group-blue)](https://t.me/yueduguanfang) [![Telegram-channel](https://img.shields.io/badge/Telegram-channel-blue)](https://t.me/legado_channels)
#### Discord #### Discord
[![Discord](https://img.shields.io/discord/560731361414086666?color=%235865f2&label=Discord)](https://discord.gg/VtUfRyzRXn) [![Discord](https://img.shields.io/discord/560731361414086666?color=%235865f2&label=Discord)](https://discord.gg/VtUfRyzRXn)
#### Other #### Other
https://www.yuque.com/legado/wiki/community https://www.yuque.com/legado/wiki/community
<a href="#readme"> <a href="#readme">
<img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="#" align="right"> <img src="https://img.shields.io/badge/-Top-orange.svg" alt="#" align="right">
</a> </a>
# API [![](https://img.shields.io/badge/-API-F5F5F5.svg)](#API-) # API [![](https://img.shields.io/badge/-API-F5F5F5.svg)](#API-)
* Legado 3.0 The API is provided in 2 ways: `Web way` and `Content Provider way`. You can call it yourself as needed in [here](api.md). * Legado 3.0 The API is provided in 2 ways: `Web way` and `Content Provider way`. You can call it yourself as needed in [here](api.md).
* One-click import by url recall reading, url format: legado://import/{path}?src={url} * One-click import by url recall reading, url format: legado://import/{path}?src={url}
* Path Type: bookSource,rssSource,replaceRule,textTocRule,httpTTS,theme,readConfig * Path Type: bookSource,rssSource,replaceRule,textTocRule,httpTTS,theme,readConfig
* path type explanation: Book source, subscription source, replacement rules, local txt novel directory rules, online reading engine, theme, reading layout * path type explanation: Book source, subscription source, replacement rules, local txt novel directory rules, online reading engine, theme, reading layout
<a href="#readme"> <a href="#readme">
<img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="#" align="right"> <img src="https://img.shields.io/badge/-Top-orange.svg" alt="#" align="right">
</a> </a>
# Other [![](https://img.shields.io/badge/-Other-F5F5F5.svg)](#Other-) # Other [![](https://img.shields.io/badge/-Other-F5F5F5.svg)](#Other-)
##### Disclaimers ##### Disclaimers
https://gedoor.github.io/about.html https://gedoor.github.io/about.html
##### Legado 3.0 ##### Legado 3.0
* [eBook sources rules](https://alanskycn.gitee.io/teachme) * [eBook sources rules](https://alanskycn.gitee.io/teachme)
* [Update Log](/app/src/main/assets/updateLog.md) * [Update Log](/app/src/main/assets/updateLog.md)
* [Help Documentation](/app/src/main/assets/help/appHelp.md) * [Help Documentation](/app/src/main/assets/help/appHelp.md)
* [web](https://github.com/gedoor/legado_web_bookshelf) * [web](https://github.com/gedoor/legado_web_bookshelf)
<a href="#readme"> <a href="#readme">
<img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="#" align="right"> <img src="https://img.shields.io/badge/-Top-orange.svg" alt="#" align="right">
</a> </a>
# Grateful [![](https://img.shields.io/badge/-Grateful-F5F5F5.svg)](#Grateful-) # Grateful [![](https://img.shields.io/badge/-Grateful-F5F5F5.svg)](#Grateful-)
> * org.jsoup:jsoup > * org.jsoup:jsoup
> * cn.wanghaomiao:JsoupXpath > * cn.wanghaomiao:JsoupXpath
> * com.jayway.jsonpath:json-path > * com.jayway.jsonpath:json-path
@ -123,14 +132,16 @@ https://gedoor.github.io/about.html
> * io.noties.markwon:image-glide > * io.noties.markwon:image-glide
> * com.hankcs:hanlp > * com.hankcs:hanlp
> * com.positiondev.epublib:epublib-core > * com.positiondev.epublib:epublib-core
<a href="#readme"> <a href="#readme">
<img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="#" align="right"> <img src="https://img.shields.io/badge/-Top-orange.svg" alt="#" align="right">
</a> </a>
# Interface [![](https://img.shields.io/badge/-Interface-F5F5F5.svg)](#Interface-) # Interface [![](https://img.shields.io/badge/-Interface-F5F5F5.svg)](#Interface-)
<img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B1.jpg" width="270"><img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B2.jpg" width="270"><img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B3.jpg" width="270"> <img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B1.jpg" width="270"><img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B2.jpg" width="270"><img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B3.jpg" width="270">
<img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B4.jpg" width="270"><img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B5.jpg" width="270"><img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B6.jpg" width="270"> <img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B4.jpg" width="270"><img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B5.jpg" width="270"><img src="https://github.com/gedoor/gedoor.github.io/blob/master/static/img/legado/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B6.jpg" width="270">
<a href="#readme"> <a href="#readme">
<img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="#" align="right"> <img src="https://img.shields.io/badge/-Top-orange.svg" alt="#" align="right">
</a> </a>

Loading…
Cancel
Save