X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Ffilter%2FTimeCounterFilter.java;h=b584a489c00f8ad71c95d1604aa49e5bf372b6c4;hb=3b201f166e8b3abd585ef8315058e74d5d1df6de;hp=a5282003a862b8cbe428c89d19b3c828deb71c3e;hpb=09f8bd2297dc864e24baa67c65be97104e00c320;p=sonitus.git diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java b/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java index a528200..b584a48 100644 --- a/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java +++ b/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java @@ -19,6 +19,7 @@ package net.pterodactylus.sonitus.data.filter; import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; import net.pterodactylus.sonitus.data.Filter; import net.pterodactylus.sonitus.data.Metadata; @@ -35,9 +36,15 @@ public class TimeCounterFilter extends DummyFilter { /** The byte counter. */ private final AtomicLong counter = new AtomicLong(); + /** The parent’s metdata. */ + private final AtomicReference parentMetadata = new AtomicReference(); + /** Whether to reset the counter on a metadata update. */ private final boolean resetOnMetadataUpdate; + /** The last displayed timestamp. */ + private final AtomicLong lastTimestamp = new AtomicLong(-1); + /** * Creates a new time counter filter that automatically resets the counter when * the metadata is {@link #metadataUpdated(Metadata) updated}. @@ -93,16 +100,31 @@ public class TimeCounterFilter extends DummyFilter { @Override public void metadataUpdated(Metadata metadata) { - super.metadataUpdated(metadata); + parentMetadata.set(metadata); if (resetOnMetadataUpdate) { reset(); } + updateTimestamp(true); } @Override public void process(byte[] buffer) throws IOException { super.process(buffer); counter.getAndAdd(buffer.length); + updateTimestamp(false); + } + + // + // PRIVATE METHODS + // + + /** Updates the timestamp in the metadata. */ + private void updateTimestamp(boolean now) { + long timestamp = getMillis() / 1000; + if (now || (lastTimestamp.get() != timestamp)) { + super.metadataUpdated(parentMetadata.get().comment(String.format("%s%02d:%02d", (timestamp >= 3600) ? String.format("%d:", timestamp / 3600) : "" , (timestamp % 3600) / 60, timestamp % 60))); + lastTimestamp.set(timestamp); + } } }