Skip to content
This repository has been archived by the owner on Jan 15, 2023. It is now read-only.

Commit

Permalink
guess alert type, skip unused jar
Browse files Browse the repository at this point in the history
  • Loading branch information
@Katsute
Katsute committed Nov 9, 2022
1 parent 173cba8 commit 625de10
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 16 deletions.
16 changes: 14 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>dev.katsute</groupId>
<artifactId>mta-information-site</artifactId>
<version>1.6.0</version>
<version>1.10.0</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -24,6 +24,18 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>default-jar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand All @@ -40,7 +52,7 @@
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<finalName>${artifactId}</finalName>
<finalName>${project.artifactId}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/dev/katsute/mis/JsonBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public final JsonBuilder set(final String key, final String object){
return append(key, object == null ? null : '"' + sanitize(object) + '"');
}

public final JsonBuilder set(final String key, final JsonBuilder obj){
return append(key, obj.build());
public final JsonBuilder set(final String key, final JsonBuilder object){
return append(key, object.build());
}

public final JsonBuilder set(final String key, final String[] strings){
Expand All @@ -52,9 +52,9 @@ public final JsonBuilder set(final String key, final String[] strings){
return append(key, '[' + String.join(", ", buf) + ']');
}

public final JsonBuilder set(final String key, final List<JsonBuilder> objs){
public final JsonBuilder set(final String key, final List<JsonBuilder> objects){
final List<String> buf = new ArrayList<>();
for(final JsonBuilder obj : objs)
for(final JsonBuilder obj : objects)
buf.add(obj.build());
return append(key, '[' + String.join(", ", buf) + ']');
}
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/dev/katsute/mis/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@

final class Main {

private static SimpleHttpServer server = null;

private static MTA mta;

public static void main(String[] args) throws Throwable {
System.out.println("Checking tokens");
// read tokens
Expand All @@ -52,7 +48,7 @@ public static void main(String[] args) throws Throwable {
}
System.out.println("Initializing MTA");
// initialize MTA
mta = MTA.create(
final MTA mta = MTA.create(
busToken,
subwayToken,
DataResource.create(DataResourceType.Bus_Bronx, new File("google_transit_bronx.zip")),
Expand All @@ -66,7 +62,7 @@ public static void main(String[] args) throws Throwable {
System.out.println("Initializing server");
// initialize server
{
server = SimpleHttpServer.create(8080);
final SimpleHttpServer server = SimpleHttpServer.create(8080);
server.setExecutor(Executors.newCachedThreadPool());

final FileHandler handler = new MimeFileHandler();
Expand Down
40 changes: 36 additions & 4 deletions src/main/java/dev/katsute/mis/RequestHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,18 @@ public final void handle(final SimpleHttpExchange exchange){
for(final Bus.Alert alert : alerts){
for(final TransitAlertPeriod per : alert.getActivePeriods()){
if(per.getStartEpochMillis() <= NOW && per.getEndEpochMillis() >= NOW){
final String desc = alert.getDescription();
a.add(new JsonBuilder()
.set("header", alert.getHeader())
.set("description", alert.getDescription())
.set("description", desc)
.set("type", alert.getAlertType())
.set("effect", alert.getEffect())
.set("slow", desc.contains("slow") || desc.contains("delay"))
.set("skip", desc.startsWith("no") || desc.contains("skips") || desc.contains("skipped"))
.set("construction", desc.contains("construction"))
.set("police", desc.contains("police") || desc.contains("nypd"))
.set("fire", desc.contains("fire") || desc.contains("fdny"))
.set("ems", desc.contains("ems"))
);
break OUTER;
}
Expand All @@ -188,11 +195,18 @@ public final void handle(final SimpleHttpExchange exchange){
for(final Bus.Alert alert : r.getAlerts()){
for(final TransitAlertPeriod per : alert.getActivePeriods()){
if(per.getStartEpochMillis() <= NOW && per.getEndEpochMillis() >= NOW){
final String desc = alert.getDescription();
a.add(new JsonBuilder()
.set("header", alert.getHeader())
.set("description", alert.getDescription())
.set("description", desc)
.set("type", alert.getAlertType())
.set("effect", alert.getEffect())
.set("slow", desc.contains("slow") || desc.contains("delay"))
.set("skip", desc.startsWith("no") || desc.contains("skips") || desc.contains("skipped"))
.set("construction", desc.contains("construction"))
.set("police", desc.contains("police") || desc.contains("nypd"))
.set("fire", desc.contains("fire") || desc.contains("fdny"))
.set("ems", desc.contains("ems"))
);
break OUTER;
}
Expand Down Expand Up @@ -272,11 +286,21 @@ public final void handle(final SimpleHttpExchange exchange){
for(final Subway.Alert alert : alerts){
for(final TransitAlertPeriod per : alert.getActivePeriods()){
if(per.getStartEpochMillis() <= NOW && per.getEndEpochMillis() >= NOW){
final String desc = alert.getDescription().toLowerCase();
a.add(new JsonBuilder()
.set("header", alert.getHeader())
.set("description", alert.getDescription())
.set("type", alert.getAlertType())
.set("effect", alert.getEffect())
.set("slow", desc.contains("slow") || desc.contains("delay"))
.set("skip", desc.startsWith("no") || desc.contains("skips") || desc.contains("skipped"))
.set("local", desc.contains("local"))
.set("express", desc.contains("express"))
.set("shuttle", desc.contains("shuttle"))
.set("construction", desc.contains("construction"))
.set("police", desc.contains("police") || desc.contains("nypd"))
.set("fire", desc.contains("fire") || desc.contains("fdny"))
.set("ems", desc.contains("ems"))
);
break OUTER;
}
Expand All @@ -297,11 +321,21 @@ public final void handle(final SimpleHttpExchange exchange){
for(final Subway.Alert alert : r.getAlerts()){
for(final TransitAlertPeriod per : alert.getActivePeriods()){
if(per.getStartEpochMillis() <= NOW && per.getEndEpochMillis() >= NOW){
final String desc = alert.getDescription().toLowerCase();
a.add(new JsonBuilder()
.set("header", alert.getHeader())
.set("description", alert.getDescription())
.set("type", alert.getAlertType())
.set("effect", alert.getEffect())
.set("slow", desc.contains("slow") || desc.contains("delay"))
.set("skip", desc.startsWith("no") || desc.contains("skips") || desc.contains("skipped"))
.set("local", desc.contains("local"))
.set("express", desc.contains("express"))
.set("shuttle", desc.contains("shuttle"))
.set("construction", desc.contains("construction"))
.set("police", desc.contains("police") || desc.contains("nypd"))
.set("fire", desc.contains("fire") || desc.contains("fdny"))
.set("ems", desc.contains("ems"))
);
break OUTER;
}
Expand Down Expand Up @@ -356,6 +390,4 @@ private static double distance(final double long1, final double lat1, final doub
);
}

private static final int TODAY = Calendar.getInstance().get(Calendar.DAY_OF_YEAR);

}

0 comments on commit 625de10

Please sign in to comment.