Remove debug printing

master
Kedlub 2023-01-22 09:52:05 +01:00
parent 3ea038bd85
commit 73c7dbf459
2 changed files with 100 additions and 104 deletions

View File

@ -15,10 +15,8 @@
var currentFile = global.__FILE__ || ""; var currentFile = global.__FILE__ || "";
print("Setting UI");
if(global.BACK) delete global.BACK; if(global.BACK) delete global.BACK;
if (options && options.back && enabledForApp(currentFile)) { if (options && options.back && enabledForApp(currentFile)) {
print("Saving back callback");
global.BACK = options.back; global.BACK = options.back;
} }
setUI(mode, cb); setUI(mode, cb);
@ -27,10 +25,8 @@
function goBack(lr, ud) { function goBack(lr, ud) {
// if it is a left to right swipe // if it is a left to right swipe
if (lr === 1) { if (lr === 1) {
print("Back swipe detected");
// if we're in an app that has a back button, run the callback for it // if we're in an app that has a back button, run the callback for it
if (global.BACK) { if (global.BACK) {
print("Running back callback");
global.BACK(); global.BACK();
} }
} }

View File

@ -1,104 +1,104 @@
(function(back) { (function(back) {
var FILE = 'backswipe.json'; var FILE = 'backswipe.json';
// Mode can be 'blacklist', 'whitelist', 'on' or 'disabled' // Mode can be 'blacklist', 'whitelist', 'on' or 'disabled'
// Apps is an array of app info objects, where all the apps that are there are either blocked or allowed, depending on the mode // Apps is an array of app info objects, where all the apps that are there are either blocked or allowed, depending on the mode
var DEFAULTS = { var DEFAULTS = {
'mode': 0, 'mode': 0,
'apps': [] 'apps': []
};
var settings = {};
var loadSettings = function() {
settings = require('Storage').readJSON(FILE, 1) || DEFAULTS;
}
var saveSettings = function(settings) {
require('Storage').write(FILE, settings);
}
// Get all app info files
var getApps = function() {
var apps = require('Storage').list(/\.info$/).map(appInfoFileName => {
var appInfo = require('Storage').readJSON(appInfoFileName, 1);
return appInfo && {
'name': appInfo.name,
'sortorder': appInfo.sortorder,
'src': appInfo.src
};
}).filter(app => app && !!app.src);
apps.sort((a, b) => {
var n = (0 | a.sortorder) - (0 | b.sortorder);
if (n) return n; // do sortorder first
if (a.name < b.name) return -1;
if (a.name > b.name) return 1;
return 0;
});
return apps;
}
var showMenu = function() {
var menu = {
'': { 'title': 'Backswipe' },
'< Back': () => {
back();
},
'Mode': {
value: settings.mode,
min: 0,
max: 3,
format: v => ["Blacklist", "Whitelist", "Always On", "Disabled"][v],
onchange: v => {
settings.mode = v;
saveSettings(settings);
},
},
'App List': () => {
showAppSubMenu();
}
}; };
var settings = {}; E.showMenu(menu);
}
var loadSettings = function() { var showAppSubMenu = function() {
settings = require('Storage').readJSON(FILE, 1) || DEFAULTS; var menu = {
} '': { 'title': 'Backswipe' },
'< Back': () => {
showMenu();
},
'Add App': () => {
showAppList();
}
};
settings.apps.forEach(app => {
menu[app.name] = () => {
settings.apps.splice(settings.apps.indexOf(app), 1);
saveSettings(settings);
showAppSubMenu();
}
});
E.showMenu(menu);
}
var saveSettings = function(settings) { var showAppList = function() {
require('Storage').write(FILE, settings); var apps = getApps();
} var menu = {
'': { 'title': 'Backswipe' },
'< Back': () => {
showMenu();
}
};
apps.forEach(app => {
menu[app.name] = () => {
settings.apps.push(app);
saveSettings(settings);
showAppSubMenu();
}
});
E.showMenu(menu);
}
// Get all app info files loadSettings();
var getApps = function() { showMenu();
var apps = require('Storage').list(/\.info$/).map(appInfoFileName => {
var appInfo = require('Storage').readJSON(appInfoFileName, 1);
return appInfo && {
'name': appInfo.name,
'sortorder': appInfo.sortorder,
'src': appInfo.src
};
}).filter(app => app && !!app.src);
apps.sort((a, b) => {
var n = (0 | a.sortorder) - (0 | b.sortorder);
if (n) return n; // do sortorder first
if (a.name < b.name) return -1;
if (a.name > b.name) return 1;
return 0;
});
return apps;
}
var showMenu = function() {
var menu = {
'': { 'title': 'Backswipe' },
'< Back': () => {
back();
},
'Mode': {
value: settings.mode,
min: 0,
max: 3,
format: v => ["Blacklist", "Whitelist", "Always On", "Disabled"][v],
onchange: v => {
settings.mode = v;
saveSettings(settings);
},
},
'App List': () => {
showAppSubMenu();
}
};
E.showMenu(menu);
}
var showAppSubMenu = function() {
var menu = {
'': { 'title': 'Backswipe' },
'< Back': () => {
showMenu();
},
'Add App': () => {
showAppList();
}
};
settings.apps.forEach(app => {
menu[app.name] = () => {
settings.apps.splice(settings.apps.indexOf(app), 1);
saveSettings(settings);
showAppSubMenu();
}
});
E.showMenu(menu);
}
var showAppList = function() {
var apps = getApps();
var menu = {
'': { 'title': 'Backswipe' },
'< Back': () => {
showMenu();
}
};
apps.forEach(app => {
menu[app.name] = () => {
settings.apps.push(app);
saveSettings(settings);
showAppSubMenu();
}
});
E.showMenu(menu);
}
loadSettings();
showMenu();
}) })