|
|
@ -91,17 +91,16 @@ object OldRule { |
|
|
|
return source |
|
|
|
return source |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private fun toNewUrls(oldUrl: String?): String? { |
|
|
|
private fun toNewUrls(oldUrls: String?): String? { |
|
|
|
if (oldUrl == null) return null |
|
|
|
if (oldUrls == null) return null |
|
|
|
if (!oldUrl.contains("\n") && !oldUrl.contains("&&")) |
|
|
|
if (!oldUrls.contains("\n") && !oldUrls.contains("&&")) |
|
|
|
return toNewUrl(oldUrl) |
|
|
|
return toNewUrl(oldUrls) |
|
|
|
|
|
|
|
|
|
|
|
val urls = oldUrl.split("(&&|\n)+".toRegex()) |
|
|
|
val urls = oldUrls.split("(&&|\n)+".toRegex()) |
|
|
|
var newUrl = "" |
|
|
|
val newUrls = urls.map { |
|
|
|
for (url in urls) { |
|
|
|
toNewUrl(it)?.replace("\n\\s*".toRegex(),"") |
|
|
|
newUrl += toNewUrl(url)?.replace("\\n\\s*".toRegex(),"") + "\n" |
|
|
|
}.joinToString("\n") |
|
|
|
} |
|
|
|
return newUrls |
|
|
|
return newUrl |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private fun toNewUrl(oldUrl: String?): String? { |
|
|
|
private fun toNewUrl(oldUrl: String?): String? { |
|
|
@ -133,8 +132,8 @@ object OldRule { |
|
|
|
url = url.replace("{", "<").replace("}", ">") |
|
|
|
url = url.replace("{", "<").replace("}", ">") |
|
|
|
url = url.replace("searchKey", "{{key}}") |
|
|
|
url = url.replace("searchKey", "{{key}}") |
|
|
|
url = url.replace("<searchPage([-+]1)>".toRegex(), "{{page$1}}") |
|
|
|
url = url.replace("<searchPage([-+]1)>".toRegex(), "{{page$1}}") |
|
|
|
.replace("searchPage([-+]1)".toRegex(), "{{page$1}}") |
|
|
|
.replace("searchPage([-+]1)".toRegex(), "{{page$1}}") |
|
|
|
.replace("searchPage", "{{page}}") |
|
|
|
.replace("searchPage", "{{page}}") |
|
|
|
for ((index, item) in jsList.withIndex()) { |
|
|
|
for ((index, item) in jsList.withIndex()) { |
|
|
|
url = url.replace("$$index", item.replace("searchKey", "key").replace("searchPage", "page")) |
|
|
|
url = url.replace("$$index", item.replace("searchKey", "key").replace("searchPage", "page")) |
|
|
|
} |
|
|
|
} |
|
|
|