@fiduswriter/image-manager 0.1.13 → 0.1.16

package/src/database.ts

@@ -1,83 +1,76 @@
-import {activateWait, addAlert, deactivateWait, gettext, postJson} from "fwtoolkit"
+import { activateWait, addAlert, deactivateWait, gettext } from "fwtoolkit";
 
 import type {
-    Image,
-    ImageCategory,
-    ImageManagerApp,
-    ImagesResponse,
-    SaveImageRequest,
-    SaveImageResponse
-} from "./types.js"
+  Image,
+  ImageCategory,
+  ImageManagerApp,
+  SaveImageRequest,
+} from "./types.js";
 
 /* A class that holds information about images uploaded by the user. */
 
 export class ImageDB {
-    app: ImageManagerApp
+  app: ImageManagerApp;
 
-    db: Record<number, Image>
+  db: Record<number, Image>;
 
-    cats: ImageCategory[]
+  cats: ImageCategory[];
 
-    constructor(app: ImageManagerApp) {
-        this.app = app
-        this.db = {}
-        this.cats = []
-    }
+  constructor(app: ImageManagerApp) {
+    this.app = app;
+    this.db = {};
+    this.cats = [];
+  }
 
-    getDB(): Promise<void> {
-        this.db = {}
-        this.cats = []
+  getDB(): Promise<void> {
+    this.db = {};
+    this.cats = [];
 
-        activateWait()
+    activateWait();
 
-        return postJson("/api/usermedia/images/").then(({json}) => {
-            const response = json as ImagesResponse
-            this.cats = response.imageCategories
-            response.images.forEach(image => {
-                this.db[image.id] = image
-            })
-            deactivateWait()
-            return
-        })
-    }
+    return this.app.apiConnectors.image.getImages().then((response) => {
+      this.cats = response.imageCategories;
+      response.images.forEach((image) => {
+        this.db[image.id] = image;
+      });
+      deactivateWait();
+      return;
+    });
+  }
 
-    saveImage(imageData: SaveImageRequest): Promise<number> {
-        activateWait()
-        const {image, ...jsonData} = imageData
+  saveImage(imageData: SaveImageRequest): Promise<number> {
+    activateWait();
+    const { image, ...jsonData } = imageData;
 
-        return postJson(
-            "/api/usermedia/save/",
-            jsonData,
-            image ? {image} : {}
-        )
-            .then(({json}) => {
-                const response = json as SaveImageResponse
-                deactivateWait()
-                if (Object.keys(response.errormsg).length) {
-                    return Promise.reject(new Error(response.errormsg.error))
-                } else {
-                    this.db[response.values.id] = response.values
-                    return response.values.id
-                }
-            })
-            .catch(error => {
-                const networkError = error as {
-                    status?: number
-                    message?: string
-                    statusText?: string
-                }
-                if (networkError.status === 413) {
-                    addAlert(
-                        "error",
-                        `${gettext("Image is larger than the maximum permitted size")}${this.app.settings?.MEDIA_MAX_SIZE ? `: ${Number.parseInt(String(this.app.settings.MEDIA_MAX_SIZE / 1000000))}MB` : "."}`
-                    )
-                } else if (networkError.message) {
-                    addAlert("error", gettext(networkError.message))
-                } else {
-                    addAlert("error", gettext(networkError.statusText || ""))
-                }
-                deactivateWait()
-                throw error
-            })
-    }
+    return this.app.apiConnectors.image
+      .saveImage(jsonData as SaveImageRequest, image ? { image } : {})
+      .then((response) => {
+        deactivateWait();
+        if (Object.keys(response.errormsg).length) {
+          return Promise.reject(new Error(response.errormsg.error));
+        } else {
+          this.db[response.values.id] = response.values;
+          return response.values.id;
+        }
+      })
+      .catch((error) => {
+        const networkError = error as {
+          status?: number;
+          message?: string;
+          statusText?: string;
+        };
+        if (networkError.status === 413) {
+          addAlert(
+            "error",
+            `${gettext("Image is larger than the maximum permitted size")}${this.app.settings?.MEDIA_MAX_SIZE ? `: ${Number.parseInt(String(this.app.settings.MEDIA_MAX_SIZE / 1000000))}MB` : "."}`,
+          );
+        } else if (networkError.message) {
+          addAlert("error", gettext(networkError.message));
+        } else {
+          addAlert("error", gettext(networkError.statusText || ""));
+        }
+        deactivateWait();
+        throw error;
+      });
+  }
 }