mirror of
https://github.com/kalarina-bit/Sparkledns.git
synced 2026-11-22 07:36:09 +00:00
Name other sites in Company dominance
The share outside the known companies is now split by site names taken from the domains of recent queries (cdn.example.co.uk shows as Example). Domains are read only from the in-memory log; the saved statistics still keep numbers only.
This commit is contained in:
@@ -238,7 +238,7 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
|
||||
) {
|
||||
ActivityHeader(period) { period = it }
|
||||
ActivityStats(summary, Modifier.padding(top = 20.dp))
|
||||
CompanyCard(summary, Modifier.padding(top = 20.dp))
|
||||
CompanyCard(summary, entries, Modifier.padding(top = 20.dp))
|
||||
}
|
||||
LazyColumn(
|
||||
modifier = Modifier
|
||||
@@ -255,7 +255,7 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
|
||||
) {
|
||||
item(key = "header") { ActivityHeader(period) { period = it } }
|
||||
item(key = "stats") { ActivityStats(summary, Modifier.padding(top = 20.dp)) }
|
||||
item(key = "companies") { CompanyCard(summary, Modifier.padding(top = 20.dp)) }
|
||||
item(key = "companies") { CompanyCard(summary, entries, Modifier.padding(top = 20.dp)) }
|
||||
log()
|
||||
}
|
||||
}
|
||||
@@ -366,9 +366,9 @@ private fun LogSearch(
|
||||
private const val MIN_COMPANY_REQUESTS = 50L
|
||||
|
||||
@Composable
|
||||
private fun CompanyCard(summary: StatsSummary, modifier: Modifier = Modifier) {
|
||||
private fun CompanyCard(summary: StatsSummary, recent: List<QueryEntry>, modifier: Modifier = Modifier) {
|
||||
val other = stringResource(R.string.companies_other)
|
||||
val slices = remember(summary, other) { companySlices(summary, other) }
|
||||
val slices = remember(summary, recent, other) { companySlices(summary, recent, other) }
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxWidth()
|
||||
@@ -430,17 +430,32 @@ private fun percentLabel(share: Float): String {
|
||||
return if (percent < 1f) "<1%" else "${Math.round(percent)}%"
|
||||
}
|
||||
|
||||
// The four companies with most requests, then everything else; empty slices are left out
|
||||
private fun companySlices(summary: StatsSummary, otherLabel: String): List<Slice> {
|
||||
// Shares of the known companies over the period. The statistics keep no domains, so the share
|
||||
// left over is split by the names of the recent queries to other domains, from the log in memory.
|
||||
// Then the four largest slices and everything else; empty slices are left out.
|
||||
private fun companySlices(summary: StatsSummary, recent: List<QueryEntry>, otherLabel: String): List<Slice> {
|
||||
if (summary.total == 0L) return emptyList()
|
||||
val top = Company.entries
|
||||
.map { it to summary.companies[it.ordinal] }
|
||||
.filter { it.second > 0 }
|
||||
.sortedByDescending { it.second }
|
||||
.take(SliceColors.size)
|
||||
val slices = top.mapIndexed { index, (company, count) ->
|
||||
Slice(company.label, count.toFloat() / summary.total, SliceColors[index])
|
||||
val shares = HashMap<String, Float>()
|
||||
for (company in Company.entries) {
|
||||
val count = summary.companies[company.ordinal]
|
||||
if (count > 0) shares[company.label] = count.toFloat() / summary.total
|
||||
}
|
||||
val unknownShare = (1f - shares.values.sum()).coerceAtLeast(0f)
|
||||
val names = HashMap<String, Int>()
|
||||
var unknownCount = 0
|
||||
for (entry in recent) {
|
||||
if (Companies.of(entry.domain) != null) continue
|
||||
unknownCount++
|
||||
Companies.nameOf(entry.domain)?.let { names.merge(it, 1, Int::plus) }
|
||||
}
|
||||
// Queries without a name (local names, reverse lookups) stay in the rest
|
||||
if (unknownCount > 0) {
|
||||
for ((name, count) in names) shares.merge(name, unknownShare * count / unknownCount, Float::plus)
|
||||
}
|
||||
val slices = shares.entries
|
||||
.sortedByDescending { it.value }
|
||||
.take(SliceColors.size)
|
||||
.mapIndexed { index, (label, share) -> Slice(label, share, SliceColors[index]) }
|
||||
val rest = (1f - slices.sumOf { it.share.toDouble() }.toFloat()).coerceAtLeast(0f)
|
||||
return if (rest >= 0.005f) slices + Slice(otherLabel, rest, OtherColor) else slices
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package cc.skysparkle.sparkledns
|
||||
|
||||
import java.util.Locale
|
||||
import java.util.TreeMap
|
||||
|
||||
// The position of each company is saved in StatsStore: add new ones at the end only
|
||||
@@ -21,6 +22,12 @@ enum class Company(val label: String) {
|
||||
object Companies {
|
||||
private const val GOOGLE_PREFIX = "google."
|
||||
|
||||
// Second-level labels that belong to a country's suffix: example.co.uk, example.com.br
|
||||
private val COUNTRY_SECOND_LEVELS = setOf("co", "com", "net", "org", "gov", "edu", "ac", "or", "ne", "go")
|
||||
|
||||
// Names that are not public sites: reverse lookups and local networks
|
||||
private val PRIVATE_TLDS = setOf("arpa", "local", "lan", "home", "internal", "localhost")
|
||||
|
||||
// Hashes of the domains, sorted, with the company of each at the same index: this runs for
|
||||
// every query, and parent domains are looked up by hash without copying the name
|
||||
private val hashes: LongArray
|
||||
@@ -93,4 +100,16 @@ object Companies {
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
// A readable name for a domain of no known company, taken from its main label:
|
||||
// "cdn.example.co.uk" gives "Example". Null for IP addresses, local names and bare labels.
|
||||
fun nameOf(name: String): String? {
|
||||
val labels = name.lowercase(Locale.ROOT).split('.').filter { it.isNotEmpty() }
|
||||
if (labels.size < 2) return null
|
||||
val tld = labels.last()
|
||||
if (tld in PRIVATE_TLDS || tld.all { it.isDigit() }) return null
|
||||
var index = labels.size - 2
|
||||
if (tld.length == 2 && labels.size >= 3 && labels[index] in COUNTRY_SECOND_LEVELS) index--
|
||||
return labels[index].replaceFirstChar { it.titlecase(Locale.ROOT) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
<string name="tab_activity">Aktivität</string>
|
||||
<string name="tab_settings">Einstellungen</string>
|
||||
<string name="companies_title">Anteil der Konzerne</string>
|
||||
<string name="companies_desc">Welcher Anteil deiner Anfragen an die größten Konzerne geht.</string>
|
||||
<string name="companies_desc">Welcher Anteil deiner Anfragen an die größten Konzerne und andere Websites geht.</string>
|
||||
<string name="companies_other">Andere</string>
|
||||
<string name="recent_title">Letzte Anfragen</string>
|
||||
<string name="filter">Filter</string>
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
<string name="tab_activity">アクティビティ</string>
|
||||
<string name="tab_settings">設定</string>
|
||||
<string name="companies_title">企業の占有率</string>
|
||||
<string name="companies_desc">リクエストのうち大手企業に送られる割合です。</string>
|
||||
<string name="companies_desc">リクエストのうち大手企業やその他のサイトに送られる割合です。</string>
|
||||
<string name="companies_other">その他</string>
|
||||
<string name="recent_title">最近のアクティビティ</string>
|
||||
<string name="filter">フィルター</string>
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
<string name="tab_activity">Veikla</string>
|
||||
<string name="tab_settings">Nustatymai</string>
|
||||
<string name="companies_title">Įmonių dalis</string>
|
||||
<string name="companies_desc">Kokia jūsų užklausų dalis tenka didžiausioms įmonėms.</string>
|
||||
<string name="companies_desc">Kokia jūsų užklausų dalis tenka didžiausioms įmonėms ir kitoms svetainėms.</string>
|
||||
<string name="companies_other">Kitos</string>
|
||||
<string name="recent_title">Naujausios užklausos</string>
|
||||
<string name="filter">Filtras</string>
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
<string name="tab_activity">Активность</string>
|
||||
<string name="tab_settings">Настройки</string>
|
||||
<string name="companies_title">Доля компаний</string>
|
||||
<string name="companies_desc">Какая часть ваших запросов уходит крупнейшим компаниям.</string>
|
||||
<string name="companies_desc">Какая часть ваших запросов уходит крупнейшим компаниям и другим сайтам.</string>
|
||||
<string name="companies_other">Другие</string>
|
||||
<string name="recent_title">Последние запросы</string>
|
||||
<string name="filter">Фильтр</string>
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
<string name="tab_activity">活动</string>
|
||||
<string name="tab_settings">设置</string>
|
||||
<string name="companies_title">公司占比</string>
|
||||
<string name="companies_desc">你的请求中发往大公司的比例。</string>
|
||||
<string name="companies_desc">你的请求中发往大公司和其他网站的比例。</string>
|
||||
<string name="companies_other">其他</string>
|
||||
<string name="recent_title">最近活动</string>
|
||||
<string name="filter">筛选</string>
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
<string name="tab_activity">Activity</string>
|
||||
<string name="tab_settings">Settings</string>
|
||||
<string name="companies_title">Company dominance</string>
|
||||
<string name="companies_desc">Share of your requests that go to the biggest companies.</string>
|
||||
<string name="companies_desc">Share of your requests that go to the biggest companies and other sites.</string>
|
||||
<string name="companies_other">Other</string>
|
||||
<string name="recent_title">Recent activity</string>
|
||||
<string name="filter">Filter</string>
|
||||
|
||||
Reference in New Issue
Block a user