Commit 6d7576c0766ee4fd023aae3db1fc4ca9f35e9791 | sitegen

author	clover caruso <git@paperclover.net> 2026-02-07 02:14:09-08:00
committer	clover caruso <git@paperclover.net> 2026-03-17 23:21:58-07:00
log	6d7576c0766ee4fd023aae3db1fc4ca9f35e9791
tree	1d7aa66df6b65a5d8f68e285c651d533e6041b40
parent	3b6fe249342235df612779f0593fccb3ee54970a
signature	Signed by SSH key SHA256:xbd+BjjhyBfwk7GVoURf9Yx0gzDerHbvYv7SddNWmAs

fix: progress estimation interface update

resolves #76

the interface for progress reporting isnt able to identify when more
items are added, which causes places like clover file scanner to report
badly as it initializes near 90% then goes backwards to 40% (it is
increasing both values). so both numbers are passed.

1 files changed, 19 insertions(+), 22 deletions(-)

lib
- progress.ts

lib/progress.ts+19-22

 @@ -453,7 +453,7 @@ function newNode<Result, EventMap extends Events.Map>(
       estimator = estimateCompletion;
     } else estimator = new Ema();
   }
-  estimator?.sample(Date.now(), 0);
+  estimator?.sample(Date.now(), 0, 0);
   function mutate(key: keyof ReadOnlyNode) {
     if (state.detached) return;
 @@ -464,7 +464,7 @@ function newNode<Result, EventMap extends Events.Map>(
       // originally, auto-estimation would use the Root's timing primitives,
       // but this makes it so that `state.estimatedTime` is in terms of the
       // Root, which is unintuitive for everyone but the renderer.
-      const time = estimator.sample(Date.now(), state.value / state.total);
+      const time = estimator.sample(Date.now(), state.value, state.total);
       if (time && (!state.estimatedTime || state.estimatedTime !== time)) {
         state.estimatedTime = time;
         owner.emit("node-change", state, "estimatedTime");
 @@ -1671,9 +1671,10 @@ class KeyPool<T extends number> {
 export interface EstimationAlgorithm {
   /**
    * given a timestamp `time` and a progress value `progress`, return the
-   * timestamp that the action will be finished on.
+   * timestamp that the action will be finished on. called with (t, 0, 0)
+   * to initialize the algorithm.
    */
-  sample(time: number, progress: number): number | null;
+  sample(time: number, current: number, total: number): number | null;
 }
 /**
 @@ -1685,33 +1686,29 @@ export class Ema implements EstimationAlgorithm {
   start: number | null = null;
   estimate: number | null = null;
   /** smoothing factor (0-1) */
-  alpha: number = 0.25;
+  alpha: number;
-  constructor(alpha: number = 0.1) {
+  constructor(alpha: number = 0.25) {
     this.alpha = alpha;
   }
-  /**
+  sample(time: number, current: number, total: number): number | null {
-   * given a timestamp `time` and a progress value `progress`, return the
+    ASSERT(current >= 0 && current <= total);
-   * timestamp that the action will be finished on.
+    if (this.start == null || current === 0) {
-   */
-  sample(time: number, progress: number): number | null {
-    ASSERT(
-      progress >= 0 && progress < 1,
-      `progress must be a number between 0 and 1, got ${progress}`,
-    );
-    if (this.start == null) {
       this.start = time;
+      this.estimate = null;
       return null;
     }
-    const value = (time - this.start) / progress;
+    const elapsed = time - this.start;
-    this.estimate = this.estimate != null
+    if (elapsed === 0) return null; // too quick
-      ? ((1 - this.alpha) * this.estimate +
-        this.alpha * value)
-      : value;
-    return time + (1 - progress) * this.estimate;
+    const rate = current / elapsed;
+    this.estimate = this.estimate != null
+      ? (1 - this.alpha) * this.estimate + this.alpha * rate
+      : rate;
+    const remaining = total - current;
+    return time + remaining / this.estimate;
   }
   reset(): void {