From 785bd0b43d3ebdcaf4c5a8d828f402ed3bd09f03 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 21:21:37 +0800 Subject: [PATCH 01/10] [skip ci] --- .github/scripts/cronet.sh | 33 ++++++++++++++----- .../app/ui/book/info/BookInfoActivity.kt | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.github/scripts/cronet.sh b/.github/scripts/cronet.sh index 2a6b865d2..acaf9d504 100644 --- a/.github/scripts/cronet.sh +++ b/.github/scripts/cronet.sh @@ -4,32 +4,47 @@ branch=$1 [ -z $1 ] && branch=Stable [ -z $GITHUB_ENV ] && echo "Error: Unexpected github workflow environment" && exit -# 获取最新cronet版本 -echo "fetch $branch release info from https://chromiumdash.appspot.com ..." -lastest_cronet_version=`curl -s "https://chromiumdash.appspot.com/fetch_releases?channel=$branch&platform=Android&num=1&offset=0" | jq .[0].version -r` -echo "lastest_cronet_version: $lastest_cronet_version" -#lastest_cronet_version=100.0.4845.0 -lastest_cronet_main_version=${lastest_cronet_version%%\.*}.0.0.0 -# 检查版本是否存在 +offset=0 +max_offset=3 + +function fetchExitVersion() { + # 获取最新cronet版本 + echo "fetch $branch release info from https://chromiumdash.appspot.com ..." + lastest_cronet_version=`curl -s "https://chromiumdash.appspot.com/fetch_releases?channel=$branch&platform=Android&num=1&offset=$offset" | jq .[0].version -r` + echo "lastest_cronet_version: $lastest_cronet_version" + #lastest_cronet_version=100.0.4845.0 + lastest_cronet_main_version=${lastest_cronet_version%%\.*}.0.0.0 + checkVersionExit +} function checkVersionExit() { + # 检查版本是否存在 local jar_url="https://storage.googleapis.com/chromium-cronet/android/$lastest_cronet_version/Release/cronet/cronet_api.jar" statusCode=$(curl -s -I -w %{http_code} "$jar_url" -o /dev/null) if [ $statusCode == "404" ];then echo "storage.googleapis.com return 404 for cronet $lastest_cronet_version" - exit + if [[ $max_offset > $offset ]]; then + echo "retry with offset $offset" + fetchVersion + offset=$(expr $offset + 1) + else + exist + fi fi } # 添加变量到github env function writeVariableToGithubEnv() { echo "$1=$2" >> $GITHUB_ENV } + +########## # 获取本地cronet版本 path=$GITHUB_WORKSPACE/gradle.properties current_cronet_version=`cat $path | grep CronetVersion | sed s/CronetVersion=//` echo "current_cronet_version: $current_cronet_version" +fetchExitVersion + if [[ $current_cronet_version < $lastest_cronet_version ]];then - checkVersionExit # 更新gradle.properties sed -i s/CronetVersion=.*/CronetVersion=$lastest_cronet_version/ $path sed -i s/CronetMainVersion=.*/CronetMainVersion=$lastest_cronet_main_version/ $path diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 9ecdbd512..cf14f5d14 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -262,7 +262,7 @@ class BookInfoActivity : tvLasted.text = getString(R.string.lasted_show, book.latestChapterTitle) tvIntro.text = book.getDisplayIntro() llToc?.visible(!book.isWebFile) - editMenuItem?.visible(viewModel.inBookshelf) + editMenuItem?.isVisible = viewModel.inBookshelf upTvBookshelf() val kinds = book.getKindList() if (kinds.isEmpty()) { From 070f235e636a173c35f65ffc09c917942b05a835 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Mon, 13 Mar 2023 21:23:14 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/help/storage/Backup.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/storage/Backup.kt b/app/src/main/java/io/legado/app/help/storage/Backup.kt index 69a8a1884..0a008878f 100644 --- a/app/src/main/java/io/legado/app/help/storage/Backup.kt +++ b/app/src/main/java/io/legado/app/help/storage/Backup.kt @@ -151,13 +151,13 @@ object Backup { if (ZipUtils.zipFiles(paths, zipFilePath)) { when { path.isNullOrBlank() -> { - copyBackup(context.getExternalFilesDir(null)!!, zipFileName) + copyBackup(context.getExternalFilesDir(null)!!, "backup.zip") } path.isContentScheme() -> { - copyBackup(context, Uri.parse(path), zipFileName) + copyBackup(context, Uri.parse(path), "backup.zip") } else -> { - copyBackup(File(path), zipFileName) + copyBackup(File(path), "backup.zip") } } AppWebDav.backUpWebDav(zipFileName) @@ -175,6 +175,7 @@ object Backup { } @Throws(Exception::class) + @Suppress("SameParameterValue") private fun copyBackup(context: Context, uri: Uri, fileName: String) { DocumentFile.fromTreeUri(context, uri)?.let { treeDoc -> treeDoc.findFile(fileName)?.delete() @@ -187,6 +188,7 @@ object Backup { } @Throws(Exception::class) + @Suppress("SameParameterValue") private fun copyBackup(rootFile: File, fileName: String) { FileInputStream(File(zipFilePath)).use { inputS -> val file = FileUtils.createFileIfNotExist(rootFile, fileName) From 5d4c942609f604d3061340242c8adaa7035dd469 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 21:34:18 +0800 Subject: [PATCH 03/10] [skip ci] --- .github/scripts/cronet.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/scripts/cronet.sh b/.github/scripts/cronet.sh index acaf9d504..123b6f4da 100644 --- a/.github/scripts/cronet.sh +++ b/.github/scripts/cronet.sh @@ -1,11 +1,15 @@ #!/usr/bin/env bash +#分支Stable Dev Beta branch=$1 +#api 最大偏移 +max_offset=$2 + [ -z $1 ] && branch=Stable +[ -z $2 ] && branch=S3 [ -z $GITHUB_ENV ] && echo "Error: Unexpected github workflow environment" && exit offset=0 -max_offset=3 function fetchExitVersion() { # 获取最新cronet版本 @@ -23,9 +27,9 @@ function checkVersionExit() { if [ $statusCode == "404" ];then echo "storage.googleapis.com return 404 for cronet $lastest_cronet_version" if [[ $max_offset > $offset ]]; then + offset=$(expr $offset + 1) echo "retry with offset $offset" fetchVersion - offset=$(expr $offset + 1) else exist fi From 40ea01703313098e560a37486f0d9e9f8fe9e7b6 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 21:36:08 +0800 Subject: [PATCH 04/10] [skip ci] --- .github/scripts/cronet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/cronet.sh b/.github/scripts/cronet.sh index 123b6f4da..244df70af 100644 --- a/.github/scripts/cronet.sh +++ b/.github/scripts/cronet.sh @@ -31,7 +31,7 @@ function checkVersionExit() { echo "retry with offset $offset" fetchVersion else - exist + exit fi fi } From efc5bfd1e6550192e46810b560a956779ffe619c Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 21:37:32 +0800 Subject: [PATCH 05/10] [skip ci] --- .github/scripts/cronet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/cronet.sh b/.github/scripts/cronet.sh index 244df70af..78f1c4bef 100644 --- a/.github/scripts/cronet.sh +++ b/.github/scripts/cronet.sh @@ -6,7 +6,7 @@ branch=$1 max_offset=$2 [ -z $1 ] && branch=Stable -[ -z $2 ] && branch=S3 +[ -z $2 ] && max_offset=3 [ -z $GITHUB_ENV ] && echo "Error: Unexpected github workflow environment" && exit offset=0 From 78578207ce3f33d69e1ef0b3d607cf4689e6b7a8 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 21:42:28 +0800 Subject: [PATCH 06/10] [skip ci] Delete workflow runs --- .github/scripts/cronet.sh | 2 +- .github/workflows/cronet.yml | 7 +++++++ .github/workflows/test.yml | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/scripts/cronet.sh b/.github/scripts/cronet.sh index 78f1c4bef..aa592f3bf 100644 --- a/.github/scripts/cronet.sh +++ b/.github/scripts/cronet.sh @@ -29,7 +29,7 @@ function checkVersionExit() { if [[ $max_offset > $offset ]]; then offset=$(expr $offset + 1) echo "retry with offset $offset" - fetchVersion + fetchExitVersion else exit fi diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml index 3280eb0cc..6842e4005 100644 --- a/.github/workflows/cronet.yml +++ b/.github/workflows/cronet.yml @@ -40,3 +40,10 @@ jobs: *cronet.json *updateLog.md gradle.properties + - name: Delete workflow runs + uses: Mattraks/delete-workflow-runs@v2 + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: 2 + keep_minimum_runs: 3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 161641ba3..60732f1f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -103,6 +103,13 @@ jobs: with: name: legado.${{ env.product }}.${{ env.type }} path: ${{ github.workspace }}/apk/*.apk + - name: Delete workflow runs + uses: Mattraks/delete-workflow-runs@v2 + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: 30 + keep_minimum_runs: 30 lanzou: needs: [ prepare, build ] From 962f172fb09e221e07d108fbbdb17ef8e9f1629d Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 21:51:50 +0800 Subject: [PATCH 07/10] [skip ci] Delete workflow runs --- .github/workflows/cronet.yml | 1 + .github/workflows/stale.yml | 2 +- .github/workflows/test.yml | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml index 6842e4005..8319b62c3 100644 --- a/.github/workflows/cronet.yml +++ b/.github/workflows/cronet.yml @@ -42,6 +42,7 @@ jobs: gradle.properties - name: Delete workflow runs uses: Mattraks/delete-workflow-runs@v2 + continue-on-error: true with: token: ${{ github.token }} repository: ${{ github.repository }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index ff905039f..1ec3648b1 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -7,7 +7,7 @@ name: closeStaleIssue on: schedule: - - cron: '30 1 * * *' + - cron: '30 1 0/5 * *' jobs: stale: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 60732f1f7..161641ba3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -103,13 +103,6 @@ jobs: with: name: legado.${{ env.product }}.${{ env.type }} path: ${{ github.workspace }}/apk/*.apk - - name: Delete workflow runs - uses: Mattraks/delete-workflow-runs@v2 - with: - token: ${{ github.token }} - repository: ${{ github.repository }} - retain_days: 30 - keep_minimum_runs: 30 lanzou: needs: [ prepare, build ] From 0138265af9146a7eed45c43a93bb8ddfc99e285b Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 21:52:49 +0800 Subject: [PATCH 08/10] [skip ci] Delete workflow runs --- .github/workflows/workflow.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/workflow.yml diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml new file mode 100644 index 000000000..2897c1cd9 --- /dev/null +++ b/.github/workflows/workflow.yml @@ -0,0 +1,19 @@ + +name: delete old workflows + +on: + schedule: + - cron: '0 16 0/7 * *' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Delete workflow runs + uses: Mattraks/delete-workflow-runs@v2 + continue-on-error: true + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: 30 + keep_minimum_runs: 30 From d56ff65bcbabca5ecabcdc943d20cee9687cf4bb Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 22:01:05 +0800 Subject: [PATCH 09/10] revert --- .github/workflows/cronet.yml | 8 -------- .github/workflows/workflow.yml | 19 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 .github/workflows/workflow.yml diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml index 8319b62c3..3280eb0cc 100644 --- a/.github/workflows/cronet.yml +++ b/.github/workflows/cronet.yml @@ -40,11 +40,3 @@ jobs: *cronet.json *updateLog.md gradle.properties - - name: Delete workflow runs - uses: Mattraks/delete-workflow-runs@v2 - continue-on-error: true - with: - token: ${{ github.token }} - repository: ${{ github.repository }} - retain_days: 2 - keep_minimum_runs: 3 diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml deleted file mode 100644 index 2897c1cd9..000000000 --- a/.github/workflows/workflow.yml +++ /dev/null @@ -1,19 +0,0 @@ - -name: delete old workflows - -on: - schedule: - - cron: '0 16 0/7 * *' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Delete workflow runs - uses: Mattraks/delete-workflow-runs@v2 - continue-on-error: true - with: - token: ${{ github.token }} - repository: ${{ github.repository }} - retain_days: 30 - keep_minimum_runs: 30 From 1a407e3a357e7f36125fcb299eaf1ade4abec9b2 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 13 Mar 2023 22:02:03 +0800 Subject: [PATCH 10/10] [skip ci] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1ec3648b1..ff905039f 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -7,7 +7,7 @@ name: closeStaleIssue on: schedule: - - cron: '30 1 0/5 * *' + - cron: '30 1 * * *' jobs: stale: