UrlUtil.getFileName先尝试截取

This commit is contained in:
Xwite
2023-03-15 21:51:17 +08:00
parent 3096c7cc11
commit 3867b5893c
@@ -77,14 +77,14 @@ object UrlUtil {
// 其余情况 返回响应头 // 其余情况 返回响应头
val headers = conn.getHeaderFields() val headers = conn.getHeaderFields()
val headersString = buildString { val headersString = buildString {
headers.forEach( key, value -> headers.forEach { key, value ->
value.forEach { value.forEach {
append(key) append(key)
append(": ") append(": ")
append(it) append(it)
append("\n") append("\n")
} }
) }
} }
AppLog.putDebug("Cannot obtain URL file name:\n$headersString") AppLog.putDebug("Cannot obtain URL file name:\n$headersString")
} }
@@ -93,12 +93,12 @@ object UrlUtil {
} }
/* 获取合法的文件后缀 */ /* 获取合法的文件后缀 */
fun getSuffix(url: String, default: String): String { fun getSuffix(url: String, default: String? = null): String {
val suffix = url.substringAfterLast(".").substringBeforeLast(",") val suffix = url.substringAfterLast(".").substringBeforeLast(",")
//检查截取的后缀字符是否合法 [a-zA-Z0-9] //检查截取的后缀字符是否合法 [a-zA-Z0-9]
val fileSuffixRegex = Regex("^[a-z\\d]+$", RegexOption.IGNORE_CASE) val fileSuffixRegex = Regex("^[a-z\\d]+$", RegexOption.IGNORE_CASE)
return if (suffix.length > 5 || !suffix.matches(fileSuffixRegex)) { return if (suffix.length > 5 || !suffix.matches(fileSuffixRegex)) {
default default ?: throw IllegalArgumentException("Cannot find illegal suffix")
} else { } else {
suffix suffix
} }