X-Git-Url: https://git.pterodactylus.net/?p=sonitus.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Ffilter%2FTimeCounterFilter.java;h=ce08a612125a634f9224986a2224d034d833c7cc;hp=b5a081d93ce9c994ac8c2fdc562348f9185d7085;hb=633a841142f978235ed9f745b6ba16c278963e62;hpb=43921b29019c0dbdd61ea5def56b0d3edde027cb 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 b5a081d..ce08a61 100644 --- a/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java +++ b/src/main/java/net/pterodactylus/sonitus/data/filter/TimeCounterFilter.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +import net.pterodactylus.sonitus.data.AbstractFilter; import net.pterodactylus.sonitus.data.Filter; import net.pterodactylus.sonitus.data.Metadata; @@ -31,7 +32,7 @@ import net.pterodactylus.sonitus.data.Metadata; * * @author David ‘Bombe’ Roden */ -public class TimeCounterFilter extends DummyFilter { +public class TimeCounterFilter extends AbstractFilter implements Filter { /** The byte counter. */ private final AtomicLong counter = new AtomicLong(); @@ -95,7 +96,7 @@ public class TimeCounterFilter extends DummyFilter { } // - // DUMMYFILTER METHODS + // FILTER METHODS // @Override @@ -104,14 +105,14 @@ public class TimeCounterFilter extends DummyFilter { if (resetOnMetadataUpdate) { reset(); } - updateTimestamp(); + updateTimestamp(true); } @Override public void process(byte[] buffer) throws IOException { super.process(buffer); counter.getAndAdd(buffer.length); - updateTimestamp(); + updateTimestamp(false); } // @@ -119,10 +120,10 @@ public class TimeCounterFilter extends DummyFilter { // /** Updates the timestamp in the metadata. */ - private void updateTimestamp() { + private void updateTimestamp(boolean now) { long timestamp = getMillis() / 1000; - if (lastTimestamp.get() != timestamp) { - super.metadataUpdated(parentMetadata.get().title(String.format("%s (%02d:%02d)", parentMetadata.get().title(), timestamp / 60, timestamp % 60))); + if (now || (lastTimestamp.get() != timestamp)) { + super.metadataUpdated(parentMetadata.get().comment(String.format("%02d:%02d", timestamp / 60, timestamp % 60))); lastTimestamp.set(timestamp); } }