feat: support custom feed filenames for deployment #622
+76
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
binh-dam-ibigroup
requested changes
Apr 17, 2025
src/main/java/com/conveyal/datatools/manager/models/Deployment.java
Outdated
Show resolved
Hide resolved
src/main/java/com/conveyal/datatools/manager/models/Deployment.java
Outdated
Show resolved
Hide resolved
daniel-heppner-ibigroup
assigned binh-dam-ibigroup and unassigned daniel-heppner-ibigroup
binh-dam-ibigroup
approved these changes
Apr 21, 2025
Comment on lines
438
to
443
| entryName = fs.filename.endsWith(".zip") ? fs.filename : fs.filename + ".zip"; | ||
| LOG.info("Using FeedSource filename for zip entry: {}", entryName); | ||
| } else { | ||
| // Fallback to the original GTFS filename derived from FeedVersion | ||
| entryName = gtfsFile.getName(); | ||
| LOG.info("Using FeedVersion filename for zip entry: {}", entryName); |
There was a problem hiding this comment.
Nit: you could log first then return from inside the if/else block, and remove lines 434 and 445.
|
|
||
| feedSource.filename = " "; | ||
| Persistence.feedSources.replace(feedSource.id, feedSource); | ||
| assertEquals(gtfsFile.getName(), deployment.getFeedSourceBundleFilename(feedVersion, gtfsFile)); |
There was a problem hiding this comment.
Extract a variable for gtfsFile.getName().
…corresponding tests
daniel-heppner-ibigroup
assigned miles-grant-ibigroup and unassigned daniel-heppner-ibigroup
miles-grant-ibigroup
requested changes
Apr 23, 2025
Comment on lines
+45
to
+47
| /** An optional display filename for the feed in the bundle, e.g. "agency_transit.zip" */ | ||
| public String filename; | ||
|
|
There was a problem hiding this comment.
Do we need this in the summary? Isn't it fine if the data only loads on requesting the entire feed source
| @@ -18,6 +18,7 @@ | |||
| import com.fasterxml.jackson.databind.ObjectMapper; | |||
| import com.google.common.io.ByteStreams; | |||
| import com.mongodb.client.FindIterable; | |||
| import org.apache.logging.log4j.util.Strings; | |||
There was a problem hiding this comment.
Did you mean to import this? Feels strange to import this for non logging purposes
miles-grant-ibigroup
assigned daniel-heppner-ibigroup and unassigned miles-grant-ibigroup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
devbefore they can be merged tomaster)Description
This PR adds support for overriding the feed filenames that will be used in the bundle. This feature allows us to override feed specific build settings in the build config.