Skip to content

GTFS-RT Trip Updates > validate GTFS-RT file available before trying to compute real-time Schedule/Timestamps #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmathieum merged 2 commits into from
Mar 27, 2026
Merged

GTFS-RT Trip Updates > validate GTFS-RT file available before trying to compute real-time Schedule/Timestamps #102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf495f5
GTFS-RT Trip Updates > validate GTFS-RT file available before trying …
mmathieum Mar 27, 2026
1d4fb47
PR comments
mmathieum Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions ...main/java/org/mtransit/android/commons/provider/status/GTFSRealTimeTripUpdatesProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import org.mtransit.android.commons.SecurityUtils
import org.mtransit.android.commons.TimeUtils
import org.mtransit.android.commons.TimeUtilsK
import org.mtransit.android.commons.data.POIStatus
import org.mtransit.android.commons.data.RouteDirectionStop
import org.mtransit.android.commons.data.Schedule
import org.mtransit.android.commons.data.arrival
import org.mtransit.android.commons.data.departure
Expand Down Expand Up @@ -98,6 +97,9 @@ object GTFSRealTimeTripUpdatesProvider : MTLog.Loggable {
filter: Schedule.ScheduleStatusFilter,
tripIds: List<String>
): POIStatus? {
val context = context ?: return null
if (!File(context.cacheDir, GTFS_RT_TRIP_UPDATE_PB_FILE_NAME).exists()) return null
if (GtfsRealTimeStorage.getTripUpdateLastUpdateMs(context, 0L) <= 0L) return null // never loaded
synchronized(tripUpdateLock.getOrPut(filter.routeDirectionStop.routeDirectionUUID) { Any() }) {
return getCachedStatusS(filter.targetUUID, tripIds) // try another time
?: makeCachedStatusFromAgencyData(filter, tripIds)
Expand All @@ -111,6 +113,8 @@ object GTFSRealTimeTripUpdatesProvider : MTLog.Loggable {
tripIds: List<String>
): POIStatus? {
val context = context ?: return null
val gtfsRealTimeTripUpdateFile = File(context.cacheDir, GTFS_RT_TRIP_UPDATE_PB_FILE_NAME)
if (!gtfsRealTimeTripUpdateFile.exists()) return null
val readFromSourceMs = GtfsRealTimeStorage.getTripUpdateLastUpdateMs(context, 0L)
if (readFromSourceMs <= 0L) return null // never loaded
val sourceLabel = SourceUtils.getSourceLabel( // always use source from official API
Expand All @@ -121,9 +125,7 @@ object GTFSRealTimeTripUpdatesProvider : MTLog.Loggable {
val targetAuthority = rds.authority
val routeId = rds.route.id
val directionId = rds.direction.id
var sortedRDS: List<RouteDirectionStop>? = null
var uuidSchedule: Map<String, Schedule?>? = null
val gFeedMessage = GFeedMessage.parseFrom(File(context.cacheDir, GTFS_RT_TRIP_UPDATE_PB_FILE_NAME).inputStream())
val gFeedMessage = GFeedMessage.parseFrom(gtfsRealTimeTripUpdateFile.inputStream())
val gTripUpdates = gFeedMessage.entityList.toTripUpdates()
val rdTripUpdates = gTripUpdates
.mapNotNull { gTripUpdate ->
Expand Down Expand Up @@ -155,27 +157,20 @@ object GTFSRealTimeTripUpdatesProvider : MTLog.Loggable {
)
}
}
if (sortedRDS == null) {
sortedRDS = context.getRDS(rds.authority, routeId, directionId)
}
if (uuidSchedule == null) {
uuidSchedule = sortedRDS
?.let { rdsList ->
context
.getRDSSchedule(targetAuthority, rdsList, filter.isIncludeCancelledTimestampsOrDefault)
.associateBy { it.targetUUID }
}
}
uuidSchedule ?: return null
val sortedRDS = context.getRDS(rds.authority, routeId, directionId)
sortedRDS ?: return null
val uuidSchedule = context.getRDSSchedule(targetAuthority, sortedRDS, filter.isIncludeCancelledTimestampsOrDefault)
.takeIf { it.isNotEmpty() }
?.associateBy { it.targetUUID }
uuidSchedule ?: return null
processRDTripUpdates(rdTripUpdates, uuidSchedule, sortedRDS, filter.isIncludeCancelledTimestampsOrDefault)
val tripsWithRealTime = uuidSchedule.values
.asSequence()
.mapNotNull { it?.timestamps }.flatten()
.mapNotNull { schedule -> schedule.timestamps.takeIf { it.isNotEmpty() } }.flatten()
.filter { it.isRealTime }
.map { it.tripId }
.toSet() // distinct
uuidSchedule.values.filterNotNull().forEach { schedule ->
uuidSchedule.forEach { (_, schedule) ->
val now = TimeUtilsK.currentInstant()
if (!schedule.timestamps.any { it.isRealTime || (it.tripId in tripsWithRealTime && it.departure < now) }) {
cacheStatus(schedule.toNoData()) // avoid re-run
Expand Down Expand Up @@ -226,14 +221,13 @@ object GTFSRealTimeTripUpdatesProvider : MTLog.Loggable {
private fun GTFSRealTimeProvider.updateAgencyDataIfRequired(inFocus: Boolean) {
val context = requireContextCompat()
var inFocus = inFocus
val lastUpdateInMs = GtfsRealTimeStorage.getTripUpdateLastUpdateMs(context, 0L)
val lastUpdateCode = GtfsRealTimeStorage.getTripUpdateLastUpdateCode(context, -1).takeIf { it >= 0 }
if (lastUpdateCode != null && lastUpdateCode != HttpURLConnection.HTTP_OK) {
inFocus = true // force earlier retry if last fetch returned HTTP error
}
val minUpdateMs = min(statusMaxValidityInMs, getStatusValidityInMs(inFocus))
val nowInMs = TimeUtils.currentTimeMillis()
if (lastUpdateInMs + minUpdateMs > nowInMs) {
val lastUpdateInMs = GtfsRealTimeStorage.getTripUpdateLastUpdateMs(context, 0L)
Comment thread
mmathieum marked this conversation as resolved.
if (lastUpdateInMs + minUpdateMs > TimeUtils.currentTimeMillis()) {
return
}
updateAgencyDataIfRequiredSync(lastUpdateInMs, inFocus)
Expand Down Expand Up @@ -292,7 +286,7 @@ object GTFSRealTimeTripUpdatesProvider : MTLog.Loggable {
try {
val responseBodyByes = response.body.bytes()
File(context.cacheDir, GTFS_RT_TRIP_UPDATE_PB_FILE_NAME).writeBytes(responseBodyByes)
@Suppress("SimplifyBooleanWithConstants")
@Suppress("SimplifyBooleanWithConstants", "KotlinConstantConditions")
if (Constants.DEBUG && PRINT_ALL_LOADED_TRIP_UPDATES) {
val gFeedMessage = GFeedMessage.parseFrom(responseBodyByes)
val gTripUpdates = gFeedMessage.entityList.toTripUpdates()
Expand Down