From 18acbc9a01c0b44a649cf0296bc6ac37cce23930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Wed, 19 Dec 2018 16:49:47 +0100 Subject: [PATCH] v2 transaction --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 155 ++++++++++++++++++++++--------------------- src/autoloaderV2.js | 153 +++++++++++++++++++++--------------------- 3 files changed, 156 insertions(+), 154 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 955e11a..c3d7e65 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Dec 19 2018 16:46:20 GMT+0100 (CET)*/ +/*Generated on:Wed Dec 19 2018 16:49:46 GMT+0100 (CET)*/ var AutomaticDispose_Branch = "master"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var da_lss_adis_time = new Date().getTime(); diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js index 5dded94..a09d7f8 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Dec 19 2018 16:46:20 GMT+0100 (CET)*/ +/*Generated on:Wed Dec 19 2018 16:49:46 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18168,79 +18168,19 @@ class AutomaticDispose { const runnerID = self.ADisSettings.runner_divs.indexOf(Runner); const settingOpt = self.ADisSettings.runner_settings[runnerID]; const runnerOpt = self.ADisSettings.runner[runnerID]; - - return self.ADSettings().then((setting) => { - if (setting[settingOpt] == 'true') { - let where = { - missionID: ID, - runner: runnerOpt - }; - return self.ADisDB.ADisMissions.where(where).limit(1) - } - }).then((Missions) => { - if (typeof Missions === "undefined") { - return; - /* - var MissionElement = $("#mission_" + ID); - - var MissionID = MissionElement.attr("mission_id"); - var MissionType = MissionElement.attr("mission_type_id"); - var addr = MissionElement.find(".map_position_mover").text().split(",") - var MissionName = addr[0]; - var MissionStreet = addr[1]; - var MissionVillage = addr[2]; - - return self.ADisDB.ADisAvailabelMissions.get({ - type: MissionType - }).then((available) => { - return self.AddMissionsToQueue({ - "missionID": MissionID, - "type": MissionType, - "runner": runnerOpt, - "name": MissionName, - "street": MissionStreet, - "village": MissionVillage, - "available": (available !== undefined) ? 'true' : 'false', - "done": 'false', - "last_check": Math.floor(new Date().getTime() / 1000), - "next_check": Math.floor(new Date().getTime() / 1000) + 1 - }); - }); - */ - } - return Missions.count((count) => { - console.log(count, runnerOpt); - if (count > 0) { - return Missions.each((Mission) => { - console.table(Mission); - var MissionElement = $("#mission_" + ID); - var _MissionID = MissionElement.attr("mission_id"); - var _MissionType = MissionElement.attr("mission_type_id"); - var addr = MissionElement.find(".map_position_mover").text().split(",") - var MissionName = addr[0]; - var MissionStreet = addr[1]; - var MissionVillage = addr[2]; - console.log('update mission', MissionID) - return self.ADisDB.ADisAvailabelMissions.get({ - type: _MissionType - }).then((available) => { - return self.UpdateMissions({ - "missionID": _MissionID, - "type": _MissionType, - "runner": runnerOpt, - "name": MissionName, - "street": MissionStreet, - "village": MissionVillage, - "available": (available !== undefined) ? 'true' : 'false', - "done": "false", - "last_check": Mission.last_check, - "next_check": Mission.next_check - }); - }); - - }); - } else { - + return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => { + return self.ADSettings().then((setting) => { + if (setting[settingOpt] == 'true') { + let where = { + missionID: ID, + runner: runnerOpt + }; + return self.ADisDB.ADisMissions.where(where).limit(1) + } + }).then((Missions) => { + if (typeof Missions === "undefined") { + return; + /* var MissionElement = $("#mission_" + ID); var MissionID = MissionElement.attr("mission_id"); @@ -18249,7 +18189,7 @@ class AutomaticDispose { var MissionName = addr[0]; var MissionStreet = addr[1]; var MissionVillage = addr[2]; - console.log('new mission', MissionID) + return self.ADisDB.ADisAvailabelMissions.get({ type: MissionType }).then((available) => { @@ -18266,14 +18206,75 @@ class AutomaticDispose { "next_check": Math.floor(new Date().getTime() / 1000) + 1 }); }); + */ } + return Missions.count((count) => { + console.log(count, runnerOpt); + if (count > 0) { + return Missions.each((Mission) => { + console.table(Mission); + var MissionElement = $("#mission_" + ID); + var _MissionID = MissionElement.attr("mission_id"); + var _MissionType = MissionElement.attr("mission_type_id"); + var addr = MissionElement.find(".map_position_mover").text().split(",") + var MissionName = addr[0]; + var MissionStreet = addr[1]; + var MissionVillage = addr[2]; + console.log('update mission', MissionID) + return self.ADisDB.ADisAvailabelMissions.get({ + type: _MissionType + }).then((available) => { + return self.UpdateMissions({ + "missionID": _MissionID, + "type": _MissionType, + "runner": runnerOpt, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined) ? 'true' : 'false', + "done": "false", + "last_check": Mission.last_check, + "next_check": Mission.next_check + }); + }); + + }); + } else { + + var MissionElement = $("#mission_" + ID); + + var MissionID = MissionElement.attr("mission_id"); + var MissionType = MissionElement.attr("mission_type_id"); + var addr = MissionElement.find(".map_position_mover").text().split(",") + var MissionName = addr[0]; + var MissionStreet = addr[1]; + var MissionVillage = addr[2]; + console.log('new mission', MissionID) + return self.ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return self.AddMissionsToQueue({ + "missionID": MissionID, + "type": MissionType, + "runner": runnerOpt, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined) ? 'true' : 'false', + "done": 'false', + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + }); + }); + } + }); }); }); } AddMissionsToQueue(Mission) { const self = this; - return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => { + return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], async () => { return self.ADisDB.ADisMissions.put(Mission).catch((err) => { console.error(err) }); @@ -18285,7 +18286,7 @@ class AutomaticDispose { UpdateMissions(Mission) { const self = this; - return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => { + return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], async () => { return self.ADisDB.ADisMissions.put(Mission).catch((err) => { console.error(err) }); diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index ec94841..5811608 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -927,79 +927,19 @@ class AutomaticDispose { const runnerID = self.ADisSettings.runner_divs.indexOf(Runner); const settingOpt = self.ADisSettings.runner_settings[runnerID]; const runnerOpt = self.ADisSettings.runner[runnerID]; - - return self.ADSettings().then((setting) => { - if (setting[settingOpt] == 'true') { - let where = { - missionID: ID, - runner: runnerOpt - }; - return self.ADisDB.ADisMissions.where(where).limit(1) - } - }).then((Missions) => { - if (typeof Missions === "undefined") { - return; - /* - var MissionElement = $("#mission_" + ID); - - var MissionID = MissionElement.attr("mission_id"); - var MissionType = MissionElement.attr("mission_type_id"); - var addr = MissionElement.find(".map_position_mover").text().split(",") - var MissionName = addr[0]; - var MissionStreet = addr[1]; - var MissionVillage = addr[2]; - - return self.ADisDB.ADisAvailabelMissions.get({ - type: MissionType - }).then((available) => { - return self.AddMissionsToQueue({ - "missionID": MissionID, - "type": MissionType, - "runner": runnerOpt, - "name": MissionName, - "street": MissionStreet, - "village": MissionVillage, - "available": (available !== undefined) ? 'true' : 'false', - "done": 'false', - "last_check": Math.floor(new Date().getTime() / 1000), - "next_check": Math.floor(new Date().getTime() / 1000) + 1 - }); - }); - */ - } - return Missions.count((count) => { - console.log(count, runnerOpt); - if (count > 0) { - return Missions.each((Mission) => { - console.table(Mission); - var MissionElement = $("#mission_" + ID); - var _MissionID = MissionElement.attr("mission_id"); - var _MissionType = MissionElement.attr("mission_type_id"); - var addr = MissionElement.find(".map_position_mover").text().split(",") - var MissionName = addr[0]; - var MissionStreet = addr[1]; - var MissionVillage = addr[2]; - console.log('update mission', MissionID) - return self.ADisDB.ADisAvailabelMissions.get({ - type: _MissionType - }).then((available) => { - return self.UpdateMissions({ - "missionID": _MissionID, - "type": _MissionType, - "runner": runnerOpt, - "name": MissionName, - "street": MissionStreet, - "village": MissionVillage, - "available": (available !== undefined) ? 'true' : 'false', - "done": "false", - "last_check": Mission.last_check, - "next_check": Mission.next_check - }); - }); - - }); - } else { - + return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => { + return self.ADSettings().then((setting) => { + if (setting[settingOpt] == 'true') { + let where = { + missionID: ID, + runner: runnerOpt + }; + return self.ADisDB.ADisMissions.where(where).limit(1) + } + }).then((Missions) => { + if (typeof Missions === "undefined") { + return; + /* var MissionElement = $("#mission_" + ID); var MissionID = MissionElement.attr("mission_id"); @@ -1008,7 +948,7 @@ class AutomaticDispose { var MissionName = addr[0]; var MissionStreet = addr[1]; var MissionVillage = addr[2]; - console.log('new mission', MissionID) + return self.ADisDB.ADisAvailabelMissions.get({ type: MissionType }).then((available) => { @@ -1025,14 +965,75 @@ class AutomaticDispose { "next_check": Math.floor(new Date().getTime() / 1000) + 1 }); }); + */ } + return Missions.count((count) => { + console.log(count, runnerOpt); + if (count > 0) { + return Missions.each((Mission) => { + console.table(Mission); + var MissionElement = $("#mission_" + ID); + var _MissionID = MissionElement.attr("mission_id"); + var _MissionType = MissionElement.attr("mission_type_id"); + var addr = MissionElement.find(".map_position_mover").text().split(",") + var MissionName = addr[0]; + var MissionStreet = addr[1]; + var MissionVillage = addr[2]; + console.log('update mission', MissionID) + return self.ADisDB.ADisAvailabelMissions.get({ + type: _MissionType + }).then((available) => { + return self.UpdateMissions({ + "missionID": _MissionID, + "type": _MissionType, + "runner": runnerOpt, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined) ? 'true' : 'false', + "done": "false", + "last_check": Mission.last_check, + "next_check": Mission.next_check + }); + }); + + }); + } else { + + var MissionElement = $("#mission_" + ID); + + var MissionID = MissionElement.attr("mission_id"); + var MissionType = MissionElement.attr("mission_type_id"); + var addr = MissionElement.find(".map_position_mover").text().split(",") + var MissionName = addr[0]; + var MissionStreet = addr[1]; + var MissionVillage = addr[2]; + console.log('new mission', MissionID) + return self.ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return self.AddMissionsToQueue({ + "missionID": MissionID, + "type": MissionType, + "runner": runnerOpt, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined) ? 'true' : 'false', + "done": 'false', + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + }); + }); + } + }); }); }); } AddMissionsToQueue(Mission) { const self = this; - return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => { + return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], async () => { return self.ADisDB.ADisMissions.put(Mission).catch((err) => { console.error(err) }); @@ -1044,7 +1045,7 @@ class AutomaticDispose { UpdateMissions(Mission) { const self = this; - return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => { + return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], async () => { return self.ADisDB.ADisMissions.put(Mission).catch((err) => { console.error(err) });