diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index ff905039f..74dd0bce6 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -13,7 +13,7 @@ jobs: stale: runs-on: ubuntu-latest - if: ${{ github.actor == 'gedoor' }} + if: ${{ github.repository == 'gedoor/legado' }} permissions: issues: write diff --git a/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt index 6e31646a1..06fddad74 100644 --- a/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt @@ -93,7 +93,7 @@ abstract class BaseImportBookActivity : VMBaseActivity + value.forEach { + append(key) + append(": ") + append(it) + append("\n") + } + } + } + AppLog.put("${url.toString()} response header:\n$headersString") + } + // val fileSize = conn.getContentLengthLong() / 1024 - /** Content-Disposition 存在三种情况 + /** Content-Disposition 存在三种情况 文件名应该用引号 有些用空格 * filename="filename" - * filename=filename - * filename*=charset''filename + * filename*="charset''filename" */ val raw: String? = conn.getHeaderField("Content-Disposition") // Location跳转到实际链接 @@ -90,13 +106,13 @@ object UrlUtil { val names = hashSetOf() fileNames.forEach { var fileName = it.substringAfter("=") + .trim() + .replace("^\"".toRegex(), "") + .replace("\"$".toRegex(), "") if (it.contains("filename*")) { val data = fileName.split("''") names.add(URLDecoder.decode(data[1], data[0])) } else { - fileName = fileName - .replace("^\"".toRegex(), "") - .replace("\"$".toRegex(), "") names.add( String( fileName.toByteArray(StandardCharsets.ISO_8859_1), @@ -110,19 +126,7 @@ object UrlUtil { val newUrl= URL(URLDecoder.decode(redirectUrl, "UTF-8")) getFileNameFromPath(newUrl) } else { - // 其余情况 返回响应头 - val headers = conn.headerFields - val headersString = buildString { - headers.forEach { (key, value) -> - value.forEach { - append(key) - append(": ") - append(it) - append("\n") - } - } - } - AppLog.put("Cannot obtain URL file name:\n$headersString") + AppLog.put("Cannot obtain URL file name, enable recordLog for detail") null } }