:template editing, adding, export and import

2024-01-29 23:50:07 +01:00 · 2024-01-29 23:50:07 +01:00 · ddd692bcbd
commit ddd692bcbd
parent 372b4c60a9
10 changed files with 409 additions and 104 deletions
--- a/src/components/TemplateItem.jsx
+++ b/src/components/TemplateItem.jsx
@ -14,7 +14,6 @@ const TemplateItem = ({
  enabled, title, canvasId, x, y, width, height, imageId, startEditing,
 }) => {
  const imgRef = useRef();
-  const [canvasTitle, setCanvasTitle] = useState('Earth');
  const canvases = useSelector((state) => state.canvas.canvases);
  const dispatch = useDispatch();

@ -27,19 +26,25 @@ const TemplateItem = ({
      if (!previewImg) {
        return;
      }
-      imgRef.current.getContext('2d').drawImage(previewImg, 0, 0);
+      console.log('rerendering image', imageId, previewImg);
+      const bitmap = await createImageBitmap(previewImg);
+      imgRef.current.getContext('bitmaprenderer')
+        .transferFromImageBitmap(bitmap);
+      bitmap.close();
    })();
  }, [imageId]);

  return (
    <div
      className={(enabled) ? 'tmpitm' : 'tmpitm disabled'}
+      style={{ cursor: 'pointer' }}
      onClick={() => dispatch(changeTemplate(title, { enabled: !enabled }))}
    >
      <div className="tmpitm-preview">
        <canvas
          className="tmpitm-img"
          ref={imgRef}
+          key="showimg"
          width={width}
          height={height}
        />
--- a/src/components/TemplateItemEdit.jsx
+++ b/src/components/TemplateItemEdit.jsx
@ -5,44 +5,41 @@
 import React, {
  useRef, useState, useEffect, useMemo,
 } from 'react';
-import { useDispatch, useSelector, shallowEqual } from 'react-redux';
+import { useSelector, shallowEqual } from 'react-redux';
 import { t } from 'ttag';

 import templateLoader from '../ui/templateLoader';
-import { changeTemplate } from '../store/actions/templates';
-import { selectCanvas, setViewCoordinates } from '../store/actions';
 import { coordsFromUrl } from '../core/utils';

-const TemplateItem = ({
+const TemplateItemEdit = ({
  title: initTitle,
  canvasId: initCanvasId,
  x: initX, y: initY,
-  width: initWidth, height: initHeight,
-  imageId: initImageId,
+  imageId,
  stopEditing,
 }) => {
  const [initCoords, initDimensions] = useMemo(() => [
    (Number.isNaN(parseInt(initX, 10))
      || Number.isNaN(parseInt(initY, 10))) ? null : [initX, initY],
-    (Number.isNaN(parseInt(initWidth, 10))
-      || Number.isNaN(parseInt(initHeight, 10))) ? null : [initWidth, initHeight],
-  ], [initX, initY, initWidth, initHeight]);
+  ], [initX, initY]);

  const [coords, setCoords] = useState(initCoords);
  const [dimensions, setDimensions] = useState(initDimensions);
-  const [title, setTitle] = useState(initTitle);
+  const [title, setTitle] = useState(initTitle || '');
  const [file, setFile] = useState(null);
-  const [imageId, setImageId] = useState(initImageId);
+  const [titleUnique, setTitleUnique] = useState(true);
  const imgRef = useRef();
+  const fileRef = useRef();
  const [
    storeCanvasId,
    canvases,
+    templateList,
  ] = useSelector((state) => [
    state.canvas.canvasId,
    state.canvas.canvases,
+    state.templates.list,
  ], shallowEqual);
-  const [selectedCanvas, selectCanvas] = useState(initCanvasId ?? storeCanvasId);
-  const dispatch = useDispatch();
+  const [canvasId, selectCanvas] = useState(initCanvasId ?? storeCanvasId);

  useEffect(() => {
    (async () => {
@ -53,36 +50,78 @@ const TemplateItem = ({
      if (!previewImg) {
        return;
      }
+      const bitmap = await createImageBitmap(previewImg);
      const canvas = imgRef.current;
-      canvas.width = previewImg.width;
-      canvas.height = previewImg.height;
-      canvas.getContext('2d').drawImage(previewImg, 0, 0);
+      const { width, height } = bitmap;
+      canvas.width = width;
+      canvas.height = height;
+      canvas.getContext('bitmaprenderer').transferFromImageBitmap(bitmap);
+      setDimensions([width, height]);
+      bitmap.close();
    })();
  }, [imageId]);

-  const canSubmit = (imgRef.current && file && coords && title && dimensions);
+  useEffect(() => {
+    if (!file || !imgRef.current) {
+      return;
+    }
+    (async () => {
+      const bitmap = await createImageBitmap(file);
+      const canvas = imgRef.current;
+      const { width, height } = bitmap;
+      canvas.width = width;
+      canvas.height = height;
+      canvas.getContext('bitmaprenderer').transferFromImageBitmap(bitmap);
+      setDimensions([width, height]);
+      bitmap.close();
+    })();
+  }, [file]);
+
+  const canSubmit = (imgRef.current && (file || imageId)
+    && titleUnique && coords && title && dimensions);

  return (
    <div className="tmpitm">
      <div className="tmpitm-preview">
-        <canvas
-          className="tmpitm-img"
-          ref={imgRef}
-          style={{ opacity: 0.4 }}
+        <div style={{ width: '100%', height: '100%' }}>
+          <canvas
+            className="tmpitm-img"
+            ref={imgRef}
+            key="editimg"
+            style={{ opacity: 0.4 }}
+          />
+        </div>
+        <div
+          className="centered-on-img modallink"
+          onClick={(evt) => fileRef.current?.click()}
+        >{t`Select File`}</div>
+        <input
+          type="file"
+          key="hinpt"
+          accept="image/*"
+          ref={fileRef}
+          style={{ display: 'none' }}
+          onChange={(evt) => {
+            setDimensions(null);
+            setFile(evt.target.files?.[0]);
+          }}
        />
-        <div className="centered-on-img modallink">{t`Select File`}</div>
      </div>
      <div className="tmpitm-desc">
        <h4><input
          value={title}
          style={{ width: '10em' }}
          type="text"
-          onChange={(evt) => setTitle(evt.target.value)}
+          onChange={(evt) => {
+            const newTitle = evt.target.value;
+            setTitleUnique(!templateList.some((t) => t.title === newTitle));
+            setTitle(evt.target.value);
+          }}
          placeholder={t`Template Name`}
        /></h4>
        <p>{t`Canvas`}:&nbsp;
          <span><select
-            value={selectedCanvas}
+            value={canvasId}
            onChange={(e) => {
              const sel = e.target;
              selectCanvas(sel.options[sel.selectedIndex].value);
@ -117,23 +156,54 @@ const TemplateItem = ({
          /></span>
        </p>
        <p>
-          {t`Dimensions`}:&nbsp;<span>{(dimensions) ? dimensions.join(' x ') : 'N/A'}</span>
+          {t`Dimensions`}:&nbsp;<span>
+            {(dimensions) ? dimensions.join(' x ') : 'N/A'}
+          </span>
        </p>
      </div>
      <div className="tmpitm-actions">
-        <button>
-          {t`Delete`}
-        </button>
+        {(initTitle) && (
+          <button
+            onClick={() => {
+              stopEditing(initTitle);
+              templateLoader.deleteTemplate(initTitle);
+            }}
+          >
+            {t`Delete`}
+          </button>
+        )}
        <button
-          onClick={(evt) => {
-            evt.stopPropagation();
-            stopEditing(title);
-          }}
+          onClick={(evt) => stopEditing(title)}
        >
          {t`Cancel`}
        </button>
        <button
          disabled={!canSubmit}
+          onClick={async (evt) => {
+            if (!canSubmit) {
+              return;
+            }
+            const [x, y] = coords;
+            if (!initTitle) {
+              console.log('Create new template');
+              await templateLoader.addFile(file, title, canvasId, x, y);
+            } else {
+              if (file && imageId) {
+                console.log('file changed for id', imageId);
+                await templateLoader.updateFile(imageId, file);
+              }
+              if (initTitle
+                && (initTitle !== title || initX !== x
+                || initY !== y || initCanvasId !== canvasId
+                )) {
+                console.log(`template ${title} changed`);
+                templateLoader.changeTemplate(initTitle, {
+                  title, canvasId, x, y,
+                });
+              }
+            }
+            stopEditing(initTitle);
+          }}
        >
          {t`Save`}
        </button>
@ -142,4 +212,4 @@ const TemplateItem = ({
  );
 };

-export default React.memo(TemplateItem);
+export default React.memo(TemplateItemEdit);
--- a/src/components/TemplateSettings.jsx
+++ b/src/components/TemplateSettings.jsx
@ -4,18 +4,21 @@

 import React, { useState, useCallback, useRef } from 'react';
 import { useSelector } from 'react-redux';
+import fileDownload from 'js-file-download';
 import { t } from 'ttag';

 import AddTemplate from './AddTemplate';
 import TemplateItem from './TemplateItem';
 import TemplateItemEdit from './TemplateItemEdit';
+import templateLoader from '../ui/templateLoader';
+

 const TemplateSettings = () => {
  const [showAdd, setShowAdd] = useState(false);
  const list = useSelector((state) => state.templates.list);
  const [editingIndices, setEditingIndices] = useState([]);
  const close = useCallback(() => setShowAdd(false), []);
-  const refClose = useRef();
+  const importRef = useRef();

  const toggleEditing = useCallback((title) => {
    const index = list.findIndex((t) => t.title === title);
@ -24,58 +27,95 @@ const TemplateSettings = () => {
      ? [...editingIndices, index]
      : editingIndices.toSpliced(ind, 1),
    );
-  }, [editingIndices]);
+  }, [list, editingIndices]);

-  console.log('editing', editingIndices);
+  console.log('list', list);

  return (
-    <div className="content">
-      {list.map(({
-        enabled, imageId, canvasId, title, x, y, width, height,
-      }, index) => (editingIndices.includes(index) ? (
-        <TemplateItemEdit
-          enabled={enabled}
-          key={index}
-          title={title}
-          imageId={imageId}
-          canvasId={canvasId}
-          x={x}
-          y={y}
-          width={width}
-          height={height}
-          stopEditing={toggleEditing}
-        />
-      ) : (
-        <TemplateItem
-          enabled={enabled}
-          key={index}
-          title={title}
-          imageId={imageId}
-          canvasId={canvasId}
-          x={x}
-          y={y}
-          width={width}
-          height={height}
-          startEditing={toggleEditing}
-        />
-      )))}
-      {(showAdd) ? (
+    <>
+      <h3>{t`Templates`}</h3>
+      <p>
+      {t`Tired of always spaming one single color? Want to create art instead, but you have to count pixels from some other image? Templates can help you with that! Templates can show as overlay and you can draw over them. One pixel on the template, should be one pixel on the canvas.`}
+      </p>
+      <div className="content">
+        {list.map(({
+          enabled, imageId, canvasId, title, x, y, width, height,
+        }, index) => (editingIndices.includes(index) ? (
+          <TemplateItemEdit
+            enabled={enabled}
+            key={index}
+            title={title}
+            imageId={imageId}
+            canvasId={canvasId}
+            x={x}
+            y={y}
+            stopEditing={toggleEditing}
+          />
+        ) : (
+          <TemplateItem
+            enabled={enabled}
+            key={index}
+            title={title}
+            imageId={imageId}
+            canvasId={canvasId}
+            x={x}
+            y={y}
+            width={width}
+            height={height}
+            startEditing={toggleEditing}
+          />
+        )))}
+        {showAdd && <TemplateItemEdit stopEditing={close} />}
+        {(showAdd) ? (
+          <span
+            role="button"
+            tabIndex={-1}
+            className="modallink"
+            onClick={() => close()}
+          > {t`Cancel adding Template`}</span>
+        ) : (
+          <span
+            role="button"
+            tabIndex={-1}
+            className="modallink"
+            onClick={() => setShowAdd(true)}
+          > {t`Add Template`}</span>
+        )}
+        {(list.some((z) => z.enabled)) && (
+          <React.Fragment key="exps">
+            &nbsp;|&nbsp;
+            <span
+              role="button"
+              tabIndex={-1}
+              className="modallink"
+              onClick={async () => {
+                const data = await templateLoader.exportEnabledTemplates();
+                fileDownload(
+                  JSON.stringify(data), 'PixelplanetTemplates.json',
+                );
+              }}
+            >{t`Export enabled templates`}</span>
+          </React.Fragment>
+        )}
+        &nbsp;|&nbsp;
        <span
          role="button"
          tabIndex={-1}
          className="modallink"
-          onClick={() => refClose.current?.()}
-        > {t`Cancel adding Template`}</span>
-      ) : (
-        <span
-          role="button"
-          tabIndex={-1}
-          className="modallink"
-          onClick={() => setShowAdd(true)}
-        > {t`Add Template`}</span>
-      )}
-      {showAdd && <AddTemplate close={close} triggerClose={refClose} />}
-    </div>
+          onClick={async () => importRef.current?.click()}
+          >{t`Import templates`}</span>
+          <input
+            type="file"
+            key="impin"
+            accept="image/*"
+            ref={importRef}
+            style={{ display: 'none' }}
+            onChange={(evt) => {
+              templateLoader.importTemplates(evt.target.files?.[0]);
+            }}
+          />
+      </div>
+    </>
  );
 };

--- a/src/components/windows/Settings.jsx
+++ b/src/components/windows/Settings.jsx
@ -67,6 +67,7 @@ const Settings = () => {
    isMuted,
    chatNotify,
    isHistoricalView,
+    templatesAvailable,
  ] = useSelector((state) => [
    state.gui.showGrid,
    state.gui.showPixelNotify,
@ -79,6 +80,7 @@ const Settings = () => {
    state.gui.mute,
    state.gui.chatNotify,
    state.canvas.isHistoricalView,
+    state.templates.available,
  ], shallowEqual);
  const dispatch = useDispatch();
  const audioAvailable = window.AudioContext || window.webkitAudioContext;
@ -193,11 +195,7 @@ const Settings = () => {
        </div>
      )}
      <div className="modaldivider" />
-      <h3>{t`Templates`}</h3>
-      <p>
-        {t`Tired of always spaming one single color? Want to create art instead, but you have to count pixels from some other image? Templates can help you with that! Templates can show as overlay and you can draw over them. One pixel on the template, should be one pixel on the canvas.`}
-      </p>
-      <TemplateSettings />
+      {(templatesAvailable) && <TemplateSettings />}
    </div>
  );
 };
--- a/src/core/utils.js
+++ b/src/core/utils.js
@ -688,3 +688,25 @@ export function parentExists() {
    return false;
  }
 }
+
+export function bufferToBase64(array) {
+  return new Promise((resolve) => {
+    const blob = new Blob([array]);
+    const reader = new FileReader();
+    
+    reader.onload = (event) => {
+      const dataUrl = event.target.result;
+      const [_, base64] = dataUrl.split(',');
+      
+      resolve(base64);
+    };
+    
+    reader.readAsDataURL(blob);
+  });
+}
+
+export async function base64ToBuffer(base64) {
+  const dataUrl = "data:application/octet-binary;base64," + base64;
+  const res = await fetch(dataUrl);
+  return res.arrayBuffer();
+}
--- a/src/store/actions/templates.js
+++ b/src/store/actions/templates.js
@ -15,6 +15,12 @@ export function listTemplate(imageId, title, canvasId, x, y, width, height) {
  };
 }

+export function templatesReady(title) {
+  return {
+    type: 'TEMPLATES_READY',
+  };
+}
+
 export function removeTemplate(title) {
  return {
    type: 's/REM_TEMPLATE',
@ -29,3 +35,13 @@ export function changeTemplate(title, props) {
    props,
  };
 }
+
+export function updatedTemplateImage(imageId, width, height) {
+  console.log('update', width, height, 'store');
+  return {
+    type: 's/UPD_TEMPLATE_IMG',
+    imageId,
+    width,
+    height,
+  };
+}
--- a/src/store/reducers/templates.js
+++ b/src/store/reducers/templates.js
@ -71,6 +71,47 @@ export default function templates(
      };
    }

+    case 's/REM_TEMPLATE': {
+      return {
+        ...state,
+        list: state.list.filter((t) => t.title !== action.title),
+      };
+    }
+
+    case 's/UPD_TEMPLATE_IMG': {
+      const { imageId, width, height } = action;
+      const { list } = state;
+      const index = list.findIndex((t) => t.imageId === imageId);
+      if (index === -1) {
+        return state;
+      }
+      return {
+        ...state,
+        list: [
+          ...list.slice(0, index),
+          {
+            ...list[index],
+            imageId,
+            width,
+            height,
+          },
+          ...list.slice(index + 1),
+        ],
+      };
+    }
+    
+    case 'TEMPLATES_READY':
+      return {
+        ...state,
+        available: true,
+      };
+
+    case 'persist/REHYDRATE':
+      return {
+        ...state,
+        available: false,
+      };
+
    default:
      return state;
  }
--- a/src/styles/default.css
+++ b/src/styles/default.css
@ -316,7 +316,6 @@ tr:nth-child(even) {
  display: flex;
  flex-direction: row;
  align-items: center;
-  cursor: pointer;
 }

 .tmpitm.disabled {
@ -356,9 +355,9 @@ tr:nth-child(even) {

 .centered-on-img {
  position: relative;
-  transform: translateY(-99px);
+  transform: translateY(-96px);
  line-height: 96px;
-  background: #e6e6e6d1;
+  background: #e6e6e6a6;
  white-space: nowrap;
  max-width: 96px;
  height: 96px;
--- a/src/ui/templateLoader.js
+++ b/src/ui/templateLoader.js
@ -6,7 +6,11 @@ import FileStorage from '../utils/FileStorage';
 import {
  removeTemplate,
  listTemplate,
+  updatedTemplateImage,
+  changeTemplate,
+  templatesReady,
 } from '../store/actions/templates';
+import { bufferToBase64, base64ToBuffer } from '../core/utils';
 import Template from './Template';

 const STORE_NAME = 'templates';
@ -20,13 +24,21 @@ class TemplateLoader {
  ready = false;

  async initialize(store) {
-    this.#store = store;
-    await this.#fileStorage.initialize();
-    await this.syncDB();
-    this.ready = true;
+    try {
+      this.#store = store;
+      await this.#fileStorage.initialize();
+      this.ready = true;
+      this.#store.dispatch(templatesReady());
+      await this.syncDB();
+    } catch (err) {
+      console.warn(`Couldn't initialize Templates: ${err.message}`);
+    }
  }

  async getTemplate(id) {
+    if (!this.ready) {
+      return null;
+    }
    let template = this.#templates.get(id);
    if (template) {
      return template.image;
@ -88,6 +100,7 @@ class TemplateLoader {
        throw new Error('File does not exist in indexedDB');
      }
      const { mimetype, buffer } = fileData;
+      console.log('mime', mimetype, 'buffer', buffer);
      const template = new Template(imageId);
      await template.fromBuffer(buffer, mimetype);
      this.#templates.set(imageId, template);
@ -105,16 +118,11 @@ class TemplateLoader {
   * @param element optional image or canvas element where file is already loaded,
   *                can be used to avoid having to load it multiple times
   */
-  async addFile(file, title, canvasId, x, y, element = null) {
+  async addFile(file, title, canvasId, x, y) {
    try {
      const imageId = await this.#fileStorage.saveFile(file);
      const template = new Template(imageId);
-      let dimensions;
-      if (element) {
-        dimensions = await template.fromImage(element);
-      } else {
-        dimensions = await template.fromFile(file);
-      }
+      const dimensions = await template.fromFile(file);
      this.#templates.set(imageId, template);
      this.#store.dispatch(listTemplate(
        imageId, title, canvasId, x, y, ...dimensions,
@ -124,6 +132,89 @@ class TemplateLoader {
      console.error(`Error saving template ${title}: ${err.message}`);
    }
  }
+
+  async updateFile(imageId, file) {
+    try {
+      await this.#fileStorage.updateFile(imageId, file);
+      const template = new Template(imageId);
+      const dimensions = await template.fromFile(file);
+      this.#templates.set(imageId, template);
+      this.#store.dispatch(updatedTemplateImage(imageId, ...dimensions));
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error(`Error updating file ${imageId}: ${err.message}`);
+    }
+  }
+
+  changeTemplate(title, props) {
+    this.#store.dispatch(changeTemplate(title, props));
+  }
+
+  deleteTemplate(title) {
+    const { list } = this.#store.getState().templates;
+    const tData = list.find((z) => z.title === title)
+    if (!tData) {
+      return;
+    }
+    const { imageId } = tData;
+    this.#store.dispatch(removeTemplate(title));
+    this.#fileStorage.deleteFile(imageId);
+    this.#templates.delete(imageId);
+  }
+  
+  async exportEnabledTemplates() {
+    const { list } = this.#store.getState().templates;
+    const tDataList = list.filter((z) => z.enabled);
+    const temps = await this.#fileStorage.loadFile(
+      tDataList.map((z) => z.imageId),
+    );
+    const serilizableObj = [];
+    for (let i = 0; i < tDataList.length; i += 1) {
+      const { buffer, mimetype } = temps[i];
+      console.log('mimetype', mimetype);
+      serilizableObj.push({
+        ...tDataList[i],
+        // eslint-disable-next-line no-await-in-loop
+        buffer: await bufferToBase64(buffer),
+        mimetype,
+      });
+    }
+    return serilizableObj;
+  }
+  
+  async importTemplates(file) {
+    const tDataList = JSON.parse(await file.text());
+    const bufferList = await Promise.all(
+      tDataList.map((z) => base64ToBuffer(z.buffer)),
+    );
+    const fileList = [];
+    for (let i = 0; i < tDataList.length; i += 1) {
+      const { mimetype } = tDataList[i];
+      console.log('mimetype', mimetype, 'buffer', bufferList[i]);
+      fileList.push(new Blob([bufferList[i]], { type: mimetype }));
+    }
+    const { list } = this.#store.getState().templates;
+    const imageIdList = await this.#fileStorage.saveFile(fileList);
+    const idsToDelete = [];
+    for (let i = 0; i < tDataList.length; i += 1) {
+      const { x, y, width, height, canvasId, title } = tDataList[i];
+      const imageId = imageIdList[i];
+      const existing = list.find((z) => z.title === title);
+      if (existing) {
+        idsToDelete.push(existing.imageId);
+        this.changeTemplate(title, {
+          imageId, title, canvasId, x, y, width, height,
+        });
+      } else {
+        this.#store.dispatch(listTemplate(
+          imageId, title, canvasId, x, y, width, height,
+        ));
+      }
+    }
+    if (idsToDelete.length) {
+      this.#fileStorage.deleteFile(idsToDelete);
+    }
+  }
 }

 const templateLoader = new TemplateLoader();
--- a/src/utils/FileStorage.js
+++ b/src/utils/FileStorage.js
@ -49,7 +49,7 @@ class FileStorage {

      request.onerror = () => {
        console.error('Error on opening indexedDB:', request.error);
-        reject();
+        reject(request.error);
      };
    });
  }
@ -74,7 +74,7 @@ class FileStorage {
      transaction.onabort = (event) => {
        event.stopPropagation();
        console.log('Saving files to indexedDB aborted:', event, result);
-        reject();
+        reject(event.target.error);
      };

      const os = transaction.objectStore('files');
@ -92,6 +92,29 @@ class FileStorage {
    });
  }

+  async updateFile(id, file) {
+    const { db } = FileStorage;
+    if (!db) {
+      return null;
+    }
+    const buffer = await file.arrayBuffer();
+    return new Promise((resolve, reject) => {
+      const transaction = db.transaction('files', 'readwrite');
+
+      transaction.onabort = (event) => {
+        event.stopPropagation();
+        console.log('Saving files to indexedDB aborted:', event);
+        reject(event.target.error);
+      };
+
+      transaction.objectStore('files').put({
+        type: this.type,
+        mimetpe: file.type,
+        buffer,
+      }, id).onsuccess = (event) => resolve(event.target.result);
+    });
+  }
+
  // eslint-disable-next-line class-methods-use-this
  loadFile(ids) {
    const { db } = FileStorage;
@ -111,7 +134,7 @@ class FileStorage {
      transaction.onabort = (event) => {
        event.stopPropagation();
        console.log('Loading file from indexedDB aborted:', event.target.error);
-        reject();
+        reject(event.target.error);
      };

      const os = transaction.objectStore('files');
@ -143,7 +166,7 @@ class FileStorage {
      transaction.onabort = (event) => {
        event.stopPropagation();
        console.log('Saving files to indexedDB aborted:', event);
-        reject();
+        reject(event.target.error);
      };

      const os = transaction.objectStore('files');