Merge pull request #12 from MightyShadow702/merge-update

Merge update

Author: MS702

js/list.js

@@ -2,7 +2,7 @@ var metadata = {}
 
 var search_string = "";
 
-var objects = []
+var objects = {};
 
 var editing = false;
 var name_backup = "";
@@ -63,6 +63,7 @@ class Item
   Toggle()
   {
     metadata[this.name].active = !metadata[this.name].active;
+    metadata[this.name].timestamp = Date.now();
     this.Update();
     save_metadata();
   }
@@ -111,14 +112,15 @@ class Item
               {
                   old_toast.remove();
               }
-              var undo_element = metadata[name];
+              const undo_element = structuredClone(metadata[name]);
               traero_toast(translate("toast_undo"), 3000, true, ()=>{
                   metadata[name] = undo_element;
+                  metadata[name].timestamp = Date.now();
                   save_metadata();
               });
           }
-          delete metadata[name];
-          objects.splice(objects.indexOf(obj), 1);
+          metadata[name].active = null;
+          metadata[name].timestamp = Date.now();
           save_metadata();
         }
         clearInterval(delete_timer);
@@ -145,11 +147,12 @@ function add_item(name)
   if (!(name in metadata))
   {
     var content = name.split(",").map(i => i.trim())
-    metadata[name] = {"active": true, "title": content[0], "meta": content.slice(1).join(", ")};
+    metadata[name] = {"active": true, "title": content[0], "meta": content.slice(1).join(", "), "timestamp": Date.now()};
   }
   else
   {
       metadata[name].active = true;
+      metadata.timestamp = Date.now();
   }
   save_metadata();
 }
@@ -213,57 +216,82 @@ function input_clear()
   update_search();
 }
 
+function cleanup_metadata()
+{
+  for (const name in metadata)
+  {
+    if (metadata[name].active == null)
+    {
+      delete metadata[name];
+    }
+  }
+}
+
 function import_metadata()
 {
   window.webxdc.importFiles({
     mimeTypes: ["applcation/json"],
     extensions: [".json"],
   }).then((files) => {
     files[0].text().then(text => {
-      Object.assign(metadata, JSON.parse(text));
+      var timestamp = Date.now();
+      for (const [name, data] of Object.entries(JSON.parse(text)))
+      {
+        data.timestamp = timestamp;
+        metadata[name] = data;
+      }
       save_metadata();
     });
   });
 }
 
 function export_metadata()
 {
+  cleanup_metadata();
+  var file = {};
+  for (const [name, data] of Object.entries(metadata))
+  {
+    file[name] = {active: data.active, title: data.title, meta: data.meta}
+  }
   window.webxdc.sendToChat({
-      file: {plainText: JSON.stringify(metadata), name: "Traero.json"},
+      file: {plainText: JSON.stringify(file), name: "Traero.json"},
       text: translate("export_message")
   });
 }
 
 function update_list()
 {
-  var existing = Object.fromEntries(objects.map(i => [i.name, i]));
-  for (var i in metadata)
+  for (const name in metadata)
   {
-    if (!(i in existing))
+    if (!(name in objects))
     {
-      var obj = new Item(i, metadata[i].title, metadata[i].meta);
-      objects.push(obj);
-      obj.Update();
+      if (metadata[name].active != null)
+      {
+        var obj = new Item(name, metadata[name].title, metadata[name].meta);
+        objects[name] = obj;
+        obj.Update();
+      }
+      else
+      {
+        delete metadata[name];
+      }
     }
     else
     {
-      if (metadata[i].active)
+      if (metadata[name].active == true)
       {
-        existing[i].toActive();
+        objects[name].toActive();
+      }
+      else if (metadata[name].active == false)
+      {
+        objects[name].toLast();
       }
       else
       {
-        existing[i].toLast();
+        objects[name].remove();
+        delete metadata[name];
       }
     }
   }
-  for (var i in objects)
-  {
-    if (!(objects[i].name in metadata))
-    {
-      objects[i].remove();
-      objects.splice(i, 1);
-    }
-  }
   update_search();
 }

js/main.js

@@ -1,6 +1,6 @@
 function save_metadata()
 {
-    var item_count = 0;
+  var item_count = 0;
   for (var i in metadata)
   {
       if (metadata[i].active)
@@ -24,7 +24,14 @@ function update_handler(data)
   if (data.serial == data.max_serial)
   {
       var payload = data.payload;
-      metadata = payload.metadata;
+      console.log(payload.metadata);
+      for (const [name, data] of Object.entries(payload.metadata))
+      {
+        if (!(name in metadata) || (name in metadata && metadata[name].timestamp < data.timestamp))
+        {
+          metadata[name] = data;
+        }
+      }
       update_list();
   }
 }
@@ -50,7 +57,7 @@ function onload()
   {
     changeTheme(themes[localStorage.selectedTheme]);
   }
-
+  
   window.webxdc.setUpdateListener(update_handler);
 
   if (localStorage.firstSession == undefined)

js/menu.js

@@ -25,7 +25,7 @@ function show_about()
   title.innerHTML = "Traero";
   about_dialog.add(title);
   var version_number = document.createElement("p");
-  version_number.innerHTML = "Version: 0.8.5";
+  version_number.innerHTML = "Version: 0.8.6";
   about_dialog.add(version_number);
   var license_txt = document.createElement("p");
   license_txt.id = "license_title";

js/tutorial.js

@@ -96,6 +96,8 @@ function tutorial_add()
   current_step = tutorial_popup(tutorial_edit, translate("tutorial_add"));
 }
 
+function traero_toast(){};
+
 function save_metadata()
 {
   update_list();

manifest.toml

@@ -1,4 +1,4 @@
 name = "Traero"
 description = "a modern shopping list"
 source_code_url = "https://github.com/MightyShadow702/Traero-webxdc"
-tag_name = "0.8.5"
+tag_name = "0.8.6"