X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Futils%2FgameStorage.js;h=05aaef7404fc4bb90e6ba72c0552804efb01802a;hp=2ccb494f9b9e3a96947afab7e1d892915d6f3701;hb=4f298adbee00942323fc7ec517117552aeb5a08a;hpb=22efa391c3f49ae7b91cd86ccf11da3af74523fe

diff --git a/client/src/utils/gameStorage.js b/client/src/utils/gameStorage.js
index 2ccb494f..05aaef74 100644
--- a/client/src/utils/gameStorage.js
+++ b/client/src/utils/gameStorage.js
@@ -1,6 +1,6 @@
 // Game object: {
 //   // Static informations:
-//   gameId: string
+//   id: string
 //   vname: string,
 //   fenStart: string,
 //   players: array of sid+id+name,
@@ -17,6 +17,7 @@
 // }
 
 import { ajax } from "@/utils/ajax";
+import { store } from "@/store";
 
 function dbOperation(callback)
 {
@@ -24,7 +25,7 @@ function dbOperation(callback)
   let DBOpenRequest = window.indexedDB.open("vchess", 4);
 
   DBOpenRequest.onerror = function(event) {
-    alert("Database error: " + event.target.errorCode);
+    alert(store.state.tr["Database error:"] + " " + event.target.errorCode);
   };
 
   DBOpenRequest.onsuccess = function(event) {
@@ -36,10 +37,10 @@ function dbOperation(callback)
   DBOpenRequest.onupgradeneeded = function(event) {
     let db = event.target.result;
     db.onerror = function(event) {
-      alert("Error while loading database: " + event.target.errorCode);
+      alert(store.state.tr["Error while loading database:"] + " " + event.target.errorCode);
     };
     // Create objectStore for vchess->games
-    let objectStore = db.createObjectStore("games", { keyPath: "gameId" });
+    let objectStore = db.createObjectStore("games", { keyPath: "id" });
     objectStore.createIndex("score", "score"); //to search by game result
   }
 }
@@ -47,7 +48,6 @@ function dbOperation(callback)
 export const GameStorage =
 {
   // Optional callback to get error status
-  // TODO: this func called from Hall seems to not work now...
   add: function(game, callback)
   {
     dbOperation((db) => {
@@ -58,7 +58,7 @@ export const GameStorage =
           callback({}); //everything's fine
         }
         transaction.onerror = function() {
-          callback({errmsg: "addGame failed: " + transaction.error});
+          callback({errmsg: store.state.tr["Game retrieval failed:"] + " " + transaction.error});
         };
       }
       let objectStore = transaction.objectStore("games");
@@ -67,22 +67,47 @@ export const GameStorage =
   },
 
   // TODO: also option to takeback a move ?
-  // NOTE: for live games only (all on server for corr)
-  update: function(gameId, obj) //move, fen, clocks, score, initime, ...
+  // obj: chat, move, fen, clocks, score[Msg], initime, ...
+  update: function(gameId, obj)
   {
-    dbOperation((db) => {
-      let objectStore = db.transaction("games", "readwrite").objectStore("games");
-      objectStore.get(gameId).onsuccess = function(event) {
-        const game = event.target.result;
-        Object.keys(obj).forEach(k => {
-          if (k == "move")
-            game.moves.push(obj[k]);
-          else
-            game[k] = obj[k];
-        });
-        objectStore.put(game); //save updated data
-      }
-    });
+    if (Number.isInteger(gameId) || !isNaN(parseInt(gameId)))
+    {
+      // corr: only move, fen and score
+      ajax(
+        "/games",
+        "PUT",
+        {
+          gid: gameId,
+          newObj:
+          {
+            // Some fields may be undefined:
+            chat: obj.chat,
+            move: obj.move,
+            fen: obj.fen,
+            score: obj.score,
+            scoreMsg: obj.scoreMsg,
+            drawOffer: obj.drawOffer,
+          }
+        }
+      );
+    }
+    else
+    {
+      // live
+      dbOperation((db) => {
+        let objectStore = db.transaction("games", "readwrite").objectStore("games");
+        objectStore.get(gameId).onsuccess = function(event) {
+          const game = event.target.result;
+          Object.keys(obj).forEach(k => {
+            if (k == "move")
+              game.moves.push(obj[k]);
+            else
+              game[k] = obj[k];
+          });
+          objectStore.put(game); //save updated data
+        }
+      });
+    }
   },
 
   // Retrieve all local games (running, completed, imported...)
@@ -113,7 +138,11 @@ export const GameStorage =
     if (Number.isInteger(gameId) || !isNaN(parseInt(gameId)))
     {
       ajax("/games", "GET", {gid:gameId}, res => {
-        callback(res.game);
+        let game = res.game;
+        game.moves.forEach(m => {
+          m.squares = JSON.parse(m.squares);
+        });
+        callback(game);
       });
     }
     else //local game
@@ -148,7 +177,7 @@ export const GameStorage =
           callback({}); //everything's fine
         }
         transaction.onerror = function() {
-          callback({errmsg: "removeGame failed: " + transaction.error});
+          callback({errmsg: store.state.tr["Game removal failed:"] + " " + transaction.error});
         };
       }
       transaction.objectStore("games").delete(gameId);