Orbit Signature, Orbit Unscripted and Orbit Christmas (0.108.71)
Paul, 6 November 2026, line-ups approved (docs/new-channels-signature- unscripted-christmas.md) and looks drawn from his concept board: 109 Signature, award-winning drama in four day parts; 110 Unscripted, reality in five; 310 Orbit Christmas, Christmas films by day part, in season from November to December and gone from the guide and Home the rest of the year. Christmas's ident is the Blender village with the big tree and its gold star. Each is off until switched on in Settings › Channels. Also steadies a phone-link test that sometimes found its port still held. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@@ -9,8 +9,8 @@ android {
|
||||
applicationId = "tv.orbit.classic"
|
||||
minSdk = 26
|
||||
targetSdk = 36
|
||||
versionCode = 230
|
||||
versionName = "0.108.70-saturday-mornings"
|
||||
versionCode = 231
|
||||
versionName = "0.108.71-new-channels"
|
||||
}
|
||||
buildFeatures { compose = true }
|
||||
// The finished build for the TVs (Paul, 6 November 2026: the test build stuttered on the box). Not debuggable, so
|
||||
|
||||
@@ -16,6 +16,9 @@ internal object ChannelBrands {
|
||||
611 to ChannelBranding("orbit-junior", "Orbit Junior", R.drawable.orbit_junior_epg, R.drawable.orbit_one_background, R.drawable.orbit_junior_bug, ChannelCategory.Kids),
|
||||
TOTS_NUMBER to ChannelBranding("orbit-tots", "Orbit Tots", R.drawable.orbit_tots_epg, R.drawable.orbit_one_background, R.drawable.orbit_tots_bug, ChannelCategory.Kids),
|
||||
203 to ChannelBranding("orbit-wild", "Orbit Wild", R.drawable.orbit_wild_epg, R.drawable.orbit_one_background, R.drawable.orbit_wild_bug, ChannelCategory.Documentaries),
|
||||
109 to ChannelBranding("orbit-signature", "Orbit Signature", R.drawable.orbit_signature_epg, R.drawable.orbit_signature_background, R.drawable.orbit_signature_bug, ChannelCategory.Entertainment),
|
||||
110 to ChannelBranding("orbit-unscripted", "Orbit Unscripted", R.drawable.orbit_unscripted_epg, R.drawable.orbit_unscripted_background, R.drawable.orbit_unscripted_bug, ChannelCategory.Entertainment),
|
||||
CHRISTMAS_NUMBER to ChannelBranding("orbit-christmas", "Orbit Christmas", R.drawable.orbit_christmas_epg, R.drawable.orbit_christmas_background, R.drawable.orbit_christmas_bug, ChannelCategory.Movies),
|
||||
205 to ChannelBranding("orbit-kitchen", "Orbit Kitchen", R.drawable.orbit_kitchen_epg, R.drawable.orbit_kitchen_background, R.drawable.orbit_kitchen_bug, ChannelCategory.Documentaries),
|
||||
206 to ChannelBranding("orbit-home", "Orbit Home", R.drawable.orbit_home_epg, R.drawable.orbit_home_background, R.drawable.orbit_home_bug, ChannelCategory.Documentaries),
|
||||
108 to ChannelBranding("orbit-play", "Orbit Play", R.drawable.orbit_play_epg, R.drawable.orbit_play_background, R.drawable.orbit_play_bug, ChannelCategory.Entertainment),
|
||||
@@ -46,7 +49,7 @@ internal object ChannelBrands {
|
||||
}
|
||||
|
||||
internal fun availableSampleChannels(vararg channels: SampleChannel?): List<SampleChannel> =
|
||||
channels.filterNotNull().distinctBy { it.number }.sortedBy { it.number }
|
||||
channels.filterNotNull().filter { inSeason(it.number, System.currentTimeMillis()) }.distinctBy { it.number }.sortedBy { it.number }
|
||||
|
||||
/** Up and down wrap round the lineup, like a TV. A channel missing from the lineup stays put. */
|
||||
internal fun channelAfter(numbers: List<Int>, current: Int, step: Int): Int {
|
||||
|
||||
@@ -294,6 +294,7 @@ private val OdysseyJourneys = listOf("Civilisation", "Civilizations", "Civilisat
|
||||
"Rome's Greatest Battles", "Ancient Apocalypse", "Ancient Apocalypse (2022)", "Long Way Round", "Long Way Down", "Parts Unknown", "Anthony Bourdain: Parts Unknown", "An Idiot Abroad", "Michael Palin's Himalaya", "Himalaya with Michael Palin", "Pole to Pole", "Pole to Pole with Michael Palin",
|
||||
"Around the World in 80 Days")
|
||||
/** A drama, so not factual. Kept on the list as Paul chose it, but in no block until it has a scripted-drama home or a special event. */
|
||||
// Its scripted-drama home is now Orbit Signature (6 November 2026); Odyssey's list is left as Paul chose it.
|
||||
private val OdysseyAwaitingHome = listOf("Band of Brothers")
|
||||
internal val OdysseyShows get() = (OdysseySpace + OdysseyEngineering + OdysseyDisasters + OdysseyJourneys + OdysseyAwaitingHome).distinct()
|
||||
internal val OdysseyDayParts get() = listOf(
|
||||
@@ -508,3 +509,56 @@ internal val PlayBigMoney = listOf("Deal or No Deal", "The 1% Club", "Who Wants
|
||||
internal val PlayLate = listOf("Mastermind", "University Challenge", "Only Connect", "The Weakest Link (2021)")
|
||||
internal val PlayShows get() = (PlayMorning + PlayTeatime + PlaySpectacle + PlayBigMoney + PlayLate).distinct()
|
||||
internal val PlayDayParts get() = listOf(DayPart(6, 12, PlayMorning), DayPart(12, 17, PlayTeatime), DayPart(17, 20, PlaySpectacle), DayPart(20, 23, PlayBigMoney), DayPart(23, 6, PlayLate))
|
||||
|
||||
/**
|
||||
* Orbit Signature, Orbit Unscripted and Orbit Christmas (Paul, 6 November 2026; docs/new-channels-signature-unscripted-
|
||||
* christmas.md). Every title checked against the library's catalogue; shows another channel carries are left out.
|
||||
*/
|
||||
internal val SignatureMorning = listOf("The West Wing", "Downton Abbey", "The Crown", "Friday Night Lights", "Bridgerton", "The Gilded Age", "Outlander", "The Last Kingdom", "Vikings", "Lost (2004)")
|
||||
internal val SignatureAfternoon = listOf("Mad Men", "Six Feet Under", "Halt and Catch Fire", "The Morning Show", "Homeland", "House of Cards (1990)", "Wolf Hall", "Industry", "Slow Horses",
|
||||
"Normal People", "Killing Eve", "Doctor Foster", "The Night Manager", "Prime Suspect")
|
||||
internal val SignaturePrime = listOf("The Sopranos", "Breaking Bad", "Better Call Saul", "Succession", "Game of Thrones", "House of the Dragon", "True Detective", "Fargo", "Chernobyl",
|
||||
"Band of Brothers", "The Pacific", "The Last of Us", "Shōgun", "Severance", "The Bear", "The White Lotus", "Big Little Lies", "Mare of Easttown", "Peaky Blinders", "Yellowstone", "Andor",
|
||||
"The Queen's Gambit")
|
||||
internal val SignatureLate = listOf("Deadwood", "Boardwalk Empire", "Oz (1997)", "The Shield", "Rome (2005)", "The Leftovers", "Mr. Robot", "Babylon Berlin", "Dark (2017)", "Narcos", "Ozark", "MINDHUNTER",
|
||||
"Sharp Objects", "The Night Of", "Tokyo Vice", "Hijack", "The Handmaid's Tale")
|
||||
internal val SignatureShows get() = (SignatureMorning + SignatureAfternoon + SignaturePrime + SignatureLate).distinct()
|
||||
internal val SignatureDayParts get() = listOf(DayPart(6, 12, SignatureMorning), DayPart(12, 18, SignatureAfternoon), DayPart(18, 23, SignaturePrime), DayPart(23, 6, SignatureLate))
|
||||
|
||||
internal val UnscriptedMorning = listOf("Bargain Hunt", "Antiques Roadshow", "Pawn Stars", "Storage Wars", "American Pickers", "Duck Dynasty", "Dragons' Den", "Shark Tank", "Four in a Bed",
|
||||
"Don't Tell the Bride", "Wife Swap")
|
||||
internal val UnscriptedAfternoon = listOf("Airport (1996)", "Wanted Down Under", "Border Security: Australia's Front Line", "Traffic Cops", "Police Interceptors", "24 Hours in A&E", "Embarrassing Bodies",
|
||||
"Supersize vs Superskinny", "Ladette to Lady", "Faking It (2000)", "The Great British Sewing Bee", "Dance Moms", "Toddlers & Tiaras")
|
||||
internal val UnscriptedFormats = listOf("Gogglebox", "Race Across the World", "The Traitors", "Survivor (2000)", "The Amazing Race", "SAS: Who Dares Wins", "Hunted (2012)", "The X Factor", "Britain's Got Talent",
|
||||
"RuPaul's Drag Race", "RuPaul's Drag Race UK")
|
||||
internal val UnscriptedLate = listOf("Love Island", "Married at First Sight", "First Dates", "Too Hot to Handle", "Love is Blind", "The Bachelor", "The Bachelorette", "Celebrity Big Brother",
|
||||
"I'm a Celebrity...Get Me Out of Here!", "The Only Way is Essex", "Made in Chelsea", "Geordie Shore", "Jersey Shore", "Keeping Up with the Kardashians", "The Real Housewives of Beverly Hills",
|
||||
"Vanderpump Rules", "Below Deck", "Catfish: The TV Show", "Snog Marry Avoid?")
|
||||
internal val UnscriptedOvernight = listOf("The Osbournes", "The Simple Life", "The Hills", "Laguna Beach: The Real Orange County", "16 and Pregnant", "Bad Girls Club", "Benefits Street")
|
||||
internal val UnscriptedShows get() = (UnscriptedMorning + UnscriptedAfternoon + UnscriptedFormats + UnscriptedLate + UnscriptedOvernight).distinct()
|
||||
internal val UnscriptedDayParts get() = listOf(DayPart(6, 12, UnscriptedMorning), DayPart(12, 18, UnscriptedAfternoon), DayPart(18, 21, UnscriptedFormats), DayPart(21, 1, UnscriptedLate),
|
||||
DayPart(1, 6, UnscriptedOvernight))
|
||||
/** Episodes mix, except competitions and the docusoaps, which run in their order. */
|
||||
internal val UnscriptedMixed get() = (UnscriptedMorning + UnscriptedAfternoon + listOf("Gogglebox", "First Dates", "Catfish: The TV Show", "Snog Marry Avoid?") + UnscriptedOvernight).toSet() -
|
||||
setOf("The Great British Sewing Bee", "Dance Moms", "The Hills", "Laguna Beach: The Real Orange County")
|
||||
|
||||
internal val ChristmasFamily = listOf("Elf", "Home Alone", "Home Alone 2: Lost in New York", "The Polar Express", "Klaus", "Arthur Christmas", "How the Grinch Stole Christmas", "The Grinch",
|
||||
"The Muppet Christmas Carol", "The Santa Clause", "The Nightmare Before Christmas", "Nativity!", "Get Santa", "Noelle", "The Christmas Chronicles", "Fred Claus", "The Snowman",
|
||||
"Rudolph the Red-Nosed Reindeer", "Frosty the Snowman", "Mickey's Once Upon a Christmas", "Santa Claus: The Movie", "Ernest Saves Christmas", "Scrooge (1970)", "Miracle on 34th Street (1947)",
|
||||
"It's a Wonderful Life", "White Christmas", "Holiday Inn", "The Bishop's Wife")
|
||||
internal val ChristmasCosy = listOf("The Holiday", "Last Christmas", "Happiest Season", "Four Christmases", "The Family Stone", "While You Were Sleeping", "The Shop Around the Corner",
|
||||
"Falling for Christmas", "A Castle for Christmas", "The Princess Switch", "Single All the Way", "Let It Snow", "Christmas Inheritance", "Holiday Affair",
|
||||
"National Lampoon's Christmas Vacation", "Christmas with the Kranks", "Deck the Halls", "Spirited", "Red One", "Scrooged")
|
||||
internal val ChristmasLate = listOf("Love Actually", "Bad Santa", "Die Hard", "Trading Places", "Planes, Trains and Automobiles", "Office Christmas Party", "Krampus", "Gremlins", "Batman Returns",
|
||||
"Edward Scissorhands", "Carol (2015)", "Bridget Jones's Diary", "Violent Night", "Black Christmas (2006)", "Silent Night (2012)", "Rare Exports: A Christmas Tale", "Anna and the Apocalypse", "Better Watch Out")
|
||||
internal val ChristmasFilms get() = (ChristmasFamily + ChristmasCosy + ChristmasLate).distinct()
|
||||
internal val ChristmasDayParts get() = listOf(DayPart(6, 17, ChristmasFamily), DayPart(17, 21, ChristmasCosy), DayPart(21, 1, ChristmasLate), DayPart(1, 6, ChristmasFamily))
|
||||
|
||||
internal const val CHRISTMAS_NUMBER = 310
|
||||
|
||||
/**
|
||||
* Orbit Christmas is seasonal (Paul, 6 November 2026: "from today ... off from 1st January"): on from 1 November to
|
||||
* 31 December, and nowhere in the guide or Home the rest of the year.
|
||||
*/
|
||||
internal fun inSeason(number: Int, timeMs: Long, zone: java.time.ZoneId = java.time.ZoneId.systemDefault()): Boolean =
|
||||
number != CHRISTMAS_NUMBER || java.time.Instant.ofEpochMilli(timeMs).atZone(zone).monthValue >= 11
|
||||
|
||||
@@ -47,6 +47,10 @@ internal val ChannelPresets = listOf(
|
||||
ChannelPreset(203, "Orbit Wild", WildShows, smartOnly = true),
|
||||
ChannelPreset(102, "Orbit 2", Orbit2Shows, smartOnly = true),
|
||||
ChannelPreset(205, "Orbit Kitchen", KitchenShows, smartOnly = true),
|
||||
// Signature, Unscripted and Orbit Christmas (Paul, 6 November 2026).
|
||||
ChannelPreset(109, "Orbit Signature", SignatureShows, smartOnly = true),
|
||||
ChannelPreset(110, "Orbit Unscripted", UnscriptedShows, smartOnly = true),
|
||||
ChannelPreset(CHRISTMAS_NUMBER, "Orbit Christmas", ChristmasFilms, smartOnly = true, films = true),
|
||||
ChannelPreset(206, "Orbit Home", HomeShows, smartOnly = true),
|
||||
ChannelPreset(108, "Orbit Play", PlayShows, smartOnly = true),
|
||||
ChannelPreset(612, "Wonder", listOf("Snow White and the Seven Dwarfs (1938)", "Pinocchio (1940)", "Dumbo (1941)", "Bambi", "Cinderella (1950)", "Alice in Wonderland (1951)", "Peter Pan (1953)", "Lady and the Tramp (1955)", "Sleeping Beauty (1959)", "One Hundred and One Dalmatians", "The Jungle Book (1967)", "The Aristocats", "Robin Hood (1973)",
|
||||
|
||||
@@ -225,7 +225,7 @@ private val BuiltInChannels = listOf(
|
||||
* other series channel since 5 November 2026 (Paul: part ones first, everywhere): weighted blocks book a story whole, and a
|
||||
* mixed show in equal turns keeps it whole and in order in its deck.
|
||||
*/
|
||||
private val StoryGroupingChannels get() = setOf(101, 102, 103, 104, 105, 107, 108, 202, 203, 204, 205, 206, 401, 602, 603, 604, 605, 611)
|
||||
private val StoryGroupingChannels get() = setOf(101, 102, 103, 104, 105, 107, 108, 109, 110, 202, 203, 204, 205, 206, 401, 602, 603, 604, 605, 611)
|
||||
|
||||
/**
|
||||
* Where a short series must keep at least half its tier's weight, so the hybrid trims its weekly repeats without cutting its
|
||||
@@ -250,12 +250,13 @@ private val CatalogueScaledChannels get() = setOf(604, 204, 103, 202, 605)
|
||||
private val SmartChannelMixed: Map<Int, Set<String>> get() = mapOf(101 to Orbit1Mixed, 102 to Orbit2Mixed, 103 to ThreeMixed, 104 to GoldMixed, 105 to RiotMixed,
|
||||
602 to HeroesMixed, 603 to OrbitXMixed, 604 to RewindMixed, 605 to ToonZMixed,
|
||||
203 to WildMixed, 202 to OdysseyMixed, 107 to EvidenceMixed, 611 to JuniorMixed,
|
||||
205 to KitchenShows.toSet(), 206 to HomeShows.toSet(), 108 to PlayShows.toSet())
|
||||
205 to KitchenShows.toSet(), 206 to HomeShows.toSet(), 108 to PlayShows.toSet(), 110 to UnscriptedMixed)
|
||||
|
||||
/** Dark Files, from the programming bible: crime by day, mysteries early evening, the paranormal late. */
|
||||
private val SmartChannelParts: Map<Int, List<DayPart>> get() = mapOf(101 to Orbit1DayParts, 102 to Orbit2DayParts, 103 to ThreeDayParts, 104 to GoldDayParts, 105 to RiotDayParts, 304 to HorrorDayParts,
|
||||
602 to HeroesDayParts, 603 to OrbitXDayParts, 604 to RewindDayParts, 605 to ToonZDayParts, 204 to DarkFilesDayParts, 203 to WildDayParts, 202 to OdysseyDayParts, 107 to EvidenceDayParts,
|
||||
401 to RingXDayParts, 611 to JuniorDayParts, 205 to KitchenDayParts, 206 to HomeDayParts, 108 to PlayDayParts)
|
||||
401 to RingXDayParts, 611 to JuniorDayParts, 205 to KitchenDayParts, 206 to HomeDayParts, 108 to PlayDayParts,
|
||||
109 to SignatureDayParts, 110 to UnscriptedDayParts, CHRISTMAS_NUMBER to ChristmasDayParts)
|
||||
|
||||
/** Optional bigger pools, only used once reviewed. No rule for Orbit Gold or Orbit Three: nothing in the library's details can tell a British sitcom apart. */
|
||||
private val SmartChannelRules: Map<Int, List<SuggestionRule>> get() = mapOf(
|
||||
|
||||
@@ -50,6 +50,13 @@ internal val Briefs: List<Brief> = listOf(
|
||||
themes = w("home", "house", "property", "renovat", "makeover", "garden", "design", "build", "restor", "interior"), against = w("murder", "killer", "crime", "haunt"), era = 1985 to 2026),
|
||||
Brief(108, "Orbit Play", setOf("Series"), setOf("Game Show"), setOf("Game Show"),
|
||||
themes = w("quiz", "game show", "contestant", "prize", "question", "puzzle", "challenge"), against = w("murder", "killer", "dating", "survivor"), era = 1960 to 2026, uk = true),
|
||||
// Signature, Unscripted and Orbit Christmas (Paul, 6 November 2026).
|
||||
Brief(109, "Orbit Signature", setOf("Series"), setOf("Drama"), setOf("Drama"),
|
||||
themes = w("drama", "family", "power", "empire", "war", "political", "dynasty", "crime family", "period", "historical"), against = w("sitcom", "cartoon", "reality", "game show", "kids"), era = 1990 to 2026),
|
||||
Brief(110, "Orbit Unscripted", setOf("Series"), setOf("Reality"), setOf("Reality"),
|
||||
themes = w("reality", "contestants", "couples", "dating", "villa", "follows", "fly-on-the-wall", "docusoap", "real life", "competition"), against = w("murder", "killer", "scripted", "cartoon"), era = 1995 to 2026),
|
||||
Brief(CHRISTMAS_NUMBER, "Orbit Christmas", setOf("Movie"), setOf("Family", "Comedy", "Romance", "Drama", "Animation", "Fantasy"),
|
||||
themes = w("christmas", "santa", "holiday season", "xmas", "snow", "elves", "reindeer", "festive", "noel"), against = w("documentary"), era = 1940 to 2026, needTheme = true),
|
||||
Brief(204, "Dark Files", setOf("Series"), setOf("Documentary", "Crime", "Mystery"), setOf("Documentary"),
|
||||
w("murder", "killer", "disappear", "missing", "true crime", "unsolved", "investigat", "case", "paranormal", "haunt", "unexplained", "cult", "conspiracy", "serial", "detective", "victim", "trial"),
|
||||
w("wildlife", "cooking"), 1975 to 2026, needTheme = true),
|
||||
|
||||
@@ -62,9 +62,9 @@ internal class HttpsEmbyTransport(internal val deviceId: String = UUID.randomUUI
|
||||
}
|
||||
/** The sign-in headers for this kind of server. */
|
||||
internal fun authHeaders(token: String?): Map<String, String> = when (kind) {
|
||||
ServerKind.Emby -> mapOf("X-Emby-Authorization" to "Emby Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.108.70\"") +
|
||||
ServerKind.Emby -> mapOf("X-Emby-Authorization" to "Emby Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.108.71\"") +
|
||||
(token?.let { mapOf("X-Emby-Token" to it) } ?: emptyMap())
|
||||
ServerKind.Jellyfin -> mapOf("Authorization" to "MediaBrowser Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.108.70\"" +
|
||||
ServerKind.Jellyfin -> mapOf("Authorization" to "MediaBrowser Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.108.71\"" +
|
||||
(token?.let { ", Token=\"$it\"" } ?: ""))
|
||||
}
|
||||
/** One picture from the provider, or nothing. Same fixed origin and no redirects, and failures are never shown or logged. */
|
||||
|
||||
@@ -32,7 +32,7 @@ internal const val IDENT_LOAD_AHEAD_MS = 12_000L
|
||||
internal const val IDENT_HOLD_MS = 6_000L
|
||||
private const val IDENT_SHORTEST_PROGRAMME_MS = 3 * 60_000L
|
||||
|
||||
private val IdentVideos = mapOf(108 to R.raw.ident_108, 205 to R.raw.ident_205, 206 to R.raw.ident_206, 101 to R.raw.ident_101, 102 to R.raw.ident_102, 103 to R.raw.ident_103, 104 to R.raw.ident_104, 105 to R.raw.ident_105, 106 to R.raw.ident_106, 107 to R.raw.ident_107,
|
||||
private val IdentVideos = mapOf(108 to R.raw.ident_108, 109 to R.raw.ident_109, 110 to R.raw.ident_110, CHRISTMAS_NUMBER to R.raw.ident_310, 205 to R.raw.ident_205, 206 to R.raw.ident_206, 101 to R.raw.ident_101, 102 to R.raw.ident_102, 103 to R.raw.ident_103, 104 to R.raw.ident_104, 105 to R.raw.ident_105, 106 to R.raw.ident_106, 107 to R.raw.ident_107,
|
||||
201 to R.raw.ident_201, 202 to R.raw.ident_202, 203 to R.raw.ident_203, 204 to R.raw.ident_204, 301 to R.raw.ident_301, 302 to R.raw.ident_302, 303 to R.raw.ident_303, 304 to R.raw.ident_304, 305 to R.raw.ident_305,
|
||||
306 to R.raw.ident_306, 307 to R.raw.ident_307, 308 to R.raw.ident_308, 309 to R.raw.ident_309, 401 to R.raw.ident_401, 601 to R.raw.ident_601, 602 to R.raw.ident_602, 603 to R.raw.ident_603, 604 to R.raw.ident_604, 605 to R.raw.ident_605,
|
||||
611 to R.raw.ident_611, 612 to R.raw.ident_612, 613 to R.raw.ident_613)
|
||||
|
||||
@@ -39,7 +39,7 @@ internal class SecureMediaDataSource(private val session: EmbySampleSession) : B
|
||||
next.instanceFollowRedirects = false
|
||||
next.connectTimeout = 10_000
|
||||
next.readTimeout = 20_000
|
||||
next.setRequestProperty("User-Agent", "OrbitTV/0.108.70")
|
||||
next.setRequestProperty("User-Agent", "OrbitTV/0.108.71")
|
||||
next.setRequestProperty("Accept-Encoding", "identity")
|
||||
session.mediaHeaders(address).forEach { (key, value) -> next.setRequestProperty(key, value) }
|
||||
if (dataSpec.position != 0L || dataSpec.length != C.LENGTH_UNSET.toLong()) {
|
||||
|
||||
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 4.1 KiB |
|
After Width: | Height: | Size: 6.3 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 4.1 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
@@ -164,7 +164,7 @@ class ChannelPresetsTest {
|
||||
listOf(612, 613, 306, 303, 304, 302, 307, 301).forEach { assertNotNull(SmartChannels.first { channel -> channel.number == it }.filmRestMs) }
|
||||
assertEquals(ChannelCategory.Sport, ChannelBrands.forNumber(401)!!.category)
|
||||
// Kitchen, Home and Play joined on 6 November 2026.
|
||||
assertEquals(33, SmartChannels.size)
|
||||
assertEquals(36, SmartChannels.size)
|
||||
}
|
||||
|
||||
@Test fun ringXKeepsItsWeeknightsAndFallsBackToTheVault() {
|
||||
@@ -195,7 +195,7 @@ class ChannelPresetsTest {
|
||||
|
||||
@Test fun everySmartChannelIsBrandedAndNumberedAfterTheMove() {
|
||||
SmartChannels.forEach { assertNotNull("${it.name} has no brand at ${it.number}", ChannelBrands.forNumber(it.number)) }
|
||||
assertEquals(OldChannelNumbers.values.toSet() - DRIVE_IN_NUMBER + 101 + TOTS_NUMBER + setOf(108, 205, 206), SmartChannels.map { it.number }.toSet())
|
||||
assertEquals(OldChannelNumbers.values.toSet() - DRIVE_IN_NUMBER + 101 + TOTS_NUMBER + setOf(108, 109, 110, 205, 206, CHRISTMAS_NUMBER), SmartChannels.map { it.number }.toSet())
|
||||
}
|
||||
|
||||
@Test fun kitchenHomeAndPlayAreBrandedInTheirBlocks() {
|
||||
@@ -256,4 +256,17 @@ class ChannelPresetsTest {
|
||||
SmartChannels.filter { it.filmRestMs != null && it.number != AFTER_DARK_NUMBER }.forEach { assertEquals(it.searches.size, it.seriesCount) }
|
||||
assertTrue(SmartChannels.first { it.number == 302 }.searches.size >= 100)
|
||||
}
|
||||
|
||||
@Test fun signatureUnscriptedAndChristmas() {
|
||||
assertEquals("Orbit Signature", ChannelBrands.forNumber(109)!!.displayName); assertEquals(ChannelCategory.Movies, ChannelBrands.forNumber(CHRISTMAS_NUMBER)!!.category)
|
||||
// Orbit Christmas is on from November to December, and gone the rest of the year.
|
||||
val zone = java.time.ZoneId.of("Europe/London")
|
||||
fun at(m: Int, d: Int) = java.time.LocalDate.of(2026, m, d).atStartOfDay(zone).toInstant().toEpochMilli()
|
||||
assertTrue(inSeason(CHRISTMAS_NUMBER, at(11, 6), zone)); assertTrue(inSeason(CHRISTMAS_NUMBER, at(12, 31), zone))
|
||||
assertFalse(inSeason(CHRISTMAS_NUMBER, at(1, 1), zone)); assertFalse(inSeason(CHRISTMAS_NUMBER, at(10, 31), zone))
|
||||
assertTrue(inSeason(109, at(1, 1), zone))
|
||||
// No show another channel carries, so each keeps its identity: only Band of Brothers, which Odyssey keeps listed but in no block.
|
||||
val others = SmartChannels.filter { it.number !in setOf(109, 110, CHRISTMAS_NUMBER) }.flatMap { it.searches }.toSet() - "Band of Brothers"
|
||||
assertTrue((SignatureShows + UnscriptedShows).none { it in others })
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,13 @@ class PhoneLinkTest {
|
||||
PhoneLink.pinNeeded = { false }
|
||||
PhoneLink.handler = PhoneHandler(ChannelMaker({ d, _, _ -> listOf(Suggestion("x1", "The X-Files", 1993, "Series", "", "Science Fiction, 1990s")).filter { d.isNotBlank() } },
|
||||
{ emptyList() }, { c, s -> made = c to s; "${c.name} is ready" }, { emptyList() }), { false }, { watched += it })
|
||||
PhoneLink.start()
|
||||
// The port can still be held for a moment by the test before (it failed now and then with Connection refused):
|
||||
// try again until the link is listening.
|
||||
repeat(40) {
|
||||
PhoneLink.start()
|
||||
if (runCatching { java.net.Socket("127.0.0.1", port).close() }.isSuccess) return
|
||||
Thread.sleep(50)
|
||||
}
|
||||
}
|
||||
@After fun down() { PhoneLink.stop(); PhoneLink.handler = null; PhoneLink.allowed = EmbyServer::isHomeAddress; PhoneLink.bindTo = null; PhoneLink.port = PhoneLink.PORT; PhoneLink.clock = System::currentTimeMillis; CustomChannels.clear() }
|
||||
|
||||
|
||||