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

awopva

Browse Source
This commit is contained in:
Josef Fröhle
2018-11-24 19:21:09 +01:00
parent 95afffa550
commit adaf510861
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dist/autoloader.js vendored
View File

@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 16:55:37 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 19:21:08 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();
@@ -4982,8 +4982,11 @@ ADisDB.on("ready", () => {
} }
function ADis_OpenNextOwnMissions() { function ADis_OpenNextOwnMissions() {
console.log('ADis_OpenNextOwnMissions: open')
ADisSettings().then((setting) => { ADisSettings().then((setting) => {
console.log('ADis_OpenNextOwnMissions: load settings')
if (setting['MissionsOwn-Automatic'] == 'true') { if (setting['MissionsOwn-Automatic'] == 'true') {
console.log('ADis_OpenNextOwnMissions: load mission')
return ADisDB.ADisMissionsOwn.where({ return ADisDB.ADisMissionsOwn.where({
done: 'false' done: 'false'
}).and(function (item) { }).and(function (item) {
@@ -4993,25 +4996,28 @@ ADisDB.on("ready", () => {
}).then((Wunsch) => { }).then((Wunsch) => {
if (Wunsch !== undefined) { if (Wunsch !== undefined) {
return Wunsch.count(function (count) { return Wunsch.count(function (count) {
console.log('ADis_OpenNextOwnMissions: load mission: %d', count)
if (count > 0) { if (count > 0) {
return Wunsch.each((myWunsch) => { return Wunsch.each((myWunsch) => {
console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch)
let MissionID = myWunsch.missionID; let MissionID = myWunsch.missionID;
myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300; myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300;
return ADis_UpdateOwnMissions(myWunsch).then(() => { return ADis_UpdateOwnMissions(myWunsch).then(() => {
console.log('ADis_OpenNextOwnMissions: check free slot for mission')
if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") { if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") {
console.log('ADis_OpenNextOwnMissions: free slot for mission')
$("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$("#adis-ownmissions-frame").attr("mission_id", MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID);
OwnMissionsFrameWatchDog = setTimeout(async function () { OwnMissionsFrameWatchDog = setTimeout(function () {
ADis_RemoveOwnMissionsFromQueue(MissionID).then((deleteCount) => { // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); $("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("mission_id", "empty");
$("#adis-ownmissions-frame").attr("mission_id", "empty"); setTimeout(ADis_OpenNextOwnMissions,100);
setTimeout(ADis_OpenNextOwnMissions, 1000);
});
}, 5000); }, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission')
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
} }
}); });

2
dist/standalone.js vendored
View File

@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 16:55:37 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 19:21:08 GMT+0100 (CET)*/
function includesString(string1, string2) { function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase()); return string1.toLowerCase().includes(string2.toLowerCase());
} }

22
script/mission/opener-ownmission.js
View File

@@ -56,8 +56,11 @@ function ADis_ReadAndAddOwnMissions(MissionID) {
} }
function ADis_OpenNextOwnMissions() { function ADis_OpenNextOwnMissions() {
console.log('ADis_OpenNextOwnMissions: open')
ADisSettings().then((setting) => { ADisSettings().then((setting) => {
console.log('ADis_OpenNextOwnMissions: load settings')
if (setting['MissionsOwn-Automatic'] == 'true') { if (setting['MissionsOwn-Automatic'] == 'true') {
console.log('ADis_OpenNextOwnMissions: load mission')
return ADisDB.ADisMissionsOwn.where({ return ADisDB.ADisMissionsOwn.where({
done: 'false' done: 'false'
}).and(function (item) { }).and(function (item) {
@@ -67,25 +70,28 @@ function ADis_OpenNextOwnMissions() {
}).then((Wunsch) => { }).then((Wunsch) => {
if (Wunsch !== undefined) { if (Wunsch !== undefined) {
return Wunsch.count(function (count) { return Wunsch.count(function (count) {
console.log('ADis_OpenNextOwnMissions: load mission: %d', count)
if (count > 0) { if (count > 0) {
return Wunsch.each((myWunsch) => { return Wunsch.each((myWunsch) => {
console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch)
let MissionID = myWunsch.missionID; let MissionID = myWunsch.missionID;
myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300; myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300;
return ADis_UpdateOwnMissions(myWunsch).then(() => { return ADis_UpdateOwnMissions(myWunsch).then(() => {
console.log('ADis_OpenNextOwnMissions: check free slot for mission')
if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") { if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") {
console.log('ADis_OpenNextOwnMissions: free slot for mission')
$("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$("#adis-ownmissions-frame").attr("mission_id", MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID);
OwnMissionsFrameWatchDog = setTimeout(async function () { OwnMissionsFrameWatchDog = setTimeout(function () {
ADis_RemoveOwnMissionsFromQueue(MissionID).then((deleteCount) => { // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); $("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("mission_id", "empty");
$("#adis-ownmissions-frame").attr("mission_id", "empty"); setTimeout(ADis_OpenNextOwnMissions,100);
setTimeout(ADis_OpenNextOwnMissions, 1000);
});
}, 5000); }, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission')
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
} }
}); });