renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei
2023-03-13 22:04:34 +08:00
parent bfff10623f 1a407e3a35
commit d04e227fa0
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
.github/scripts/cronet.sh vendored
View File

@@ -1,35 +1,54 @@
#!/usr/bin/env bash
#分支Stable Dev Beta
branch=$1
#api 最大偏移
max_offset=$2
[ -z $1 ] && branch=Stable
[ -z $2 ] && max_offset=3
[ -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
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
offset=$(expr $offset + 1)
echo "retry with offset $offset"
fetchExitVersion
else
exit
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

8
app/src/main/java/io/legado/app/help/storage/Backup.kt
View File

@@ -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)