diff options
Diffstat (limited to 'dslog/Main.java')
| -rw-r--r-- | dslog/Main.java | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/dslog/Main.java b/dslog/Main.java index f8a2196..b6c6a01 100644 --- a/dslog/Main.java +++ b/dslog/Main.java @@ -22,15 +22,12 @@ class Main { public static class LogSet { public String name; - public DslogReader dslog; - public DseventsReader dsevents; - public PdplogReader pdplog; + public String dslog = "␕"; + public String dsevents = "␕"; + public String pdplog = "␕"; public String toString() { - return name - +" "+(dslog == null ? "␕" : dslog.version) - +"/"+(dsevents == null ? "␕" : dsevents.version) - +"/"+(pdplog == null ? "␕" : pdplog.version); + return name+" "+dslog+"/"+dsevents+"/"+pdplog; } } @@ -55,27 +52,36 @@ class Main { try { String filename = filepath.getFileName().toString(); if (filename.endsWith(".dslog")) { + String setname = filename.substring(0, filename.lastIndexOf('.')); try (DslogReader dslog = new DslogReader(Files.newInputStream(filepath))) { - String setname = filename.substring(0, filename.lastIndexOf('.')); - getSet(logsets, setname).dslog = dslog; + getSet(logsets, setname).dslog = ""+dslog.version; + } catch (Exception e) { + getSet(logsets, setname).pdplog = "☠"; + throw e; } } else if (filename.endsWith(".dsevents")) { - try (DseventsReader dsevents = new DseventsReader(Files.newInputStream(filepath))) { String setname = filename.substring(0, filename.lastIndexOf('.')); - getSet(logsets, setname).dsevents = dsevents; + try (DseventsReader dsevents = new DseventsReader(Files.newInputStream(filepath))) { + getSet(logsets, setname).dsevents = ""+dsevents.version; + } catch (Exception e) { + getSet(logsets, setname).pdplog = "☠"; + throw e; } } else if (filename.endsWith(".pdplog")) { + String setname = filename.substring(0, filename.lastIndexOf('.')); try (PdplogReader pdplog = new PdplogReader(Files.newInputStream(filepath))) { - String setname = filename.substring(0, filename.lastIndexOf('.')); - getSet(logsets, setname).pdplog = pdplog; + getSet(logsets, setname).pdplog = ""+pdplog.version; + } catch (Exception e) { + getSet(logsets, setname).pdplog = "☠"; + throw e; } } } catch (Exception e) { + e = new IOException("Could not read file: "+filepath.toString(), e); synchronized (errs) { - e = new IOException("Could not read file: "+filepath.toString(), e); errs.add(e); - e.printStackTrace(); } + e.printStackTrace(); } }); logsets.forEach((k,v)->{ |