improve error messages

4 files changed, 19 insertions, 12 deletions

diff --git a/dslog/DseventsReader.java b/dslog/DseventsReader.java
index ca2fc39..cd77148 100644
--- a/dslog/DseventsReader.java
+++ b/dslog/DseventsReader.java
@@ -16,7 +16,7 @@ class DseventsReader {
 		this.version = Read.i32(reader);
 		switch (this.version) {
 		case 0:
-			throw new UnsupportedOperationException("TODO");
+			throw new UnsupportedOperationException("TODO: DSEVENTS v0 support");
 		case 1:
 		case 2:
 		case 3: // 2016-now
@@ -35,7 +35,7 @@ class DseventsReader {
 	public Event readEvent() throws IOException{
 		switch (version) {
 		case 0:
-			throw new UnsupportedOperationException("TODO");
+			throw new UnsupportedOperationException("TODO: DSEVENTS v0 support");
 		case 1:
 		case 2:
 		case 3:
diff --git a/dslog/DslogReader.java b/dslog/DslogReader.java
index 7696792..0b43682 100644
--- a/dslog/DslogReader.java
+++ b/dslog/DslogReader.java
@@ -25,7 +25,7 @@ class DslogReader {
 			this.startTime = Read.LVTimestamp(reader);
 			break;
 		case 2: // ????-2015
-			throw new UnsupportedOperationException("TODO");
+			throw new UnsupportedOperationException("TODO: DSLOG v2 support");
 		case 3: // 2016-now
 			this.startTime = Read.LVTimestamp(reader);
 			break;
@@ -103,7 +103,7 @@ class DslogReader {
 				/* 13+1=14 */lostPackets = Read.i8(reader);
 			}};
 		case 2:
-			throw new UnsupportedOperationException("TODO");
+			throw new UnsupportedOperationException("TODO: DSLOG v2 support");
 		case 3:
 			return new Entry() {{
 				time = startTime.plusMillis(20*i++);
diff --git a/dslog/Main.java b/dslog/Main.java
index 57aa4b6..f95be77 100644
--- a/dslog/Main.java
+++ b/dslog/Main.java
@@ -18,12 +18,19 @@ class Main {
 	public static void main(String[] args) throws IOException {
 		for (String dirname : args) {
 			for (File file : (new File(dirname)).listFiles()) {
-				if (file.toString().endsWith(".dslog")) {
-					new DslogReader(new FileInputStream(file));
-				} else if (file.toString().endsWith(".dsevents")) {
-					new DseventsReader(new FileInputStream(file));
-				} else if (file.toString().endsWith(".pdplog")) {
-					new PdplogReader(new FileInputStream(file));
+				try {
+					if (file.getName().endsWith(".dslog")) {
+						DslogReader dslog = new DslogReader(new FileInputStream(file));
+						System.out.println(file.getName()+" : "+dslog.version+" : "+dslog.startTime);
+					} else if (file.getName().endsWith(".dsevents")) {
+						DseventsReader dsevents = new DseventsReader(new FileInputStream(file));
+						System.out.println(file.getName()+" : "+dsevents.version+" : "+dsevents.startTime);
+					} else if (file.getName().endsWith(".pdplog")) {
+						PdplogReader pdplog = new PdplogReader(new FileInputStream(file));
+						System.out.println(file.getName()+" : "+pdplog.version);
+					}
+				} catch (Exception e) {
+					(new IOException("Could not read file: "+file.toString(), e)).printStackTrace();
 				}
 			}
 		}
diff --git a/dslog/PdplogReader.java b/dslog/PdplogReader.java
index 807923b..0766fe0 100644
--- a/dslog/PdplogReader.java
+++ b/dslog/PdplogReader.java
@@ -14,9 +14,9 @@ class PdplogReader {
 		this.version = Read.i32(reader);
 		switch (this.version) {
 		case 0: // ????-????
-			throw new UnsupportedOperationException("TODO");
+			throw new UnsupportedOperationException("TODO: PDPLOG v0 support");
 		case 1: // ????-2015
-			throw new UnsupportedOperationException("TODO");
+			throw new UnsupportedOperationException("TODO: PDPLOG v1 support");
 		default:
 			throw new UnsupportedOperationException("Unrecognized PDPLOG version: "+this.version);
 		}