fetch太慢去除历史提交记录
This commit is contained in:
@@ -0,0 +1,52 @@
|
||||
---
|
||||
name: "[BUG] 问题提交模板"
|
||||
about: 请从符号">"后面开始填写内容,填写内容可以参考 https://github.com/gedoor/legado/issues/505
|
||||
title: "[BUG] "
|
||||
labels: 'BUG'
|
||||
assignees: ''
|
||||
---
|
||||
|
||||
|
||||
### 机型(如Redmi K30 Pro)
|
||||
>
|
||||
|
||||
|
||||
### 安卓版本(如Android 7.1.1)
|
||||
>
|
||||
|
||||
|
||||
### 阅读Legdao版本(我的-关于-版本,如3.20.112220)
|
||||
>
|
||||
|
||||
### 网络环境(移动,联通,电信,移动宽带,联通宽带,电信宽带,等等..)
|
||||
>
|
||||
|
||||
|
||||
### 问题描述(简要描述发生的问题)
|
||||
>
|
||||
|
||||
|
||||
### 使用书源(填写URL或者JSON)
|
||||
>
|
||||
|
||||
|
||||
```json
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
```
|
||||
|
||||
### 复现步骤(详细描述导致问题产生的操作步骤,如果能稳定复现)
|
||||
>
|
||||
|
||||
|
||||
|
||||
|
||||
### 日志提交(问题截图或者日志)
|
||||
>
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
---
|
||||
name: "[FeatureRequest] 功能请求模板"
|
||||
about: 提交你希望能够在阅读中增加的功能
|
||||
title: "[Feature Request] "
|
||||
labels: '需求'
|
||||
assignees: ''
|
||||
---
|
||||
|
||||
### 功能描述(请清晰的、详细的描述你想要的功能)
|
||||
>
|
||||
|
||||
### 期望实现方式(阅读应该如何实现该功能)
|
||||
>
|
||||
|
||||
### 附加信息(其他的与功能相关的附加信息)
|
||||
>
|
||||
|
||||
### 效果演示(可以手绘一些草图,或者提供可借鉴的图片)
|
||||
>
|
||||
@@ -0,0 +1,98 @@
|
||||
import requests, os, datetime, sys
|
||||
|
||||
# Cookie 中 phpdisk_info 的值
|
||||
cookie_phpdisk_info = os.environ.get('phpdisk_info')
|
||||
# Cookie 中 ylogin 的值
|
||||
cookie_ylogin = os.environ.get('ylogin')
|
||||
|
||||
# 请求头
|
||||
headers = {
|
||||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.72 Safari/537.36 Edg/89.0.774.45',
|
||||
'Accept-Language': 'zh-CN,zh;q=0.9',
|
||||
'Referer': 'https://pc.woozooo.com/account.php?action=login'
|
||||
}
|
||||
|
||||
# 小饼干
|
||||
cookie = {
|
||||
'ylogin': cookie_ylogin,
|
||||
'phpdisk_info': cookie_phpdisk_info
|
||||
}
|
||||
|
||||
|
||||
# 日志打印
|
||||
def log(msg):
|
||||
utc_time = datetime.datetime.utcnow()
|
||||
china_time = utc_time + datetime.timedelta(hours=8)
|
||||
print(f"[{china_time.strftime('%Y.%m.%d %H:%M:%S')}] {msg}")
|
||||
|
||||
|
||||
# 检查是否已登录
|
||||
def login_by_cookie():
|
||||
url_account = "https://pc.woozooo.com/account.php"
|
||||
if cookie['phpdisk_info'] is None:
|
||||
log('ERROR: 请指定 Cookie 中 phpdisk_info 的值!')
|
||||
return False
|
||||
if cookie['ylogin'] is None:
|
||||
log('ERROR: 请指定 Cookie 中 ylogin 的值!')
|
||||
return False
|
||||
res = requests.get(url_account, headers=headers, cookies=cookie, verify=True)
|
||||
if '网盘用户登录' in res.text:
|
||||
log('ERROR: 登录失败,请更新Cookie')
|
||||
return False
|
||||
else:
|
||||
log('登录成功')
|
||||
return True
|
||||
|
||||
|
||||
# 上传文件
|
||||
def upload_file(file_dir, folder_id):
|
||||
file_name = os.path.basename(file_dir)
|
||||
url_upload = "https://up.woozooo.com/fileup.php"
|
||||
headers['Referer'] = f'https://up.woozooo.com/mydisk.php?item=files&action=index&u={cookie_ylogin}'
|
||||
post_data = {
|
||||
"task": "1",
|
||||
"folder_id": folder_id,
|
||||
"id": "WU_FILE_0",
|
||||
"name": file_name,
|
||||
}
|
||||
files = {'upload_file': (file_name, open(file_dir, "rb"), 'application/octet-stream')}
|
||||
res = requests.post(url_upload, data=post_data, files=files, headers=headers, cookies=cookie, timeout=120).json()
|
||||
log(f"{file_dir} -> {res['info']}")
|
||||
return res['zt'] == 1
|
||||
|
||||
|
||||
# 上传文件夹内的文件
|
||||
def upload_folder(folder_dir, folder_id):
|
||||
file_list = sorted(os.listdir(folder_dir), reverse=True)
|
||||
for file in file_list:
|
||||
path = os.path.join(folder_dir, file)
|
||||
if os.path.isfile(path):
|
||||
upload_file(path, folder_id)
|
||||
else:
|
||||
upload_folder(path, folder_id)
|
||||
|
||||
|
||||
# 上传
|
||||
def upload(dir, folder_id):
|
||||
if dir is None:
|
||||
log('ERROR: 请指定上传的文件路径')
|
||||
return
|
||||
if folder_id is None:
|
||||
log('ERROR: 请指定蓝奏云的文件夹id')
|
||||
return
|
||||
if os.path.isfile(dir):
|
||||
upload_file(dir, str(folder_id))
|
||||
else:
|
||||
upload_folder(dir, str(folder_id))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
argv = sys.argv[1:]
|
||||
if len(argv) != 2:
|
||||
log('ERROR: 参数错误,请以这种格式重新尝试\npython lzy_web.py 需上传的路径 蓝奏云文件夹id')
|
||||
# 需上传的路径
|
||||
upload_path = argv[0]
|
||||
# 蓝奏云文件夹id
|
||||
lzy_folder_id = argv[1]
|
||||
if login_by_cookie():
|
||||
upload(upload_path, lzy_folder_id)
|
||||
@@ -0,0 +1,47 @@
|
||||
import os, sys, telebot
|
||||
|
||||
# 上传文件
|
||||
def upload_file(tb, chat_id, file_dir):
|
||||
doc = open(file_dir, 'rb')
|
||||
tb.send_document(chat_id, doc)
|
||||
|
||||
# 上传文件夹内的文件
|
||||
def upload_folder(tb, chat_id, folder_dir):
|
||||
file_list = sorted(os.listdir(folder_dir))
|
||||
for file in file_list:
|
||||
path = os.path.join(folder_dir, file)
|
||||
if os.path.isfile(path):
|
||||
upload_file(tb, chat_id, path)
|
||||
else:
|
||||
upload_folder(tb, chat_id, path)
|
||||
|
||||
# 上传
|
||||
def upload(tb, chat_id, dir):
|
||||
if tb is None:
|
||||
log('ERROR: 输入正确的token')
|
||||
return
|
||||
if chat_id is None:
|
||||
log('ERROR: 输入正确的chat_id')
|
||||
return
|
||||
if dir is None:
|
||||
log('ERROR: 请指定上传的文件路径')
|
||||
return
|
||||
if os.path.isfile(dir):
|
||||
upload_file(tb, chat_id, dir)
|
||||
else:
|
||||
upload_folder(tb, chat_id, dir)
|
||||
|
||||
if __name__ == '__main__':
|
||||
argv = sys.argv[1:]
|
||||
if len(argv) != 3:
|
||||
log('ERROR: 参数错误,请以这种格式重新尝试\npython tg_bot.py $token $chat_id 待上传的路径')
|
||||
# Token
|
||||
TOKEN = argv[0]
|
||||
# chat_id
|
||||
chat_id = argv[1]
|
||||
# 待上传文件的路径
|
||||
upload_path = argv[2]
|
||||
#创建连接
|
||||
tb = telebot.TeleBot(TOKEN)
|
||||
#开始上传
|
||||
upload(tb, chat_id, upload_path)
|
||||
@@ -0,0 +1,32 @@
|
||||
#更新fork
|
||||
name: update fork
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 16 * * *' #设置定时任务
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ github.event.repository.owner.id == github.event.sender.id && github.actor != 'gedoor' }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install git
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get -y install git
|
||||
- name: Set env
|
||||
run: |
|
||||
git config --global user.email "github-actions@github.com"
|
||||
git config --global user.name "github-actions"
|
||||
- name: Update fork
|
||||
run: |
|
||||
git remote add upstream https://github.com/gedoor/legado.git
|
||||
git remote -v
|
||||
git fetch upstream
|
||||
git checkout master
|
||||
git merge upstream/master
|
||||
git push origin master
|
||||
Binary file not shown.
@@ -0,0 +1,99 @@
|
||||
name: Build and Release
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
paths:
|
||||
- 'CHANGELOG.md'
|
||||
# schedule:
|
||||
# - cron: '0 4 * * *'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
# 登录蓝奏云后在控制台运行document.cookie
|
||||
ylogin: ${{ secrets.LANZOU_ID }}
|
||||
phpdisk_info: ${{ secrets.LANZOU_PSD }}
|
||||
# 蓝奏云里的文件夹ID(阅读3测试版:2670621)
|
||||
LANZOU_FOLDER_ID: 'b0f7pt4ja'
|
||||
# 是否上传到artifact
|
||||
UPLOAD_ARTIFACT: 'true'
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches
|
||||
~/.gradle/wrapper
|
||||
key: ${{ runner.os }}-legado-${{ hashFiles('**/updateLog.md') }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-legado-${{ hashFiles('**/updateLog.md') }}-
|
||||
- name: Release Apk Sign
|
||||
run: |
|
||||
echo "给apk增加签名"
|
||||
cp $GITHUB_WORKSPACE/.github/workflows/legado.jks $GITHUB_WORKSPACE/app/legado.jks
|
||||
sed '$a\RELEASE_STORE_FILE=./legado.jks' $GITHUB_WORKSPACE/gradle.properties -i
|
||||
sed '$a\RELEASE_KEY_ALIAS=legado' $GITHUB_WORKSPACE/gradle.properties -i
|
||||
sed '$a\RELEASE_STORE_PASSWORD=gedoor_legado' $GITHUB_WORKSPACE/gradle.properties -i
|
||||
sed '$a\RELEASE_KEY_PASSWORD=gedoor_legado' $GITHUB_WORKSPACE/gradle.properties -i
|
||||
- name: Unify Version Name
|
||||
run: |
|
||||
echo "统一版本号"
|
||||
VERSION=$(date -d "8 hour" -u +3.%y.%m%d%H)
|
||||
echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
|
||||
sed "/def version/c def version = \"$VERSION\"" $GITHUB_WORKSPACE/app/build.gradle -i
|
||||
- name: Build With Gradle
|
||||
run: |
|
||||
echo "开始进行release构建"
|
||||
chmod +x gradlew
|
||||
./gradlew assembleRelease --build-cache --parallel
|
||||
- name: Organize the Files
|
||||
run: |
|
||||
mkdir -p ${{ github.workspace }}/apk/
|
||||
cp -rf ${{ github.workspace }}/app/build/outputs/apk/*/*/*.apk ${{ github.workspace }}/apk/
|
||||
- name: Upload App To Artifact
|
||||
if: ${{ env.UPLOAD_ARTIFACT != 'false' }}
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: legado apk
|
||||
path: ${{ github.workspace }}/apk/*.apk
|
||||
- name: Upload App To Lanzou
|
||||
if: ${{ env.ylogin }}
|
||||
run: |
|
||||
path="$GITHUB_WORKSPACE/apk/"
|
||||
python3 $GITHUB_WORKSPACE/.github/scripts/lzy_web.py "$path" "$LANZOU_FOLDER_ID"
|
||||
echo "[$(date -u -d '+8 hour' '+%Y.%m.%d %H:%M:%S')] 分享链接: https://kunfei.lanzoux.com/b0f7pt4ja"
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@59c3b4891632ff9a897f99a91d7bc557467a3a22
|
||||
with:
|
||||
name: legado_app_${{ env.RELEASE_VERSION }}
|
||||
tag_name: ${{ env.RELEASE_VERSION }}
|
||||
body_path: ${{ github.workspace }}/CHANGELOG.md
|
||||
draft: false
|
||||
prerelease: false
|
||||
files: ${{ github.workspace }}/apk/*.apk
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Push Assets To "release" Branch
|
||||
run: |
|
||||
cd $GITHUB_WORKSPACE/apk || exit 1
|
||||
git init
|
||||
git config --local user.name "github-actions[bot]"
|
||||
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git checkout -b release
|
||||
git add *.apk
|
||||
git commit -m "${{ env.RELEASE_VERSION }}"
|
||||
git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}"
|
||||
git push -f -u origin release
|
||||
- name: Purge Jsdelivr Cache
|
||||
run: |
|
||||
result=$(curl -s https://purge.jsdelivr.net/gh/${{ github.repository }}@release/)
|
||||
if echo $result |grep -q 'success.*true'; then
|
||||
echo "jsdelivr缓存更新成功"
|
||||
else
|
||||
echo $result
|
||||
fi
|
||||
@@ -0,0 +1,161 @@
|
||||
name: Test Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
prepare:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
version: ${{ steps.set-ver.outputs.version }}
|
||||
versionL: ${{ steps.set-ver.outputs.versionL }}
|
||||
lanzou: ${{ steps.check.outputs.lanzou }}
|
||||
telegram: ${{ steps.check.outputs.telegram }}
|
||||
steps:
|
||||
- id: set-ver
|
||||
run: |
|
||||
echo "::set-output name=version::$(date -d "8 hour" -u +3.%y.%m%d%H)"
|
||||
echo "::set-output name=versionL::$(date -d "8 hour" -u +3.%y.%m%d%H%M)"
|
||||
- id: check
|
||||
run: |
|
||||
if [ ${{ secrets.LANZOU_ID }} ]; then
|
||||
echo "::set-output name=lanzou::yes"
|
||||
fi
|
||||
if [ ${{ secrets.BOT_TOKEN }} ]; then
|
||||
echo "::set-output name=telegram::yes"
|
||||
fi
|
||||
|
||||
build:
|
||||
needs: prepare
|
||||
strategy:
|
||||
matrix:
|
||||
product: [app, google]
|
||||
type: [release, releaseA]
|
||||
fail-fast: false
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
product: ${{ matrix.product }}
|
||||
type: ${{ matrix.type }}
|
||||
VERSION: ${{ needs.prepare.outputs.version }}
|
||||
VERSIONL: ${{ needs.prepare.outputs.versionL }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches
|
||||
~/.gradle/wrapper
|
||||
key: ${{ runner.os }}-legado-${{ hashFiles('**/updateLog.md') }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-legado-${{ hashFiles('**/updateLog.md') }}-
|
||||
- name: Clear 18PlusList.txt
|
||||
run: |
|
||||
echo "清空18PlusList.txt"
|
||||
echo "">$GITHUB_WORKSPACE/app/src/main/assets/18PlusList.txt
|
||||
- name: Release Apk Sign
|
||||
run: |
|
||||
echo "给apk增加签名"
|
||||
cp $GITHUB_WORKSPACE/.github/workflows/legado.jks $GITHUB_WORKSPACE/app/legado.jks
|
||||
sed '$a\RELEASE_STORE_FILE=./legado.jks' $GITHUB_WORKSPACE/gradle.properties -i
|
||||
sed '$a\RELEASE_KEY_ALIAS=legado' $GITHUB_WORKSPACE/gradle.properties -i
|
||||
sed '$a\RELEASE_STORE_PASSWORD=gedoor_legado' $GITHUB_WORKSPACE/gradle.properties -i
|
||||
sed '$a\RELEASE_KEY_PASSWORD=gedoor_legado' $GITHUB_WORKSPACE/gradle.properties -i
|
||||
- name: Build With Gradle
|
||||
run: |
|
||||
if [ ${{ env.type }} == 'release' ]; then
|
||||
typeName="原包名"
|
||||
else
|
||||
typeName="共存"
|
||||
sed "s/'.release'/'.releaseA'/" $GITHUB_WORKSPACE/app/build.gradle -i
|
||||
sed 's/.release/.releaseA/' $GITHUB_WORKSPACE/app/google-services.json -i
|
||||
fi
|
||||
echo "统一版本号"
|
||||
sed "/def version/c def version = \"${{ env.VERSION }}\"" $GITHUB_WORKSPACE/app/build.gradle -i
|
||||
echo "开始${{ env.product }}$typeName构建"
|
||||
chmod +x gradlew
|
||||
./gradlew assemble${{ env.product }}release --build-cache --parallel --daemon --warning-mode all
|
||||
echo "修改文件名"
|
||||
mkdir -p ${{ github.workspace }}/apk/
|
||||
for file in `ls ${{ github.workspace }}/app/build/outputs/apk/*/*/*.apk`; do
|
||||
mv "$file" ${{ github.workspace }}/apk/legado_${{ env.product }}_${{ env.VERSIONL }}_$typeName.apk
|
||||
done
|
||||
- name: Upload App To Artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: legado.${{ env.product }}.${{ env.type }}
|
||||
path: ${{ github.workspace }}/apk/*.apk
|
||||
|
||||
lanzou:
|
||||
needs: [prepare, build]
|
||||
if: ${{ needs.prepare.outputs.lanzou }}
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
# 登录蓝奏云后在控制台运行document.cookie
|
||||
ylogin: ${{ secrets.LANZOU_ID }}
|
||||
phpdisk_info: ${{ secrets.LANZOU_PSD }}
|
||||
# 蓝奏云里的文件夹ID(阅读3测试版:2670621)
|
||||
LANZOU_FOLDER_ID: '2670621'
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/download-artifact@v2
|
||||
with:
|
||||
path: apk/
|
||||
- working-directory: apk/
|
||||
run: mv */*.apk . ;rm -rf */
|
||||
- name: Upload To Lanzou
|
||||
continue-on-error: true
|
||||
run: |
|
||||
path="$GITHUB_WORKSPACE/apk/"
|
||||
python3 $GITHUB_WORKSPACE/.github/scripts/lzy_web.py "$path" "$LANZOU_FOLDER_ID"
|
||||
echo "[$(date -u -d '+8 hour' '+%Y.%m.%d %H:%M:%S')] 分享链接: https://kunfei.lanzoux.com/b0f810h4b"
|
||||
|
||||
test_Branch:
|
||||
needs: [prepare, build]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/download-artifact@v2
|
||||
with:
|
||||
path: apk/
|
||||
- working-directory: apk/
|
||||
run: mv */*.apk . ;rm -rf */
|
||||
- name: Push To "test" Branch
|
||||
run: |
|
||||
cd $GITHUB_WORKSPACE/apk
|
||||
git init
|
||||
git config --local user.name "github-actions[bot]"
|
||||
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git checkout -b test
|
||||
git add *.apk
|
||||
git commit -m "${{ needs.prepare.outputs.versionL }}"
|
||||
git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}"
|
||||
git push -f -u origin test
|
||||
|
||||
telegram:
|
||||
needs: [prepare, build]
|
||||
if: ${{ needs.prepare.outputs.telegram }}
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
CHANNEL_ID: ${{ secrets.CHANNEL_ID }}
|
||||
BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/download-artifact@v2
|
||||
with:
|
||||
path: apk/
|
||||
- working-directory: apk/
|
||||
run: |
|
||||
for file in `ls */*.apk`; do
|
||||
mv "$file" "$(echo "$file"|sed -e 's#.*\/##g' -e "s/_/ /g" -e 's/legado/阅读/')"
|
||||
done
|
||||
rm -rf */
|
||||
- name: Post to channel
|
||||
run: |
|
||||
pip install pyTelegramBotAPI
|
||||
path="$GITHUB_WORKSPACE/apk/"
|
||||
python3 $GITHUB_WORKSPACE/.github/scripts/tg_bot.py "$BOT_TOKEN" "$CHANNEL_ID" "$path"
|
||||
Reference in New Issue
Block a user