Jomaar/automatic-dispose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

transactions

Browse Source
This commit is contained in:
Josef Fröhle
2018-12-19 16:28:51 +01:00
parent 4b691b54c8
commit 01acb126a4
3 changed files with 178 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Wed Dec 19 2018 16:24:02 GMT+0100 (CET)*/ /*Generated on:Wed Dec 19 2018 16:28:51 GMT+0100 (CET)*/
var AutomaticDispose_Branch = "master"; var AutomaticDispose_Branch = "master";
var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
var da_lss_adis_time = new Date().getTime(); var da_lss_adis_time = new Date().getTime();
dist/autoloaderV2.js
Vendored
+89 -88
View File
@@ -1,4 +1,4 @@
/*Generated on:Wed Dec 19 2018 16:24:02 GMT+0100 (CET)*/ /*Generated on:Wed Dec 19 2018 16:28:51 GMT+0100 (CET)*/
/* /*
* Dexie.js - a minimalistic wrapper for IndexedDB * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -18126,39 +18126,38 @@ class AutomaticDispose {
ReadAndAddMissions(MissionID, Runner) { ReadAndAddMissions(MissionID, Runner) {
const self = this; const self = this;
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => { return self.ADisDB.transaction('r', [self.ADisDB.ADisMissions], async () => {
return self.ADSettings().then(async () => {
self.ADSettings().then(() => {
return self.ADisDB.ADisMissions.toCollection() return self.ADisDB.ADisMissions.toCollection()
}).then((Missions) => { })
if (typeof Missions !== "undefined") { }).then((Missions) => {
return Missions.count((count) => { if (typeof Missions !== "undefined") {
if (count > 0) { return Missions.count((count) => {
return Missions.each((MyMission) => { if (count > 0) {
var MissionElement = $("#mission_" + MyMission.missionID); return Missions.each((MyMission) => {
if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) { var MissionElement = $("#mission_" + MyMission.missionID);
// remove if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) {
console.log("Remove :", MyMission) // remove
self.RemoveMissionsFromQueue(MyMission.missionID) console.log("Remove :", MyMission)
} self.RemoveMissionsFromQueue(MyMission.missionID)
}); }
}
});
}
}).then(() => {
if (typeof MissionID != 'undefined') {
return self.AddMission(MissionID, Runner);
} else {
return self.ADisSettings.runner_divs.forEach(async (RunnerX, index) => {
await $("#" + RunnerX).find(".missionSideBarEntry").each(async (index, elem) => {
MissionID = $(elem).attr("mission_id");
await self.AddMission(MissionID, RunnerX);
}); });
}) }
} });
}); }
}); }).then(() => {
if (typeof MissionID != 'undefined') {
return self.AddMission(MissionID, Runner);
} else {
return self.ADisSettings.runner_divs.forEach(async (RunnerX, index) => {
await $("#" + RunnerX).find(".missionSideBarEntry").each(async (index, elem) => {
MissionID = $(elem).attr("mission_id");
await self.AddMission(MissionID, RunnerX);
});
})
}
});;
} }
AddMission(ID, Runner) { AddMission(ID, Runner) {
@@ -18306,10 +18305,12 @@ class AutomaticDispose {
RemoveMissionsFromQueue(MissionID) { RemoveMissionsFromQueue(MissionID) {
const self = this; const self = this;
return self.ADisDB.ADisMissions.where({ return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], async () => {
missionID: MissionID return self.ADisDB.ADisMissions.where({
}).delete().catch((err) => { missionID: MissionID
console.error(err) }).delete().catch((err) => {
console.error(err)
})
}) })
} }
@@ -18329,7 +18330,7 @@ class AutomaticDispose {
// }) // })
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => { return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
self.ADSettings().then((setting) => { return self.ADSettings().then((setting) => {
if (setting[runnerSettings] == 'true') { if (setting[runnerSettings] == 'true') {
return self.ADisDB.ADisMissions.where({ return self.ADisDB.ADisMissions.where({
runner: Runner, runner: Runner,
@@ -18339,36 +18340,36 @@ class AutomaticDispose {
return item.next_check <= Math.floor(new Date().getTime() / 1000) return item.next_check <= Math.floor(new Date().getTime() / 1000)
}).limit(1) }).limit(1)
} }
}).then((Wunsch) => { })
// console.table(Wunsch); }).then((Wunsch) => {
if (Wunsch !== undefined) { // console.table(Wunsch);
return Wunsch.count(function (count) { if (Wunsch !== undefined) {
if (count > 0) { return Wunsch.count(function (count) {
return Wunsch.each((myWunsch) => { if (count > 0) {
// console.log("MYWUNSCH:") return Wunsch.each((myWunsch) => {
// console.table(myWunsch); // console.log("MYWUNSCH:")
let MissionID = myWunsch.missionID; // console.table(myWunsch);
if ($('#' + runnerIframe).attr("mission_id") == "empty") { let MissionID = myWunsch.missionID;
$('#' + runnerIframe).attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); if ($('#' + runnerIframe).attr("mission_id") == "empty") {
$('#' + runnerIframe).attr("mission_id", MissionID); $('#' + runnerIframe).attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
// self.UpdateMissionsToDone(MissionID).then(() => { $('#' + runnerIframe).attr("mission_id", MissionID);
// // console.log('done.... ' + Runner); // self.UpdateMissionsToDone(MissionID).then(() => {
// $('#' + runnerIframe).attr("src", ''); // // console.log('done.... ' + Runner);
// $('#' + runnerIframe).attr("mission_id", 'empty'); // $('#' + runnerIframe).attr("src", '');
// setTimeout(self.OpenNextMission.bind(self), 5000, Runner); // $('#' + runnerIframe).attr("mission_id", 'empty');
// }) // setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
} else { // })
// only while } else {
// setTimeout(self.OpenNextMission.bind(self), 5000, Runner); // only while
} // setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
}); }
} else { });
return setTimeout(self.OpenNextMission.bind(self), 1000, Runner); } else {
} return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
}); }
} });
return setTimeout(self.OpenNextMission.bind(self), 1000, Runner); }
}); return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
}); });
} }
@@ -18409,8 +18410,8 @@ class AutomaticDispose {
// return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed // return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
// }) // })
// } else { // } else {
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => { return self.ADisDB.transaction('r', [self.ADisDB.ADisMissions], () => {
self.ADSettings().then((setting) => { return self.ADSettings().then((setting) => {
if (setting[self.MyRunnerSettings] === 'true') { if (setting[self.MyRunnerSettings] === 'true') {
let where = { let where = {
@@ -18423,26 +18424,26 @@ class AutomaticDispose {
return item.next_check <= Math.floor(new Date().getTime() / 1000) return item.next_check <= Math.floor(new Date().getTime() / 1000)
}).limit(1) }).limit(1)
} }
}).then((Wunsch) => {
if (Wunsch !== undefined) {
return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((mywunsch) => {
console.table(mywunsch);
return self.MainHandler()
});
} else {
return self.UpdateMissionsToDone(self.MissionID).then(() => {
return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
})
}
});
} else {
return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
})
}
}) })
}).then((Wunsch) => {
if (Wunsch !== undefined) {
return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((mywunsch) => {
console.table(mywunsch);
return self.MainHandler()
});
} else {
return self.UpdateMissionsToDone(self.MissionID).then(() => {
return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
})
}
});
} else {
return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
})
}
}) })
// } // }
}, 500); }, 500);
src/autoloaderV2.js
+88 -87
View File
@@ -885,39 +885,38 @@ class AutomaticDispose {
ReadAndAddMissions(MissionID, Runner) { ReadAndAddMissions(MissionID, Runner) {
const self = this; const self = this;
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => { return self.ADisDB.transaction('r', [self.ADisDB.ADisMissions], async () => {
return self.ADSettings().then(async () => {
self.ADSettings().then(() => {
return self.ADisDB.ADisMissions.toCollection() return self.ADisDB.ADisMissions.toCollection()
}).then((Missions) => { })
if (typeof Missions !== "undefined") { }).then((Missions) => {
return Missions.count((count) => { if (typeof Missions !== "undefined") {
if (count > 0) { return Missions.count((count) => {
return Missions.each((MyMission) => { if (count > 0) {
var MissionElement = $("#mission_" + MyMission.missionID); return Missions.each((MyMission) => {
if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) { var MissionElement = $("#mission_" + MyMission.missionID);
// remove if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) {
console.log("Remove :", MyMission) // remove
self.RemoveMissionsFromQueue(MyMission.missionID) console.log("Remove :", MyMission)
} self.RemoveMissionsFromQueue(MyMission.missionID)
}); }
}
});
}
}).then(() => {
if (typeof MissionID != 'undefined') {
return self.AddMission(MissionID, Runner);
} else {
return self.ADisSettings.runner_divs.forEach(async (RunnerX, index) => {
await $("#" + RunnerX).find(".missionSideBarEntry").each(async (index, elem) => {
MissionID = $(elem).attr("mission_id");
await self.AddMission(MissionID, RunnerX);
}); });
}) }
} });
}); }
}); }).then(() => {
if (typeof MissionID != 'undefined') {
return self.AddMission(MissionID, Runner);
} else {
return self.ADisSettings.runner_divs.forEach(async (RunnerX, index) => {
await $("#" + RunnerX).find(".missionSideBarEntry").each(async (index, elem) => {
MissionID = $(elem).attr("mission_id");
await self.AddMission(MissionID, RunnerX);
});
})
}
});;
} }
AddMission(ID, Runner) { AddMission(ID, Runner) {
@@ -1065,10 +1064,12 @@ class AutomaticDispose {
RemoveMissionsFromQueue(MissionID) { RemoveMissionsFromQueue(MissionID) {
const self = this; const self = this;
return self.ADisDB.ADisMissions.where({ return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], async () => {
missionID: MissionID return self.ADisDB.ADisMissions.where({
}).delete().catch((err) => { missionID: MissionID
console.error(err) }).delete().catch((err) => {
console.error(err)
})
}) })
} }
@@ -1088,7 +1089,7 @@ class AutomaticDispose {
// }) // })
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => { return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
self.ADSettings().then((setting) => { return self.ADSettings().then((setting) => {
if (setting[runnerSettings] == 'true') { if (setting[runnerSettings] == 'true') {
return self.ADisDB.ADisMissions.where({ return self.ADisDB.ADisMissions.where({
runner: Runner, runner: Runner,
@@ -1098,36 +1099,36 @@ class AutomaticDispose {
return item.next_check <= Math.floor(new Date().getTime() / 1000) return item.next_check <= Math.floor(new Date().getTime() / 1000)
}).limit(1) }).limit(1)
} }
}).then((Wunsch) => { })
// console.table(Wunsch); }).then((Wunsch) => {
if (Wunsch !== undefined) { // console.table(Wunsch);
return Wunsch.count(function (count) { if (Wunsch !== undefined) {
if (count > 0) { return Wunsch.count(function (count) {
return Wunsch.each((myWunsch) => { if (count > 0) {
// console.log("MYWUNSCH:") return Wunsch.each((myWunsch) => {
// console.table(myWunsch); // console.log("MYWUNSCH:")
let MissionID = myWunsch.missionID; // console.table(myWunsch);
if ($('#' + runnerIframe).attr("mission_id") == "empty") { let MissionID = myWunsch.missionID;
$('#' + runnerIframe).attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); if ($('#' + runnerIframe).attr("mission_id") == "empty") {
$('#' + runnerIframe).attr("mission_id", MissionID); $('#' + runnerIframe).attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
// self.UpdateMissionsToDone(MissionID).then(() => { $('#' + runnerIframe).attr("mission_id", MissionID);
// // console.log('done.... ' + Runner); // self.UpdateMissionsToDone(MissionID).then(() => {
// $('#' + runnerIframe).attr("src", ''); // // console.log('done.... ' + Runner);
// $('#' + runnerIframe).attr("mission_id", 'empty'); // $('#' + runnerIframe).attr("src", '');
// setTimeout(self.OpenNextMission.bind(self), 5000, Runner); // $('#' + runnerIframe).attr("mission_id", 'empty');
// }) // setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
} else { // })
// only while } else {
// setTimeout(self.OpenNextMission.bind(self), 5000, Runner); // only while
} // setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
}); }
} else { });
return setTimeout(self.OpenNextMission.bind(self), 1000, Runner); } else {
} return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
}); }
} });
return setTimeout(self.OpenNextMission.bind(self), 1000, Runner); }
}); return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
}); });
} }
@@ -1168,8 +1169,8 @@ class AutomaticDispose {
// return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed // return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
// }) // })
// } else { // } else {
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => { return self.ADisDB.transaction('r', [self.ADisDB.ADisMissions], () => {
self.ADSettings().then((setting) => { return self.ADSettings().then((setting) => {
if (setting[self.MyRunnerSettings] === 'true') { if (setting[self.MyRunnerSettings] === 'true') {
let where = { let where = {
@@ -1182,26 +1183,26 @@ class AutomaticDispose {
return item.next_check <= Math.floor(new Date().getTime() / 1000) return item.next_check <= Math.floor(new Date().getTime() / 1000)
}).limit(1) }).limit(1)
} }
}).then((Wunsch) => {
if (Wunsch !== undefined) {
return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((mywunsch) => {
console.table(mywunsch);
return self.MainHandler()
});
} else {
return self.UpdateMissionsToDone(self.MissionID).then(() => {
return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
})
}
});
} else {
return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
})
}
}) })
}).then((Wunsch) => {
if (Wunsch !== undefined) {
return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((mywunsch) => {
console.table(mywunsch);
return self.MainHandler()
});
} else {
return self.UpdateMissionsToDone(self.MissionID).then(() => {
return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
})
}
});
} else {
return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
})
}
}) })
// } // }
}, 500); }, 500);