Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

emojiConverterの依存関係を更新

This commit is contained in:
tateisu 2022-07-14 13:05:23 +09:00
parent 6ac50da328
commit f7564dcecf
9 changed files with 1207 additions and 1213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_Emoji/emojiConverter/.idea/compiler.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="14" /> <bytecodeTargetLevel target="1.8" />
</component> </component>
</project> </project>

2
_Emoji/emojiConverter/.idea/misc.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="true" project-jdk-name="14" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="14" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

12
_Emoji/emojiConverter/build.gradle
View File

@ -1,6 +1,6 @@
plugins { plugins {
id 'java' id 'java'
id 'org.jetbrains.kotlin.jvm' version '1.5.10' id 'org.jetbrains.kotlin.jvm' version '1.7.10'
} }
group 'jp.juggler' group 'jp.juggler'
@ -12,22 +12,22 @@ repositories {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'src/lib') implementation fileTree(include: ['*.jar'], dir: 'src/lib')
implementation "com.google.guava:guava:28.1-jre" implementation "com.google.guava:guava:31.1-jre"
implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "org.jetbrains.kotlin:kotlin-stdlib"
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
def ktorVersion="1.5.0" def ktorVersion="2.0.3"
implementation "io.ktor:ktor-client-core:$ktorVersion" implementation "io.ktor:ktor-client-core:$ktorVersion"
implementation "io.ktor:ktor-client-cio:$ktorVersion" implementation "io.ktor:ktor-client-cio:$ktorVersion"
implementation "io.ktor:ktor-client-features:$ktorVersion" // implementation "io.ktor:ktor-client-features:$ktorVersion"
implementation "io.ktor:ktor-client-encoding:$ktorVersion" implementation "io.ktor:ktor-client-encoding:$ktorVersion"
// StringEscapeUtils.unescapeHtml4 // StringEscapeUtils.unescapeHtml4
implementation "org.apache.commons:commons-text:1.9" implementation "org.apache.commons:commons-text:1.9"
// HTML5パーサ // HTML5パーサ
implementation "org.jsoup:jsoup:1.13.1" implementation "org.jsoup:jsoup:1.14.3"
} }
test { test {

2
_Emoji/emojiConverter/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
_Emoji/emojiConverter/src/main/kotlin/jp/juggler/subwaytooter/emoji/Json.kt
View File

@ -860,7 +860,7 @@ private fun Writer.writeQuote(string: String): Writer {
in '\u0080' until '\u00a0', in '\u0080' until '\u00a0',
in '\u2000' until '\u2100' -> { in '\u2000' until '\u2100' -> {
write("\\u") write("\\u")
val hexCode: String = Integer.toHexString(c.toInt()) val hexCode: String = Integer.toHexString(c.code)
write("0000", 0, 4 - hexCode.length) write("0000", 0, 4 - hexCode.length)
write(hexCode) write(hexCode)
} }
@ -1047,7 +1047,7 @@ fun Writer.writeJsonValue(
} }
} }
value is Char -> writeJsonValue(indentFactor, indent, value.toInt()) value is Char -> writeJsonValue(indentFactor, indent, value.code)
value is String -> writeQuote(value) value is String -> writeQuote(value)
value is Enum<*> -> writeQuote(value.name) value is Enum<*> -> writeQuote(value.name)

1922
_Emoji/emojiConverter/src/main/kotlin/jp/juggler/subwaytooter/emoji/Main.kt
View File

File diff suppressed because it is too large Load Diff

307
_Emoji/emojiConverter/src/main/kotlin/jp/juggler/subwaytooter/emoji/Utils.kt
View File

@ -1,147 +1,141 @@
@file:Suppress("unused")
package jp.juggler.subwaytooter.emoji package jp.juggler.subwaytooter.emoji
import io.ktor.client.* import io.ktor.client.HttpClient
import io.ktor.client.call.* import io.ktor.client.request.get
import io.ktor.client.request.* import io.ktor.client.request.header
import io.ktor.client.statement.* import io.ktor.client.statement.readBytes
import io.ktor.http.* import io.ktor.http.HttpStatusCode
import org.jsoup.Jsoup import org.jsoup.Jsoup
import java.io.* import java.io.BufferedReader
import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
import java.io.InputStreamReader
import java.nio.charset.Charset import java.nio.charset.Charset
import java.security.MessageDigest import java.security.MessageDigest
import java.util.* import java.util.*
fun String.isTruth() = when { fun String.isTruth() = when {
this == "" -> false this == "" -> false
this == "0" -> false this == "0" -> false
this.startsWith("f", ignoreCase = true) -> false this.startsWith("f", ignoreCase = true) -> false
this.startsWith("t", ignoreCase = true) -> true this.startsWith("t", ignoreCase = true) -> true
this == "on" -> true this == "on" -> true
else -> true else -> true
} }
// split CharSequence to Unicode codepoints // split CharSequence to Unicode codepoints
fun CharSequence.eachCodePoint(block: (Int) -> Unit) { fun CharSequence.eachCodePoint(block: (Int) -> Unit) {
val end = length val end = length
var i = 0 var i = 0
while (i < end) { while (i < end) {
val c1 = get(i++) val c1 = get(i++)
if (Character.isHighSurrogate(c1) && i < length) { if (Character.isHighSurrogate(c1) && i < end) {
val c2 = get(i) val c2 = get(i)
if (Character.isLowSurrogate(c2)) { if (Character.isLowSurrogate(c2)) {
i++ ++i
block(Character.toCodePoint(c1, c2)) block(Character.toCodePoint(c1, c2))
continue continue
} }
} }
block(c1.toInt()) block(c1.code)
} }
} }
// split CharSequence to Unicode codepoints // split CharSequence to Unicode codepoints
fun CharSequence.listCodePoints() = ArrayList<Int>().also{ dst-> fun CharSequence.listCodePoints() = ArrayList<Int>().also { dst ->
val end = length eachCodePoint { dst.add(it) }
var i = 0
while (i < end) {
val c1 = get(i++)
if (Character.isHighSurrogate(c1) && i < length) {
val c2 = get(i)
if (Character.isLowSurrogate(c2)) {
i++
dst.add(Character.toCodePoint(c1, c2))
continue
}
}
dst.add(c1.toInt())
}
}.toIntArray() }.toIntArray()
// split codepoint to UTF-8 bytes // split codepoint to UTF-8 bytes
fun codePointToUtf8(cp: Int, block: (Int) -> Unit) { fun codePointToUtf8(cp: Int, block: (Int) -> Unit) {
// incorrect codepoint // incorrect codepoint
if (cp < 0 || cp > 0x10FFFF) codePointToUtf8('?'.toInt(), block) if (cp < 0 || cp > 0x10FFFF) codePointToUtf8('?'.code, block)
if (cp >= 128) { if (cp >= 128) {
if (cp >= 2048) { if (cp >= 2048) {
if (cp >= 65536) { if (cp >= 65536) {
block(0xF0.or(cp.shr(18))) block(0xF0.or(cp.shr(18)))
block(0x80.or(cp.shr(12).and(0x3f))) block(0x80.or(cp.shr(12).and(0x3f)))
} else { } else {
block(0xE0.or(cp.shr(12))) block(0xE0.or(cp.shr(12)))
} }
block(0x80.or(cp.shr(6).and(0x3f))) block(0x80.or(cp.shr(6).and(0x3f)))
} else { } else {
block(0xC0.or(cp.shr(6))) block(0xC0.or(cp.shr(6)))
} }
block(0x80.or(cp.and(0x3f))) block(0x80.or(cp.and(0x3f)))
} else { } else {
block(cp) block(cp)
} }
} }
private const val hexString = "0123456789ABCDEF" private const val hexString = "0123456789ABCDEF"
private val encodePercentSkipChars by lazy { private val encodePercentSkipChars by lazy {
HashSet<Int>().apply { HashSet<Int>().apply {
('0'..'9').forEach { add(it.toInt()) } ('0'..'9').forEach { add(it.code) }
('A'..'Z').forEach { add(it.toInt()) } ('A'..'Z').forEach { add(it.code) }
('a'..'z').forEach { add(it.toInt()) } ('a'..'z').forEach { add(it.code) }
add('-'.toInt()) add('-'.code)
add('_'.toInt()) add('_'.code)
add('.'.toInt()) add('.'.code)
} }
} }
fun String.encodePercent(): String = fun String.encodePercent(): String =
StringBuilder(length).also { sb -> StringBuilder(length).also { sb ->
eachCodePoint { cp -> eachCodePoint { cp ->
if (encodePercentSkipChars.contains(cp)) { if (encodePercentSkipChars.contains(cp)) {
sb.append(cp.toChar()) sb.append(cp.toChar())
} else { } else {
codePointToUtf8(cp) { b -> codePointToUtf8(cp) { b ->
sb.append('%') sb.append('%')
.append(hexString[b shr 4]) .append(hexString[b shr 4])
.append(hexString[b and 15]) .append(hexString[b and 15])
} }
} }
} }
}.toString() }.toString()
// same as x?.let{ dst.add(it) } // same as x?.let{ dst.add(it) }
fun <T> T.addTo(dst: ArrayList<T>) = dst.add(this) fun <T> T.addTo(dst: ArrayList<T>) = dst.add(this)
fun <T> T.addTo(dst: HashSet<T>) = dst.add(this) fun <T> T.addTo(dst: HashSet<T>) = dst.add(this)
fun <E : List<*>> E?.notEmpty(): E? = fun <E : List<*>> E?.notEmpty(): E? =
if (this?.isNotEmpty() == true) this else null if (this?.isNotEmpty() == true) this else null
fun <E : Map<*, *>> E?.notEmpty(): E? = fun <E : Map<*, *>> E?.notEmpty(): E? =
if (this?.isNotEmpty() == true) this else null if (this?.isNotEmpty() == true) this else null
fun <T : CharSequence> T?.notEmpty(): T? = fun <T : CharSequence> T?.notEmpty(): T? =
if (this?.isNotEmpty() == true) this else null if (this?.isNotEmpty() == true) this else null
fun ByteArray.digestSha256() = fun ByteArray.digestSha256() =
MessageDigest.getInstance("SHA-256")?.let { MessageDigest.getInstance("SHA-256")?.let {
it.update(this@digestSha256) it.update(this@digestSha256)
it.digest() it.digest()
}!! }!!
fun ByteArray.encodeBase64UrlSafe(): String { fun ByteArray.encodeBase64UrlSafe(): String {
val bytes = Base64.getUrlEncoder().encode(this) val bytes = Base64.getUrlEncoder().encode(this)
return StringBuilder(bytes.size).apply { return StringBuilder(bytes.size).apply {
for (b in bytes) { for (b in bytes) {
val c = b.toChar() val c = b.toInt().toChar()
if (c != '=') append(c) if (c != '=') append(c)
} }
}.toString() }.toString()
} }
fun ByteArray.decodeUtf8() = toString(Charsets.UTF_8) fun ByteArray.decodeUtf8() = toString(Charsets.UTF_8)
fun String.encodeUtf8() = toByteArray(Charsets.UTF_8) fun String.encodeUtf8() = toByteArray(Charsets.UTF_8)
inline fun <reified T> Any?.castOrThrow(name:String,block: T.() -> Unit){ inline fun <reified T> Any?.castOrThrow(name: String, block: T.() -> Unit) {
if (this !is T) error("type mismatch. $name is ${T::class.qualifiedName}") if (this !is T) error("type mismatch. $name is ${T::class.qualifiedName}")
block() block()
} }
// 型推論できる文脈だと型名を書かずにすむ // 型推論できる文脈だと型名を書かずにすむ
@ -155,87 +149,86 @@ fun <T : Comparable<T>> minComparable(a: T, b: T): T = if (a <= b) a else b
fun <T : Comparable<T>> maxComparable(a: T, b: T): T = if (a >= b) a else b fun <T : Comparable<T>> maxComparable(a: T, b: T): T = if (a >= b) a else b
fun <T : Any> MutableCollection<T>.removeFirst(check: (T) -> Boolean): T? { fun <T : Any> MutableCollection<T>.removeFirst(check: (T) -> Boolean): T? {
val it = iterator() val it = iterator()
while (it.hasNext()) { while (it.hasNext()) {
val item = it.next() val item = it.next()
if (check(item)) { if (check(item)) {
it.remove() it.remove()
return item return item
} }
} }
return null return null
} }
fun File.readAllBytes() = fun File.readAllBytes() =
FileInputStream(this).use { it.readBytes() } FileInputStream(this).use { it.readBytes() }
fun File.save(data: ByteArray) { fun File.save(data: ByteArray) {
val tmpFile = File("$absolutePath.tmp") val tmpFile = File("$absolutePath.tmp")
FileOutputStream(tmpFile).use { it.write(data) } FileOutputStream(tmpFile).use { it.write(data) }
this.delete() this.delete()
if (!tmpFile.renameTo(this)) error("$this: rename failed.") if (!tmpFile.renameTo(this)) error("$this: rename failed.")
} }
fun ByteArray.saveTo(file: File) = file.save(this) fun ByteArray.saveTo(file: File) = file.save(this)
fun File.forEachLine(charset: Charset = Charsets.UTF_8, block:(Int, String)->Unit)= fun File.forEachLine(charset: Charset = Charsets.UTF_8, block: (Int, String) -> Unit) =
BufferedReader(InputStreamReader(FileInputStream(this),charset)).use { reader -> BufferedReader(InputStreamReader(FileInputStream(this), charset)).use { reader ->
var lno = 0 var lno = 0
reader.forEachLine { reader.forEachLine {
block(++lno, it) block(++lno, it)
} }
lno lno
} }
inline fun <K,V> HashMap<K,V>.prepare(key:K,creator:()->V):V{ inline fun <K, V> HashMap<K, V>.prepare(key: K, creator: () -> V): V {
var value = get(key) var value = get(key)
if( value == null) { if (value == null) {
value = creator() value = creator()
put(key,value) put(key, value)
} }
return value!! return value!!
} }
private val reFileNameBadChars = """[\\/:*?"<>|-]+""".toRegex() private val reFileNameBadChars = """[\\/:*?"<>|-]+""".toRegex()
private val cacheDir by lazy{ File("./cache").apply { mkdirs() }} private val cacheDir by lazy { File("./cache").apply { mkdirs() } }
fun clearCache(){ fun clearCache() {
cacheDir.list()?.forEach { name-> cacheDir.list()?.forEach { name ->
File(cacheDir,name).takeIf { it.isFile }?.delete() File(cacheDir, name).takeIf { it.isFile }?.delete()
} }
} }
private val cacheExpire by lazy{ 8 * 3600000L } private val cacheExpire by lazy { 8 * 3600000L }
suspend fun HttpClient.cachedGetBytes(url: String, headers: Map<String, String>): ByteArray { suspend fun HttpClient.cachedGetBytes(url: String, headers: Map<String, String>): ByteArray {
val fName = reFileNameBadChars.replace(url, "-") val fName = reFileNameBadChars.replace(url, "-")
val cacheFile = File(cacheDir, fName) val cacheFile = File(cacheDir, fName)
if (System.currentTimeMillis() - cacheFile.lastModified() <= cacheExpire) { if (System.currentTimeMillis() - cacheFile.lastModified() <= cacheExpire) {
println("GET(cached) $url") println("GET(cached) $url")
return cacheFile.readAllBytes() return cacheFile.readAllBytes()
} }
println("GET $url") println("GET $url")
get<HttpResponse>(url) { get(url) {
headers.entries.forEach { headers.entries.forEach {
header(it.key, it.value) header(it.key, it.value)
} }
}.let { res -> }.let { res ->
return when (res.status) { return when (res.status) {
HttpStatusCode.OK -> HttpStatusCode.OK ->
res.receive<ByteArray>().also { it.saveTo(cacheFile) } res.readBytes().also { it.saveTo(cacheFile) }
else -> { else -> {
cacheFile.delete() cacheFile.delete()
error("get failed. $url ${res.status}") error("get failed. $url ${res.status}")
} }
} }
} }
} }
suspend fun HttpClient.cachedGetString(url: String, headers: Map<String, String>): String = suspend fun HttpClient.cachedGetString(url: String, headers: Map<String, String>): String =
cachedGetBytes(url,headers).decodeUtf8() cachedGetBytes(url, headers).decodeUtf8()
fun String.parseHtml(baseUri: String) =
Jsoup.parse(this, baseUri)
fun String.parseHtml(baseUri: String): org.jsoup.nodes.Document? =
Jsoup.parse(this, baseUri)

137
_Emoji/emojiConverter/src/main/kotlin/jp/juggler/subwaytooter/emoji/model/CodepointList.kt
View File

@ -2,7 +2,6 @@ package jp.juggler.subwaytooter.emoji.model
import jp.juggler.subwaytooter.emoji.cast import jp.juggler.subwaytooter.emoji.cast
import jp.juggler.subwaytooter.emoji.notEmpty import jp.juggler.subwaytooter.emoji.notEmpty
import java.lang.StringBuilder
/* /*
絵文字はコードポイントのリストで表現される。 絵文字はコードポイントのリストで表現される。
@ -30,61 +29,61 @@ import java.lang.StringBuilder
// list of codepoints // list of codepoints
class CodepointList( class CodepointList(
val from: String, val from: String,
val list: IntArray val list: IntArray
) : Comparable<CodepointList> { ) : Comparable<CodepointList> {
override fun equals(other: Any?): Boolean = override fun equals(other: Any?): Boolean =
list.contentEquals(other.cast<CodepointList>()?.list) list.contentEquals(other.cast<CodepointList>()?.list)
override fun hashCode(): Int { override fun hashCode(): Int {
var code = 0 var code = 0
for (v in list) code = code.shl(2).xor(v) for (v in list) code = code.shl(2).xor(v)
return code return code
} }
override fun compareTo(other: CodepointList): Int { override fun compareTo(other: CodepointList): Int {
val la = this.list val la = this.list
val lb = other.list val lb = other.list
var i = 0 var i = 0
do { do {
val a = la.elementAtOrNull(i) val a = la.elementAtOrNull(i)
val b = lb.elementAtOrNull(i) val b = lb.elementAtOrNull(i)
val r = if (a == null) { val r = if (a == null) {
if (b == null) break if (b == null) break
-1 -1
} else if (b == null) { } else if (b == null) {
1 1
} else { } else {
a.compareTo(b) a.compareTo(b)
} }
if (r != 0) return r if (r != 0) return r
++i ++i
} while (true) } while (true)
return 0 return 0
} }
// make string like as "uuuu-uuuu-uuuu-uuuu" // make string like as "uuuu-uuuu-uuuu-uuuu"
// cp値の余分な0は除去される // cp値の余分な0は除去される
// 常に小文字である // 常に小文字である
fun toHex() = StringBuilder(list.size * 5).also { fun toHex() = StringBuilder(list.size * 5).also {
list.forEachIndexed { i, v -> list.forEachIndexed { i, v ->
if (i > 0) it.append('-') if (i > 0) it.append('-')
it.append(String.format("%x", v).toLowerCase()) it.append("%x".format(v).lowercase())
} }
}.toString() }.toString()
// make raw string // make raw string
fun toRawString() = StringBuilder(list.size + 10).also { sb -> fun toRawString() = StringBuilder(list.size + 10).also { sb ->
for (cp in list) { for (cp in list) {
sb.appendCodePoint(cp) sb.appendCodePoint(cp)
} }
}.toString() }.toString()
fun toResourceId() = "emj_${toHex().replace("-", "_")}" fun toResourceId() = "emj_${toHex().replace("-", "_")}"
override fun toString() = "${toHex()},$from" override fun toString() = "${toHex()},$from"
// fun makeUtf16(): String { // fun makeUtf16(): String {
// // java の文字列にする // // java の文字列にする
@ -111,28 +110,28 @@ class CodepointList(
// return sb.toString() // return sb.toString()
// } // }
fun toKey(from: String) = fun toKey(from: String) =
list.filter { it != 0xfe0f && it != 0xfe0e && it != 0x200d } list.filter { it != 0xfe0f && it != 0xfe0e && it != 0x200d }
.toIntArray().toCodepointList(from) .toIntArray().toCodepointList(from)
fun getToneCode(from: String) :CodepointList? { fun getToneCode(from: String): CodepointList? {
val used = HashSet<Int>() val used = HashSet<Int>()
return list return list
.filter { skinToneModifiers.containsKey(it) } .filter { skinToneModifiers.containsKey(it) }
.mapNotNull { .mapNotNull {
if (used.contains(it)) { if (used.contains(it)) {
null null
} else { } else {
used.add(it) used.add(it)
it it
} }
}.toIntArray().toCodepointList(from) }.toIntArray().toCodepointList(from)
} }
} }
fun IntArray.isAsciiEmoji() = fun IntArray.isAsciiEmoji() =
size == 1 && first() < 0xae size == 1 && first() < 0xae
fun IntArray.toCodepointList(from: String) = if (isEmpty()) null else CodepointList(from, this) fun IntArray.toCodepointList(from: String) = if (isEmpty()) null else CodepointList(from, this)
@ -140,8 +139,8 @@ private val reHex = """([0-9A-Fa-f]+)""".toRegex()
// cp-cp-cp-cp => CodepointList // cp-cp-cp-cp => CodepointList
fun String.toCodepointList(from: String) = fun String.toCodepointList(from: String) =
reHex.findAll(this) reHex.findAll(this)
.map { mr -> mr.groupValues[1].toInt(16) } .map { mr -> mr.groupValues[1].toInt(16) }
.toList().notEmpty() .toList().notEmpty()
?.toIntArray() ?.toIntArray()
?.toCodepointList(from) ?.toCodepointList(from)

32
_Emoji/emojiConverter/src/main/kotlin/jp/juggler/subwaytooter/emoji/model/ShortName.kt
View File

@ -4,18 +4,18 @@ import jp.juggler.subwaytooter.emoji.cast
import jp.juggler.subwaytooter.emoji.notEmpty import jp.juggler.subwaytooter.emoji.notEmpty
class ShortName(val cameFrom:String,val name:String) :Comparable<ShortName>{ class ShortName(val cameFrom: String, val name: String) : Comparable<ShortName> {
override fun equals(other: Any?): Boolean = override fun equals(other: Any?): Boolean =
name == other.cast<ShortName>()?.name name == other.cast<ShortName>()?.name
override fun hashCode(): Int = override fun hashCode(): Int =
name.hashCode() name.hashCode()
override fun toString(): String = override fun toString(): String =
"SN($cameFrom)$name" "SN($cameFrom)$name"
override fun compareTo(other: ShortName): Int = override fun compareTo(other: ShortName): Int =
name.compareTo(other.name) name.compareTo(other.name)
} }
private val reColonHead = """\A:""".toRegex() private val reColonHead = """\A:""".toRegex()
@ -23,10 +23,10 @@ private val reColonTail = """:\z""".toRegex()
private val reNotCode = """[^\w\d+_]+""".toRegex() private val reNotCode = """[^\w\d+_]+""".toRegex()
private val reUnderTail = """_+\z""".toRegex() private val reUnderTail = """_+\z""".toRegex()
fun String.toShortName(cameFrom:String) = fun String.toShortName(cameFrom: String) =
toLowerCase() lowercase()
.replace(reColonHead, "") .replace(reColonHead, "")
.replace(reColonTail, "") .replace(reColonTail, "")
.replace(reNotCode, "_") .replace(reNotCode, "_")
.replace(reUnderTail,"") .replace(reUnderTail, "")
.notEmpty()?.let{ ShortName(cameFrom=cameFrom,it) } .notEmpty()?.let { ShortName(cameFrom = cameFrom, it) }