clean up

mediamonks · May 27, 2024 · 94d5ffd · 94d5ffd
1 parent e731cfa
commit 94d5ffd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/src/lib/FastImageSequence.ts b/src/lib/FastImageSequence.ts
@@ -1,6 +1,6 @@
 import Frame from "./Frame.js";
 import {createLogElement, logToScreen} from "./LogToScreen.js";
-import ImageSource, {type ImageSourceOptions, INPUT_SRC} from "./ImageSource.js";
+import ImageSource, {type ImageSourceOptions, INPUT_CODE, INPUT_SRC} from "./ImageSource.js";
 import ImageSourceTar from "./ImageSourceTar.js";
 import ImageSourceFetch from "./ImageSourceFetch.js";
 
@@ -493,11 +493,11 @@ export class FastImageSequence {
 
   private logDebugStatus(output: HTMLDivElement) {
     const formatPercentage = (n: number) => `${Math.abs(n * 100).toFixed(1).padStart(5, ' ')}%`;
-    let debugInfo = `${this.options.name} - frames: ${this.frames.length}, wrap: ${this.options.loop}, objectFit: ${this.options.objectFit}\n- loadProgress ${formatPercentage(this.loadProgress)}, last frame drawn ${this.lastFrameDrawn}/${this.index}\n`;
+    let debugInfo = `${this.options.name} - frames: ${this.frames.length}, wrap: ${this.options.loop}, objectFit: ${this.options.objectFit}\n loadProgress ${formatPercentage(this.loadProgress)}, last frame drawn ${this.lastFrameDrawn}/${this.index}\n`;
 
     for (const source of this.sources) {
       const {progress, numLoading, numLoaded, maxLoaded} = source.getLoadStatus();
-      debugInfo += `- ${source.type === INPUT_SRC ? `image` : `  tar`} ${formatPercentage(progress)}, numLoading: ${numLoading}, numLoaded: ${numLoaded}/${maxLoaded}${source.options.useWorker ? ', use worker' : ''}\n`;
+      debugInfo += ` src[${source.index}] ${source.type === INPUT_SRC ? `image:` : source.type === INPUT_CODE ? `code: ` : `tar:  `} ${formatPercentage(progress)}, numLoading: ${numLoading}, numLoaded: ${numLoaded}/${maxLoaded}${source.options.useWorker ? ', use worker' : ''}\n`;
     }
     logToScreen(output, debugInfo);
   }

diff --git a/src/lib/ImageElement.ts b/src/lib/ImageElement.ts
@@ -1,10 +1,9 @@
-import ImageSource, {type ImageSourceType, INPUT_SRC} from "./ImageSource.js";
+import ImageSource from "./ImageSource.js";
 import type Frame from "./Frame.js";
 
 export default class ImageElement {
   public available: boolean = true;
   public loading: boolean = false;
-  public type: ImageSourceType = INPUT_SRC;
   public frame: Frame;
 
   private _image: CanvasImageSource | undefined;
@@ -13,7 +12,6 @@ export default class ImageElement {
   constructor(context: ImageSource, frame: Frame) {
     this.context = context;
     this.frame = frame;
-    this.type = this.context.type;
   }
 
   public get image(): CanvasImageSource | undefined {

diff --git a/src/lib/ImageSource.ts b/src/lib/ImageSource.ts
@@ -3,8 +3,9 @@ import ImageElement from "./ImageElement.js";
 
 export const INPUT_SRC = 0;
 export const INPUT_TAR = 1;
+export const INPUT_CODE = 2;
 
-export type ImageSourceType = typeof INPUT_SRC | typeof INPUT_TAR;
+export type ImageSourceType = typeof INPUT_SRC | typeof INPUT_TAR | typeof INPUT_CODE;
 
 /**
  * @typedef ImageSourceOptions
@@ -45,7 +46,6 @@ export default class ImageSource {
 
   public options: ImageSourceOptions;
   public index: number = -0;
-  public type: ImageSourceType;
   public initialized: boolean = false;
 
   protected context: FastImageSequence;
@@ -54,13 +54,16 @@ export default class ImageSource {
     this.context = context;
     this.index = index;
     this.options = {...ImageSource.defaultOptions, ...options};
-    this.type = this.options.tarURL !== undefined ? INPUT_TAR : INPUT_SRC;
 
     this.options.maxCachedImages = clamp(Math.floor(this.options.maxCachedImages), 1, this.context.options.frames);
 
     this.context.frames.forEach(frame => frame.images[index] = new ImageElement(this, frame));
   }
 
+  public get type() {
+    return INPUT_CODE;
+  }
+
   protected get images(): ImageElement[] {
     return this.context.frames.map(frame => frame.images[this.index] as ImageElement);
   }

diff --git a/src/lib/ImageSourceFetch.ts b/src/lib/ImageSourceFetch.ts
@@ -1,9 +1,13 @@
 import ImageElement from "./ImageElement.js";
 import {getImageFetchWorker, releaseImageFetchWorker} from "./ImageFetch.js";
 import {loadImage} from "./DownloadFile.js";
-import ImageSource from "./ImageSource.js";
+import ImageSource, {INPUT_SRC} from "./ImageSource.js";
 
 export default class ImageSourceFetch extends ImageSource {
+  public override get type() {
+    return INPUT_SRC;
+  }
+
   public override getImageURL(index: number): string | undefined {
     return this.options.imageURL ? new URL(this.options.imageURL(index), window.location.href).href : undefined;
   }

diff --git a/src/lib/ImageSourceTar.ts b/src/lib/ImageSourceTar.ts
@@ -1,4 +1,4 @@
-import ImageSource from "./ImageSource.js";
+import ImageSource, {INPUT_TAR} from "./ImageSource.js";
 import {downloadFile} from "./DownloadFile.js";
 import Tarball from "./Tarball.js";
 import type ImageElement from "./ImageElement.js";
@@ -7,6 +7,10 @@ export default class ImageSourceTar extends ImageSource {
   public tarball: Tarball | undefined;
   private tarLoadProgress: number = 0;
 
+  public override get type() {
+    return INPUT_TAR;
+  }
+
   public override async loadResources() {
     if (this.options.tarURL !== undefined) {
       const data = await downloadFile(this.options.tarURL, (progress) => {