Pull all interfaces into a single interface: Filter.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / filter / TimeCounterFilter.java

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 faff0bd..ce08a61 100644 (file)
--- 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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class TimeCounterFilter extends DummyFilter {
+public class TimeCounterFilter extends AbstractFilter implements Filter {
 
        /** The byte counter. */
        private final AtomicLong counter = new AtomicLong();
@@ -43,7 +44,7 @@ public class TimeCounterFilter extends DummyFilter {
        private final boolean resetOnMetadataUpdate;
 
        /** The last displayed timestamp. */
-       private final AtomicLong lastTimestamp = new AtomicLong(0);
+       private final AtomicLong lastTimestamp = new AtomicLong(-1);
 
        /**
         * Creates a new time counter filter that automatically resets the counter when
@@ -95,25 +96,35 @@ public class TimeCounterFilter extends DummyFilter {
        }
 
        //
-       // DUMMYFILTER METHODS
+       // FILTER METHODS
        //
 
        @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 (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);
                }
        }