Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9a0fa37e55 | ||
|
|
73f6dbba75 | ||
|
|
f6f6a2499f | ||
|
|
8aa3a4da02 | ||
|
|
b7ee0523d1 |
59
.github/workflows/build.yml
vendored
59
.github/workflows/build.yml
vendored
@@ -4,36 +4,53 @@ on:
|
||||
push:
|
||||
workflow_dispatch:
|
||||
|
||||
# No marketplace actions: this Gitea runner resolves bare action names
|
||||
# against the local instance, and even with full URLs it cannot resolve
|
||||
# annotated tags ("unsupported object type"). Everything below is plain
|
||||
# shell, which also keeps the job readable.
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
ANDROID_SDK_ROOT: /opt/android-sdk
|
||||
CMDLINE_TOOLS: https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
|
||||
steps:
|
||||
# Full URLs: this Gitea resolves bare action names against itself,
|
||||
# where these actions do not exist.
|
||||
- uses: https://github.com/actions/checkout@v4
|
||||
- name: Checkout
|
||||
run: |
|
||||
git init -q .
|
||||
git remote add origin "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git"
|
||||
git fetch -q --depth 1 origin "${GITHUB_SHA}"
|
||||
git checkout -q FETCH_HEAD
|
||||
|
||||
- uses: https://github.com/actions/setup-java@v4
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: "17"
|
||||
- name: Install JDK
|
||||
run: |
|
||||
apt-get update -qq
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y -qq openjdk-17-jdk-headless > /dev/null
|
||||
java -version
|
||||
|
||||
- uses: https://github.com/gradle/actions/setup-gradle@v4
|
||||
- name: Install Android SDK
|
||||
run: |
|
||||
mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
|
||||
curl -sSL -o /tmp/tools.zip "$CMDLINE_TOOLS"
|
||||
unzip -q /tmp/tools.zip -d "$ANDROID_SDK_ROOT/cmdline-tools"
|
||||
mv "$ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools" "$ANDROID_SDK_ROOT/cmdline-tools/latest"
|
||||
# Accept licences by writing the hashes: piping "yes" into
|
||||
# sdkmanager dies of SIGPIPE (exit 141) under pipefail.
|
||||
mkdir -p "$ANDROID_SDK_ROOT/licenses"
|
||||
echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_SDK_ROOT/licenses/android-sdk-license"
|
||||
echo "84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_SDK_ROOT/licenses/android-sdk-preview-license"
|
||||
"$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" \
|
||||
"platforms;android-35" "build-tools;35.0.0" "platform-tools" > /dev/null
|
||||
echo "sdk.dir=$ANDROID_SDK_ROOT" > local.properties
|
||||
|
||||
- name: Unit tests
|
||||
run: ./gradlew testDebugUnitTest --stacktrace
|
||||
run: ./gradlew testDebugUnitTest --no-daemon --stacktrace
|
||||
|
||||
- name: Build debug APK
|
||||
run: ./gradlew assembleDebug --stacktrace
|
||||
run: ./gradlew assembleDebug --no-daemon --stacktrace
|
||||
|
||||
- name: Upload APK
|
||||
uses: https://github.com/actions/upload-artifact@v4
|
||||
with:
|
||||
name: castarr-debug-apk
|
||||
path: app/build/outputs/apk/debug/app-debug.apk
|
||||
|
||||
- name: Upload test report
|
||||
- name: Summary
|
||||
if: always()
|
||||
uses: https://github.com/actions/upload-artifact@v4
|
||||
with:
|
||||
name: castarr-test-report
|
||||
path: tests/runs/
|
||||
run: |
|
||||
echo "APK:"; ls -la app/build/outputs/apk/debug/ 2>/dev/null || echo " (kein Build)"
|
||||
echo "Tests:"; ls tests/runs/junit/ 2>/dev/null || echo " (keine Reports)"
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,3 +5,4 @@ local.properties
|
||||
*.iml
|
||||
.kotlin/
|
||||
tests/runs/
|
||||
app/src/main/assets/crests/
|
||||
|
||||
@@ -12,8 +12,8 @@ android {
|
||||
applicationId = "dev.castarr.tv"
|
||||
minSdk = 26
|
||||
targetSdk = 35
|
||||
versionCode = 29
|
||||
versionName = "0.10.3"
|
||||
versionCode = 33
|
||||
versionName = "0.11.0"
|
||||
}
|
||||
|
||||
// Release signing from environment (see ~/.keys/castarr-release.env on the
|
||||
|
||||
@@ -170,22 +170,31 @@ class AppState(
|
||||
SourceMode.DISPATCHARR -> dispatcharr.upcoming(channel, windowMs)
|
||||
}
|
||||
|
||||
/** One channel's club broadcasts: the next one plus how many follow. */
|
||||
data class TeamHit(
|
||||
val programme: dev.castarr.tv.data.Programme,
|
||||
val further: Int,
|
||||
)
|
||||
|
||||
/**
|
||||
* Channels showing the viewer's club within the scanned window, paired
|
||||
* with the programme that matched — earliest kick-off first, so whatever
|
||||
* is running right now sits on top.
|
||||
*/
|
||||
fun teamMatches(key: String): List<Pair<Channel, dev.castarr.tv.data.Programme>> {
|
||||
fun teamMatches(key: String): List<Pair<Channel, TeamHit>> {
|
||||
val filter = dev.castarr.tv.data.TeamFilters.byKey(key) ?: return emptyList()
|
||||
val window = dev.castarr.tv.data.TeamFilters.WINDOW_MS
|
||||
val now = System.currentTimeMillis()
|
||||
val window = dev.castarr.tv.data.TeamFilters.windowEnd(now) - now
|
||||
return activeChannels()
|
||||
.filter { dev.castarr.tv.data.TeamFilters.scansGroup(it.group) }
|
||||
.mapNotNull { channel ->
|
||||
upcoming(channel, window)
|
||||
.firstOrNull { !isEpgPlaceholder(it.title) && filter.matches(it.title) }
|
||||
?.let { channel to it }
|
||||
// A channel can carry several of the club's broadcasts in one
|
||||
// evening; the row names the next and counts the rest.
|
||||
val hits = upcoming(channel, window)
|
||||
.filter { !isEpgPlaceholder(it.title) && filter.matches(it.title) }
|
||||
hits.firstOrNull()?.let { channel to TeamHit(it, hits.size - 1) }
|
||||
}
|
||||
.sortedBy { it.second.start }
|
||||
.sortedBy { it.second.programme.start }
|
||||
}
|
||||
|
||||
fun refreshActive() {
|
||||
@@ -200,8 +209,14 @@ class AppState(
|
||||
result.fold(
|
||||
onSuccess = { appError = AppError.NONE },
|
||||
onFailure = { throwable ->
|
||||
// Cached channels keep the app usable; only surface a
|
||||
// fullscreen state when there is nothing to show.
|
||||
// An expired login must always surface: cached channels
|
||||
// would otherwise sit there without EPG or favourites and
|
||||
// nothing would say why.
|
||||
if (throwable.message == "not logged in") {
|
||||
appError = AppError.RELOGIN
|
||||
return
|
||||
}
|
||||
// Otherwise cached channels keep the app usable.
|
||||
if (activeChannels().isNotEmpty()) return
|
||||
appError = when {
|
||||
throwable.message == "not logged in" -> AppError.RELOGIN
|
||||
|
||||
@@ -18,15 +18,22 @@ class Crests(context: Context) {
|
||||
|
||||
private val prefs = context.getSharedPreferences("crests", Context.MODE_PRIVATE)
|
||||
|
||||
/** Cached crest URL for a club, fetching it once per article. */
|
||||
/** Cached crest URL for a club, fetched once and then reused. */
|
||||
suspend fun urlFor(article: String): String? = withContext(Dispatchers.IO) {
|
||||
prefs.getString(article, null)?.let { return@withContext it.ifEmpty { null } }
|
||||
prefs.getString(article, null)?.takeIf { it.isNotEmpty() }?.let {
|
||||
return@withContext it
|
||||
}
|
||||
val resolved = runCatching { fetch(article) }
|
||||
.onFailure { Log.w(TAG, "crest lookup failed: ${it.javaClass.simpleName}") }
|
||||
.onFailure { Log.w(TAG, "crest lookup failed for $article: $it") }
|
||||
.getOrNull()
|
||||
// Remember misses too, so a club without a crest is not looked up
|
||||
// again on every screen.
|
||||
prefs.edit().putString(article, resolved.orEmpty()).apply()
|
||||
if (resolved != null) {
|
||||
Log.i(TAG, "crest for $article: $resolved")
|
||||
prefs.edit().putString(article, resolved).apply()
|
||||
} else {
|
||||
// Deliberately not cached: a single failed lookup (no network
|
||||
// yet at start-up) must not hide the crest forever.
|
||||
Log.w(TAG, "no crest for $article")
|
||||
}
|
||||
resolved
|
||||
}
|
||||
|
||||
@@ -41,6 +48,8 @@ class Crests(context: Context) {
|
||||
val body = connection.inputStream.bufferedReader().use { it.readText() }
|
||||
JSONObject(body).optJSONObject("thumbnail")?.optString("source")
|
||||
?.takeIf { it.isNotEmpty() }
|
||||
// Drop the analytics query the API appends.
|
||||
?.substringBefore("?")
|
||||
} finally {
|
||||
connection.disconnect()
|
||||
}
|
||||
|
||||
@@ -49,13 +49,20 @@ class DispatcharrRepository(context: Context, private val auth: DeviceAuth) {
|
||||
scope.launch {
|
||||
val result = runCatching {
|
||||
status.value = "loading_channels"
|
||||
Log.i(TAG, "refresh start (loggedIn=${auth.isLoggedIn})")
|
||||
val token = auth.accessToken() ?: error("not logged in")
|
||||
val groups = fetchGroups(token)
|
||||
val list = fetchChannels(token, groups)
|
||||
channels.value = list
|
||||
prefs.edit().putString("channels_cache", Channel.listToJson(list).toString()).apply()
|
||||
launch { runCatching { refreshFavorites(token) } }
|
||||
launch { runCatching { refreshProfiles(token) } }
|
||||
launch {
|
||||
runCatching { refreshFavorites(token) }
|
||||
.onFailure { Log.w(TAG, "favorites failed: ${it.javaClass.simpleName}: ${it.message?.take(120)}") }
|
||||
}
|
||||
launch {
|
||||
runCatching { refreshProfiles(token) }
|
||||
.onFailure { Log.w(TAG, "profiles failed: ${it.javaClass.simpleName}: ${it.message?.take(120)}") }
|
||||
}
|
||||
launch {
|
||||
runCatching { refreshEpg(token) }
|
||||
.onFailure { Log.w(TAG, "epg failed: ${it.javaClass.simpleName}: ${it.message?.take(160)}") }
|
||||
|
||||
@@ -29,8 +29,25 @@ data class TeamFilter(
|
||||
|
||||
object TeamFilters {
|
||||
|
||||
/** Window scanned ahead of now. */
|
||||
const val WINDOW_MS = 3 * 60 * 60 * 1000L
|
||||
/** Minimum window scanned ahead of now. */
|
||||
const val MIN_WINDOW_MS = 3 * 60 * 60 * 1000L
|
||||
|
||||
/**
|
||||
* Scans until midnight, but never less than [MIN_WINDOW_MS] — asking in
|
||||
* the morning should already answer "does my club play tonight", and
|
||||
* asking late at night must not cut the evening short.
|
||||
*/
|
||||
fun windowEnd(now: Long): Long {
|
||||
val midnight = java.util.Calendar.getInstance().apply {
|
||||
timeInMillis = now
|
||||
add(java.util.Calendar.DAY_OF_YEAR, 1)
|
||||
set(java.util.Calendar.HOUR_OF_DAY, 0)
|
||||
set(java.util.Calendar.MINUTE, 0)
|
||||
set(java.util.Calendar.SECOND, 0)
|
||||
set(java.util.Calendar.MILLISECOND, 0)
|
||||
}.timeInMillis
|
||||
return maxOf(midnight, now + MIN_WINDOW_MS)
|
||||
}
|
||||
|
||||
/** At most this many club groups sit in the rail at once. */
|
||||
const val MAX_ACTIVE = 3
|
||||
@@ -97,7 +114,7 @@ object TeamFilters {
|
||||
club("duisburg", "MSV", "MSV Duisburg", listOf("msv duisburg", "duisburg"), 0xFF004E9E, WHITE),
|
||||
club("mannheim", "SVWM", "SV Waldhof Mannheim", listOf("waldhof mannheim", "waldhof"), 0xFF0B4EA2, WHITE),
|
||||
club("wehen", "SVWW", "SV Wehen Wiesbaden", listOf("wehen wiesbaden", "wehen"), 0xFFE1000F, BLACK),
|
||||
club("ulm", "SSV", "SSV Ulm 1846", listOf("ssv ulm"), 0xFFE1000F, WHITE),
|
||||
club("ulm", "SSV", "SSV Ulm 1846", listOf("ssv ulm"), 0xFFE1000F, WHITE, article = "SSV Ulm 1846 Fußball"),
|
||||
club("regensburg", "SSVJ", "SSV Jahn Regensburg", listOf("jahn regensburg", "regensburg"), 0xFFE1000F, WHITE),
|
||||
club("verl", "SCV", "SC Verl", listOf("sc verl"), 0xFF00703C, WHITE),
|
||||
club("viktoria", "VKÖ", "Viktoria Köln", listOf("viktoria köln"), 0xFFE1000F, WHITE),
|
||||
@@ -108,7 +125,7 @@ object TeamFilters {
|
||||
club("ingolstadt", "FCI", "FC Ingolstadt 04", listOf("ingolstadt"), 0xFFE1000F, BLACK),
|
||||
club("wuppertal", "WSV", "Wuppertaler SV", listOf("wuppertaler sv"), 0xFFE1000F, 0xFF0B4EA2),
|
||||
club("stuttgart-ii", "VfB2", "VfB Stuttgart II", listOf("vfb stuttgart ii"), 0xFFE32219, BLACK),
|
||||
club("hoffenheim-ii", "TSG2", "TSG Hoffenheim II", listOf("hoffenheim ii"), 0xFF1C63B7, BLACK),
|
||||
club("hoffenheim-ii", "TSG2", "TSG Hoffenheim II", listOf("hoffenheim ii"), 0xFF1C63B7, BLACK, article = "TSG 1899 Hoffenheim"),
|
||||
)
|
||||
|
||||
/** Clubs switched on for a viewer before they touch the settings. */
|
||||
|
||||
@@ -246,7 +246,7 @@ fun LiveScreen(state: AppState) {
|
||||
Text(
|
||||
when {
|
||||
activeTeam != null ->
|
||||
"In den nächsten 3 Stunden läuft nichts mit ${activeTeam.fullName}."
|
||||
"Heute läuft nichts mehr mit ${activeTeam.fullName}."
|
||||
state.favoritesOnly ->
|
||||
"Noch keine Favoriten — halte OK auf einem Sender gedrückt."
|
||||
else -> "Diese Gruppe ist leer."
|
||||
@@ -351,7 +351,7 @@ private fun ChannelRow(
|
||||
number: Int,
|
||||
modifier: Modifier = Modifier,
|
||||
nowNext: NowNext,
|
||||
highlight: dev.castarr.tv.data.Programme? = null,
|
||||
highlight: AppState.TeamHit? = null,
|
||||
playing: Boolean,
|
||||
favorite: Boolean,
|
||||
epgStamp: Long,
|
||||
@@ -433,28 +433,21 @@ private fun ChannelRow(
|
||||
}
|
||||
|
||||
/**
|
||||
* The club badge, resolved from Wikipedia and cached on the device. Until
|
||||
* it arrives (or if it never does) a shield in the club colours stands in.
|
||||
* The club badge. The images ship in the APK (fetched at build time by
|
||||
* tools/fetch-crests.py, never committed), so nothing has to load over the
|
||||
* network; the coloured shield stands in if one is ever missing.
|
||||
*/
|
||||
@Composable
|
||||
private fun Crest(team: dev.castarr.tv.data.TeamFilter, state: AppState) {
|
||||
val url by androidx.compose.runtime.produceState<String?>(null, team.key) {
|
||||
value = state.crests.urlFor(team.article)
|
||||
}
|
||||
Box(Modifier.size(20.dp), contentAlignment = Alignment.Center) {
|
||||
val crestUrl = url
|
||||
if (crestUrl != null) {
|
||||
SubcomposeAsyncImage(
|
||||
model = crestUrl,
|
||||
model = "file:///android_asset/crests/${team.key}.png",
|
||||
contentDescription = null,
|
||||
contentScale = ContentScale.Fit,
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
loading = { ShieldFallback(team) },
|
||||
error = { ShieldFallback(team) },
|
||||
)
|
||||
} else {
|
||||
ShieldFallback(team)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -517,9 +510,10 @@ private fun LogoInitials(initials: String) {
|
||||
}
|
||||
}
|
||||
|
||||
/** The programme that matched the club filter, with its start time. */
|
||||
/** The next club broadcast on this channel, and how many follow it. */
|
||||
@Composable
|
||||
private fun HighlightCell(programme: dev.castarr.tv.data.Programme, modifier: Modifier = Modifier) {
|
||||
private fun HighlightCell(hit: AppState.TeamHit, modifier: Modifier = Modifier) {
|
||||
val programme = hit.programme
|
||||
val running = System.currentTimeMillis() in programme.start until programme.stop
|
||||
Column(modifier) {
|
||||
Row(verticalAlignment = Alignment.Bottom) {
|
||||
@@ -543,7 +537,8 @@ private fun HighlightCell(programme: dev.castarr.tv.data.Programme, modifier: Mo
|
||||
}
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Text(
|
||||
"${formatClock(programme.start)}–${formatClock(programme.stop)}",
|
||||
"${formatClock(programme.start)}–${formatClock(programme.stop)}" +
|
||||
if (hit.further > 0) " · +${hit.further} weitere" else "",
|
||||
color = CastarrColors.faint,
|
||||
fontFamily = AppFont,
|
||||
fontSize = 12.sp,
|
||||
|
||||
@@ -6,6 +6,8 @@ import androidx.compose.foundation.Canvas
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
@@ -84,7 +86,14 @@ fun SettingsScreen(state: AppState) {
|
||||
.fillMaxSize()
|
||||
.padding(horizontal = 40.dp, vertical = 12.dp)
|
||||
) {
|
||||
Column(Modifier.weight(1.25f), verticalArrangement = Arrangement.spacedBy(16.dp)) {
|
||||
// The cards outgrew one screen once club menus arrived; focus
|
||||
// movement scrolls this column along.
|
||||
Column(
|
||||
Modifier
|
||||
.weight(1.25f)
|
||||
.verticalScroll(rememberScrollState()),
|
||||
verticalArrangement = Arrangement.spacedBy(16.dp),
|
||||
) {
|
||||
SettingsCard("Konto") {
|
||||
if (state.auth.isLoggedIn) {
|
||||
Row(
|
||||
@@ -169,8 +178,8 @@ fun SettingsScreen(state: AppState) {
|
||||
|
||||
SettingsCard("Vereinsmenüs") {
|
||||
Text(
|
||||
"Eigene Gruppe mit allen Sendern, auf denen der Verein in den " +
|
||||
"nächsten 3 Stunden läuft. Bis zu " +
|
||||
"Eigene Gruppe mit allen Sendern, auf denen der Verein " +
|
||||
"heute noch läuft. Bis zu " +
|
||||
"${dev.castarr.tv.data.TeamFilters.MAX_ACTIVE} Vereine.",
|
||||
color = CastarrColors.faint, fontFamily = AppFont, fontSize = 11.sp,
|
||||
modifier = Modifier.padding(start = 14.dp, end = 14.dp, bottom = 6.dp),
|
||||
@@ -242,6 +251,10 @@ fun SettingsScreen(state: AppState) {
|
||||
}
|
||||
}
|
||||
}
|
||||
SettingRow(
|
||||
"Senderliste neu laden",
|
||||
subtitle = "Holt Sender, Programm und Favoriten erneut",
|
||||
) { state.refreshActive() }
|
||||
SettingRow(
|
||||
"Erweitert",
|
||||
subtitle = "M3U/EPG-Adressen von Hand eintragen",
|
||||
|
||||
@@ -51,6 +51,25 @@ class TeamFiltersTest {
|
||||
assertTrue(TeamFilters.all.all { c -> c.needles.all { it == it.lowercase() } })
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `window reaches midnight but never falls below three hours`() {
|
||||
val cal = java.util.Calendar.getInstance()
|
||||
// Morning: the window must reach into the evening.
|
||||
cal.set(java.util.Calendar.HOUR_OF_DAY, 9)
|
||||
cal.set(java.util.Calendar.MINUTE, 0)
|
||||
val morning = cal.timeInMillis
|
||||
val eveningKickoff = morning + 12 * 60 * 60 * 1000L
|
||||
assertTrue(TeamFilters.windowEnd(morning) > eveningKickoff)
|
||||
|
||||
// Late at night: still at least three hours ahead.
|
||||
cal.set(java.util.Calendar.HOUR_OF_DAY, 23)
|
||||
cal.set(java.util.Calendar.MINUTE, 30)
|
||||
val lateNight = cal.timeInMillis
|
||||
assertTrue(
|
||||
TeamFilters.windowEnd(lateNight) >= lateNight + TeamFilters.MIN_WINDOW_MS
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `covers all three divisions`() {
|
||||
assertTrue(TeamFilters.all.size > 50)
|
||||
|
||||
58
tools/crest-sources.json
Normal file
58
tools/crest-sources.json
Normal file
@@ -0,0 +1,58 @@
|
||||
{
|
||||
"aachen": "https://upload.wikimedia.org/wikipedia/commons/thumb/9/94/Alemannia_Aachen_2010.svg/langde-330px-Alemannia_Aachen_2010.svg.png",
|
||||
"aue": "https://thumb.wikimedia.org/wikipedia/de/thumb/1/13/Fc_erzgebirge_aue.svg/langde-330px-Fc_erzgebirge_aue.svg.png",
|
||||
"augsburg": "https://upload.wikimedia.org/wikipedia/de/thumb/b/b5/Logo_FC_Augsburg.svg/langde-330px-Logo_FC_Augsburg.svg.png",
|
||||
"bayern": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/8d/FC_Bayern_M%C3%BCnchen_logo_%282024%29.svg/langde-330px-FC_Bayern_M%C3%BCnchen_logo_%282024%29.svg.png",
|
||||
"bielefeld": "https://thumb.wikimedia.org/wikipedia/commons/thumb/f/fd/Arminia_Bielefeld_Logo_2021%E2%80%93.svg/langde-330px-Arminia_Bielefeld_Logo_2021%E2%80%93.svg.png",
|
||||
"bochum": "https://thumb.wikimedia.org/wikipedia/commons/thumb/7/72/VfL_Bochum_logo.svg/langde-330px-VfL_Bochum_logo.svg.png",
|
||||
"braunschweig": "https://thumb.wikimedia.org/wikipedia/de/thumb/4/45/Logo_Eintracht_Braunschweig.svg/langde-330px-Logo_Eintracht_Braunschweig.svg.png",
|
||||
"bremen": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/be/SV-Werder-Bremen-Logo.svg/langde-330px-SV-Werder-Bremen-Logo.svg.png",
|
||||
"bvb": "https://upload.wikimedia.org/wikipedia/commons/thumb/6/67/Borussia_Dortmund_logo.svg/langde-330px-Borussia_Dortmund_logo.svg.png",
|
||||
"cottbus": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/55/Logo_Energie_Cottbus.svg/langde-330px-Logo_Energie_Cottbus.svg.png",
|
||||
"darmstadt": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e5/SV_Darmstadt_98_Logo.svg/langde-330px-SV_Darmstadt_98_Logo.svg.png",
|
||||
"dresden": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e1/Logo_SG_Dynamo_Dresden_neu.svg/langde-330px-Logo_SG_Dynamo_Dresden_neu.svg.png",
|
||||
"duesseldorf": "https://thumb.wikimedia.org/wikipedia/commons/thumb/9/94/Fortuna_D%C3%BCsseldorf.svg/langde-330px-Fortuna_D%C3%BCsseldorf.svg.png",
|
||||
"duisburg": "https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/Msv_duisburg_%282017%29.svg/langde-330px-Msv_duisburg_%282017%29.svg.png",
|
||||
"elversberg": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d4/SV_Elversberg_Logo_2021.svg/langde-330px-SV_Elversberg_Logo_2021.svg.png",
|
||||
"essen": "https://upload.wikimedia.org/wikipedia/de/thumb/8/8a/Logo_Rot-Weiss_Essen.svg/langde-330px-Logo_Rot-Weiss_Essen.svg.png",
|
||||
"frankfurt": "https://upload.wikimedia.org/wikipedia/de/thumb/3/32/Logo_Eintracht_Frankfurt_1998.svg/langde-330px-Logo_Eintracht_Frankfurt_1998.svg.png",
|
||||
"freiburg": "https://upload.wikimedia.org/wikipedia/de/thumb/b/bf/SC_Freiburg_Logo.svg/langde-330px-SC_Freiburg_Logo.svg.png",
|
||||
"fuerth": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/b1/SpVgg_Greuther_F%C3%BCrth_2017.svg/langde-330px-SpVgg_Greuther_F%C3%BCrth_2017.svg.png",
|
||||
"gladbach": "https://thumb.wikimedia.org/wikipedia/commons/thumb/8/81/Borussia_M%C3%B6nchengladbach_logo.svg/langde-330px-Borussia_M%C3%B6nchengladbach_logo.svg.png",
|
||||
"hannover": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/cd/Hannover_96_Logo.svg/langde-330px-Hannover_96_Logo.svg.png",
|
||||
"hansa": "https://thumb.wikimedia.org/wikipedia/commons/thumb/8/8f/F.C._Hansa_Rostock_Logo.svg/langde-330px-F.C._Hansa_Rostock_Logo.svg.png",
|
||||
"havelse": "https://thumb.wikimedia.org/wikipedia/commons/thumb/8/89/TSV_Havelse_logo.svg/langde-330px-TSV_Havelse_logo.svg.png",
|
||||
"heidenheim": "https://thumb.wikimedia.org/wikipedia/commons/thumb/9/9d/1._FC_Heidenheim_1846.svg/langde-330px-1._FC_Heidenheim_1846.svg.png",
|
||||
"hertha": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/Hertha_BSC_Logo_2012.svg/langde-330px-Hertha_BSC_Logo_2012.svg.png",
|
||||
"hoffenheim": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/Logo_TSG_Hoffenheim.svg/langde-330px-Logo_TSG_Hoffenheim.svg.png",
|
||||
"hoffenheim-ii": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/Logo_TSG_Hoffenheim.svg/langde-330px-Logo_TSG_Hoffenheim.svg.png",
|
||||
"holstein": "https://upload.wikimedia.org/wikipedia/commons/thumb/3/30/Holstein_Kiel_Logo.svg/langde-330px-Holstein_Kiel_Logo.svg.png",
|
||||
"hsv": "https://thumb.wikimedia.org/wikipedia/commons/thumb/f/f7/Hamburger_SV_logo.svg/langde-330px-Hamburger_SV_logo.svg.png",
|
||||
"ingolstadt": "https://thumb.wikimedia.org/wikipedia/de/thumb/5/55/FC-Ingolstadt_logo.svg/langde-330px-FC-Ingolstadt_logo.svg.png",
|
||||
"kaiserslautern": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d3/Logo_1_FC_Kaiserslautern.svg/langde-330px-Logo_1_FC_Kaiserslautern.svg.png",
|
||||
"karlsruhe": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Karlsruher_SC_Logo_2.svg/langde-330px-Karlsruher_SC_Logo_2.svg.png",
|
||||
"koeln": "https://thumb.wikimedia.org/wikipedia/commons/thumb/0/01/1._FC_Koeln_Logo_2014%E2%80%93.svg/langde-330px-1._FC_Koeln_Logo_2014%E2%80%93.svg.png",
|
||||
"leipzig": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/ab/2019-07-12_Fu%C3%9Fball%3B_Freundschaftsspiel_RB_Leipzig_-_FC_Z%C3%BCrich_1DX_0881_by_Stepro_2.png/330px-2019-07-12_Fu%C3%9Fball%3B_Freundschaftsspiel_RB_Leipzig_-_FC_Z%C3%BCrich_1DX_0881_by_Stepro_2.png",
|
||||
"leverkusen": "https://upload.wikimedia.org/wikipedia/de/thumb/f/f7/Bayer_Leverkusen_Logo.svg/langde-330px-Bayer_Leverkusen_Logo.svg.png",
|
||||
"magdeburg": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/1._FC_Magdeburg.svg/langde-330px-1._FC_Magdeburg.svg.png",
|
||||
"mainz": "https://thumb.wikimedia.org/wikipedia/commons/thumb/9/9e/Logo_Mainz_05.svg/langde-330px-Logo_Mainz_05.svg.png",
|
||||
"mannheim": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/17/Svwaldhof.svg/langde-330px-Svwaldhof.svg.png",
|
||||
"muenster": "https://thumb.wikimedia.org/wikipedia/de/thumb/7/7e/SC_Preussen_Muenster_Logo_2018.svg/langde-330px-SC_Preussen_Muenster_Logo_2018.svg.png",
|
||||
"nuernberg": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/1._FC_N%C3%BCrnberg_logo.svg/langde-330px-1._FC_N%C3%BCrnberg_logo.svg.png",
|
||||
"osnabrueck": "https://thumb.wikimedia.org/wikipedia/commons/thumb/4/4e/VfL_Osnabrueck_Logo_2021%E2%80%93.svg/langde-330px-VfL_Osnabrueck_Logo_2021%E2%80%93.svg.png",
|
||||
"paderborn": "https://upload.wikimedia.org/wikipedia/commons/thumb/6/67/SC_Paderborn_07_Logo_new.svg/langde-330px-SC_Paderborn_07_Logo_new.svg.png",
|
||||
"regensburg": "https://thumb.wikimedia.org/wikipedia/commons/thumb/3/3d/Jahn_Regensburg_logo2014.svg/langde-330px-Jahn_Regensburg_logo2014.svg.png",
|
||||
"saarbruecken": "https://thumb.wikimedia.org/wikipedia/de/thumb/f/ff/1._FC_Saarbr%C3%BCcken.svg/langde-330px-1._FC_Saarbr%C3%BCcken.svg.png",
|
||||
"schalke": "https://upload.wikimedia.org/wikipedia/commons/thumb/6/6d/FC_Schalke_04_Logo.svg/langde-330px-FC_Schalke_04_Logo.svg.png",
|
||||
"schweinfurt": "https://thumb.wikimedia.org/wikipedia/de/thumb/7/7c/1._FC_Schweinfurt_05.svg/langde-330px-1._FC_Schweinfurt_05.svg.png",
|
||||
"st-pauli": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Fc_st_pauli_logo.svg/langde-330px-Fc_st_pauli_logo.svg.png",
|
||||
"stuttgart": "https://thumb.wikimedia.org/wikipedia/commons/thumb/e/eb/VfB_Stuttgart_1893_Logo.svg/langde-330px-VfB_Stuttgart_1893_Logo.svg.png",
|
||||
"stuttgart-ii": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/VfB_Stuttgart_1893_Logo.svg/langde-330px-VfB_Stuttgart_1893_Logo.svg.png",
|
||||
"ulm": "https://thumb.wikimedia.org/wikipedia/commons/thumb/6/6c/SSV_Ulm_1846_Fussball.svg/langde-330px-SSV_Ulm_1846_Fussball.svg.png",
|
||||
"union": "https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/1._FC_Union_Berlin_Logo.svg/langde-330px-1._FC_Union_Berlin_Logo.svg.png",
|
||||
"verl": "https://thumb.wikimedia.org/wikipedia/commons/thumb/c/ce/SC_Verl_Logo.svg/langde-330px-SC_Verl_Logo.svg.png",
|
||||
"viktoria": "https://thumb.wikimedia.org/wikipedia/commons/thumb/d/dc/FC_Viktoria_K%C3%B6ln_1904_Logo.svg/langde-330px-FC_Viktoria_K%C3%B6ln_1904_Logo.svg.png",
|
||||
"wehen": "https://upload.wikimedia.org/wikipedia/de/e/e0/SV_Wehen_Logo.png",
|
||||
"wolfsburg": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/VfL_Wolfsburg_logo_2026.svg/langde-330px-VfL_Wolfsburg_logo_2026.svg.png",
|
||||
"wuppertal": "https://thumb.wikimedia.org/wikipedia/de/thumb/9/9b/WuppertalerSVLogo.svg/langde-330px-WuppertalerSVLogo.svg.png"
|
||||
}
|
||||
67
tools/fetch-crests.py
Normal file
67
tools/fetch-crests.py
Normal file
@@ -0,0 +1,67 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Downloads club crests into the APK's assets at build time.
|
||||
|
||||
The badges are trademarks: they are fetched into a generated, git-ignored
|
||||
folder so the repository stays free of them while the app ships with them
|
||||
and needs no network at runtime.
|
||||
"""
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import time
|
||||
import urllib.parse
|
||||
import urllib.request
|
||||
|
||||
OUT = sys.argv[1] if len(sys.argv) > 1 else "app/src/main/assets/crests"
|
||||
URLS = "tools/crest-sources.json"
|
||||
SRC = "app/src/main/java/dev/castarr/tv/data/TeamFilters.kt"
|
||||
SUMMARY = "https://de.wikipedia.org/api/rest_v1/page/summary/"
|
||||
UA = {"User-Agent": "Castarr build script (private use)"}
|
||||
|
||||
os.makedirs(OUT, exist_ok=True)
|
||||
# Image URLs are plain text and safe to commit; the artwork itself is not.
|
||||
sources = {}
|
||||
if os.path.exists(URLS):
|
||||
sources = json.load(open(URLS, encoding="utf-8"))
|
||||
kotlin = open(SRC, encoding="utf-8").read()
|
||||
entries = re.findall(r'club\((.*?)\)\s*,\s*(?://.*)?$', kotlin, re.M | re.S)
|
||||
clubs = []
|
||||
for raw in re.findall(r'club\(\s*"([^"]+)",\s*"[^"]*",\s*"([^"]+)"[^\n]*', kotlin):
|
||||
clubs.append(raw)
|
||||
# an explicit article = "..." wins over the club name
|
||||
overrides = dict(re.findall(r'club\(\s*"([^"]+)"[^\n]*article = "([^"]+)"', kotlin))
|
||||
clubs = [(k, overrides.get(k, n)) for k, n in clubs]
|
||||
|
||||
fetched = skipped = failed = 0
|
||||
for key, full_name in clubs:
|
||||
target = os.path.join(OUT, f"{key}.png")
|
||||
if os.path.exists(target) and os.path.getsize(target) > 0:
|
||||
skipped += 1
|
||||
continue
|
||||
try:
|
||||
thumb = sources.get(key)
|
||||
if not thumb:
|
||||
url = SUMMARY + urllib.parse.quote(full_name)
|
||||
with urllib.request.urlopen(urllib.request.Request(url, headers=UA), timeout=20) as r:
|
||||
thumb = json.load(r).get("thumbnail", {}).get("source")
|
||||
if not thumb:
|
||||
raise ValueError("no thumbnail")
|
||||
sources[key] = thumb.split("?")[0]
|
||||
thumb = sources[key]
|
||||
with urllib.request.urlopen(urllib.request.Request(thumb, headers=UA), timeout=20) as r:
|
||||
data = r.read()
|
||||
with open(target, "wb") as f:
|
||||
f.write(data)
|
||||
fetched += 1
|
||||
except Exception as exc: # noqa: BLE001 - best effort, shield is the fallback
|
||||
print(f" {key}: {exc}", file=sys.stderr)
|
||||
failed += 1
|
||||
# Wikipedia rate-limits bursts; this runs rarely and caches.
|
||||
time.sleep(1.2)
|
||||
|
||||
with open(URLS, "w", encoding="utf-8") as f:
|
||||
json.dump(dict(sorted(sources.items())), f, indent=2, ensure_ascii=False)
|
||||
f.write("\n")
|
||||
|
||||
print(f"crests: {fetched} geladen, {skipped} vorhanden, {failed} fehlgeschlagen")
|
||||
Reference in New Issue
Block a user