Save WIP

[rbdr/canvas] / src / lib / stores / widgets.js

diff --git a/src/lib/stores/widgets.js b/src/lib/stores/widgets.js
index 4da94ff1980c012e417f0959c1f61fe64d82af7f..372cad10c6f1257a3459e9d19ce46a18aa9ffbe5 100644 (file)
--- a/src/lib/stores/widgets.js
+++ b/src/lib/stores/widgets.js
@@ -1,60 +1,64 @@
-import { derived, writable } from 'svelte/store';
+import { derived, readable, writable } from 'svelte/store';

 import { createClient } from '@supabase/supabase-js';
 import { supabase } from '$lib/config';
 import { maxSize } from '$lib/config';
 
 import { createClient } from '@supabase/supabase-js';
 import { supabase } from '$lib/config';
 import { maxSize } from '$lib/config';
 

-const boxParser = /\(([0-9]+),([0-9]+)\),\(([0-9]+),([0-9]+)\)/
+const boxParser = /\(([0-9]+),([0-9]+)\),\(([0-9]+),([0-9]+)\)/;

 const client = createClient(supabase.url, supabase.key);
 
 const client = createClient(supabase.url, supabase.key);
 

-export const sensor = writable({left: 0, top: 0, right: 0, bottom: 0});
-
-const getBoxes = function getBoxes ({left, top, right, bottom}) {
-  const results = [
-    `box.ov."((${left},${top}),(${right},${bottom}))"`,
-    `box.ov."((${left+maxSize},${top+maxSize}),(${right+maxSize},${bottom+maxSize}))"`,
-    `box.ov."((${left+maxSize},${top}),(${right+maxSize},${bottom}))"`,
-    `box.ov."((${left},${top+maxSize}),(${right},${bottom+maxSize}))"`
-  ];
-
-  if (right > maxSize  || bottom > maxSize) {
-    return [...results,
-      `box.ov."((${left-maxSize},${top-maxSize}),(${right-maxSize},${bottom-maxSize}))"`,
-      `box.ov."((${left-maxSize},${top}),(${right-maxSize},${bottom}))"`,
-      `box.ov."((${left},${top-maxSize}),(${right},${bottom-maxSize}))"`
-    ];
-  }
-
-  return results
+export const sensor = writable({ left: 0, top: 0, right: 0, bottom: 0 });
+
+const getBoxes = function getBoxes({ left, top, right, bottom }) {
+       const results = [
+               `box.ov."((${left},${top}),(${right},${bottom}))"`,
+               `box.ov."((${left + maxSize},${top + maxSize}),(${right + maxSize},${bottom + maxSize}))"`,
+               `box.ov."((${left + maxSize},${top}),(${right + maxSize},${bottom}))"`,
+               `box.ov."((${left},${top + maxSize}),(${right},${bottom + maxSize}))"`,
+               `box.ov."((${left - maxSize},${top - maxSize}),(${right - maxSize},${bottom - maxSize}))"`,
+               `box.ov."((${left - maxSize},${top}),(${right - maxSize},${bottom}))"`,
+               `box.ov."((${left},${top - maxSize}),(${right},${bottom - maxSize}))"`
+       ];
+
+       return results;

 };
 
 const serialize = function serialize(widget) {
 };
 
 const serialize = function serialize(widget) {

+       const boxComponents = widget.box.match(boxParser).slice(1, 5).map(Number);
+       const box = {
+               left: Math.min(boxComponents[0], boxComponents[2]),
+               right: Math.max(boxComponents[0], boxComponents[2]),
+               top: Math.min(boxComponents[1], boxComponents[3]),
+               bottom: Math.max(boxComponents[1], boxComponents[3])
+       };

 
 

-  const boxComponents = widget.box
-    .match(boxParser)
-    .slice(1,5)
-    .map(Number);
-  const box = {
-    left: Math.min(boxComponents[0], boxComponents[2]),
-    right: Math.max(boxComponents[0], boxComponents[2]),
-    top: Math.min(boxComponents[1], boxComponents[3]),
-    bottom: Math.max(boxComponents[1], boxComponents[3])
-  };
-
-  return {...widget, box }
+       return { ...widget, box };

 };
 
 let ac = null;
 export const widgets = derived(sensor, async function ($sensor, set) {
 };
 
 let ac = null;
 export const widgets = derived(sensor, async function ($sensor, set) {

-
-  const boxes = getBoxes($sensor);
-  ac && ac.abort()
-  ac = new AbortController();
-  const { data } = await client
-    .from('widgets')
-    .select()
-    .or(boxes.join(','))
-    .abortSignal(ac.signal)
-  if (data) {
-    return set(data.map(serialize));
-  }
+       const boxes = getBoxes($sensor);
+       ac && ac.abort();
+       ac = new AbortController();
+       const { data } = await client.from('widgets').select().or(boxes.join(',')).abortSignal(ac.signal);
+       if (data) {
+               return set(data.map(serialize));
+       }

 });
 });

+
+export const countElements = function countElements(left, top, right, bottom) {
+       let countAc = null;
+       return readable(0, (set) => {
+               (async function () {
+                       countAc && countAc.abort();
+                       countAc = new AbortController();
+                       const { data } = await client
+                               .from('widgets')
+                               .select('*', { head: true, count: 'estimated' })
+                               .or(`box.ov."((${left},${top}),(${right},${bottom}))"`)
+                               .abortSignal(countAc.signal);
+                       if (data) {
+                               return set(data);
+                       }
+               })();
+       });
+};