diff --git a/index.js b/index.js
index a23f4ea..99006b6 100644
--- a/index.js
+++ b/index.js
@@ -29,7 +29,7 @@ let bodyParser = require('body-parser');
let morgan = require('morgan');
let TaskManager = require('./libs/taskManager');
let Task = require('./libs/Task');
-let odmOptionsParser = require('./libs/odmOptionsParser');
+let odmOptions = require('./libs/odmOptions');
app.use(morgan('tiny'));
app.use(bodyParser.urlencoded({extended: true}));
@@ -59,8 +59,18 @@ let upload = multer({
app.post('/task/new', addRequestId, upload.array('images'), (req, res) => {
if (req.files.length === 0) res.json({error: "Need at least 1 file."});
else{
- // Move to data
async.series([
+ cb => {
+ odmOptions.filterOptions(req.body.options, (err, options) => {
+ if (err) cb(err);
+ else{
+ req.body.options = options;
+ cb(null);
+ }
+ });
+ },
+
+ // Move uploads to data dir
cb => {
fs.stat(`data/${req.id}`, (err, stat) => {
if (err && err.code === 'ENOENT') cb();
@@ -70,19 +80,21 @@ app.post('/task/new', addRequestId, upload.array('images'), (req, res) => {
cb => { fs.mkdir(`data/${req.id}`, undefined, cb); },
cb => {
fs.rename(`tmp/${req.id}`, `data/${req.id}/images`, err => {
- if (!err){
- new Task(req.id, req.body.name, (err, task) => {
- if (err) cb(err);
- else{
- taskManager.addNew(task);
- res.json({uuid: req.id, success: true});
- cb();
- }
- });
- }else{
- cb(new Error("Could not move images folder."))
- }
+ if (!err) cb();
+ else cb(new Error("Could not move images folder."))
});
+ },
+
+ // Create task
+ cb => {
+ new Task(req.id, req.body.name, (err, task) => {
+ if (err) cb(err);
+ else{
+ taskManager.addNew(task);
+ res.json({uuid: req.id, success: true});
+ cb();
+ }
+ }, req.body.options);
}
], err => {
if (err) res.json({error: err.message})
@@ -139,7 +151,7 @@ app.post('/task/restart', uuidCheck, (req, res) => {
});
app.get('/getOptions', (req, res) => {
- odmOptionsParser.getOptions((err, options) => {
+ odmOptions.getOptions((err, options) => {
if (err) res.json({error: err.message});
else res.json(options);
});
@@ -147,7 +159,7 @@ app.get('/getOptions', (req, res) => {
let gracefulShutdown = done => {
async.series([
- cb => { taskManager.dumpTaskList(cb) },
+ cb => { taskManager.dumpTaskList(cb); },
cb => {
console.log("Closing server");
server.close();
diff --git a/libs/Task.js b/libs/Task.js
index ff5c077..40f0f99 100644
--- a/libs/Task.js
+++ b/libs/Task.js
@@ -25,7 +25,7 @@ let archiver = require('archiver');
let statusCodes = require('./statusCodes');
module.exports = class Task{
- constructor(uuid, name, done){
+ constructor(uuid, name, done, options = []){
assert(uuid !== undefined, "uuid must be set");
assert(done !== undefined, "ready must be set");
@@ -34,10 +34,12 @@ module.exports = class Task{
this.dateCreated = new Date().getTime();
this.processingTime = -1;
this.setStatus(statusCodes.QUEUED);
- this.options = {};
+ this.options = options;
this.output = [];
this.runnerProcess = null;
+ this.options.forEach(option => { console.log(option); });
+
// Read images info
fs.readdir(this.getImagesFolderPath(), (err, files) => {
if (err) done(err);
@@ -64,7 +66,7 @@ module.exports = class Task{
}
done(null, task);
}
- })
+ }, taskJson.options);
}
// Get path where images are stored for this task
diff --git a/libs/odmOptionsParser.js b/libs/odmOptions.js
similarity index 75%
rename from libs/odmOptionsParser.js
rename to libs/odmOptions.js
index 8066cfa..5610f29 100644
--- a/libs/odmOptionsParser.js
+++ b/libs/odmOptions.js
@@ -32,8 +32,12 @@ module.exports = {
else{
options = {};
for (let option in json){
- if (["-h", "--project-path", "--zip-results"].indexOf(option) !== -1) continue;
-
+ // Not all options are useful to the end user
+ // (num cores can be set programmatically, so can gcpFile, etc.)
+ if (["-h", "--project-path",
+ "--zip-results", "--pmvs-num-cores", "--odm_georeferencing-useGcp",
+ "--start-with", "--odm_georeferencing-gcpFile", "--end-with"].indexOf(option) !== -1) continue;
+
let values = json[option];
option = option.replace(/^--/, "");
@@ -83,5 +87,21 @@ module.exports = {
done(null, options);
}
});
+ },
+
+ // Checks that the options (as received from the rest endpoint)
+ // Are valid and within proper ranges.
+ // The result of filtering is passed back via callback
+ // @param options[]
+ filterOptions: function(options, done){
+ try{
+ if (typeof options === "string") options = JSON.parse(options);
+
+ // TODO: range checks, filtering
+
+ done(null, options);
+ }catch(e){
+ done(e);
+ }
}
};
diff --git a/public/css/main.css b/public/css/main.css
index 64b802a..0da13d7 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -59,4 +59,8 @@
.selectric-items li{
background: #fff;
+}
+
+#options .checkbox{
+ margin-right: 143px;
}
\ No newline at end of file
diff --git a/public/css/selectric.css b/public/css/selectric.css
deleted file mode 100644
index 8508f16..0000000
--- a/public/css/selectric.css
+++ /dev/null
@@ -1,198 +0,0 @@
-/*======================================
- Selectric v1.10.1
-======================================*/
-
-.selectric-wrapper {
- position: relative;
- cursor: pointer;
-}
-
-.selectric-responsive {
- width: 100%;
-}
-
-.selectric {
- border: 1px solid #DDD;
- background: #F8F8F8;
- position: relative;
-}
-.selectric .label {
- display: block;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- margin: 0 38px 0 10px;
- font-size: 12px;
- line-height: 38px;
- color: #444;
- height: 38px;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-.selectric .button {
- display: block;
- position: absolute;
- right: 0;
- top: 0;
- width: 38px;
- height: 38px;
- color: #BBB;
- text-align: center;
- font: 0/0 a;
- *font: 20px/38px Lucida Sans Unicode, Arial Unicode MS, Arial;
-}
-.selectric .button:after {
- content: " ";
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- margin: auto;
- width: 0;
- height: 0;
- border: 4px solid transparent;
- border-top-color: #BBB;
- border-bottom: none;
-}
-
-.selectric-focus .selectric {
- border-color: #AAA;
-}
-
-.selectric-hover .selectric {
- border-color: #C4C4C4;
-}
-.selectric-hover .selectric .button {
- color: #A2A2A2;
-}
-.selectric-hover .selectric .button:after {
- border-top-color: #A2A2A2;
-}
-
-.selectric-open {
- z-index: 9999;
-}
-.selectric-open .selectric {
- border-color: #C4C4C4;
-}
-.selectric-open .selectric-items {
- display: block;
-}
-
-.selectric-disabled {
- filter: alpha(opacity=50);
- opacity: 0.5;
- cursor: default;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-
-.selectric-hide-select {
- position: relative;
- overflow: hidden;
- width: 0;
- height: 0;
-}
-.selectric-hide-select select {
- position: absolute;
- left: -100%;
- display: none;
-}
-
-.selectric-input {
- position: absolute !important;
- top: 0 !important;
- left: 0 !important;
- overflow: hidden !important;
- clip: rect(0, 0, 0, 0) !important;
- margin: 0 !important;
- padding: 0 !important;
- width: 1px !important;
- height: 1px !important;
- outline: none !important;
- border: none !important;
- *font: 0/0 a !important;
- background: none !important;
-}
-
-.selectric-temp-show {
- position: absolute !important;
- visibility: hidden !important;
- display: block !important;
-}
-
-/* Items box */
-.selectric-items {
- display: none;
- position: absolute;
- top: 100%;
- left: 0;
- background: #F8F8F8;
- border: 1px solid #C4C4C4;
- z-index: -1;
- box-shadow: 0 0 10px -6px;
-}
-.selectric-items .selectric-scroll {
- height: 100%;
- overflow: auto;
-}
-.selectric-above .selectric-items {
- top: auto;
- bottom: 100%;
-}
-.selectric-items ul, .selectric-items li {
- list-style: none;
- padding: 0;
- margin: 0;
- font-size: 12px;
- line-height: 20px;
- min-height: 20px;
-}
-.selectric-items li {
- display: block;
- padding: 10px;
- color: #666;
- cursor: pointer;
-}
-.selectric-items li.selected {
- background: #E0E0E0;
- color: #444;
-}
-.selectric-items li:hover {
- background: #D5D5D5;
- color: #444;
-}
-.selectric-items .disabled {
- filter: alpha(opacity=50);
- opacity: 0.5;
- cursor: default !important;
- background: none !important;
- color: #666 !important;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-.selectric-items .selectric-group .selectric-group-label {
- font-weight: bold;
- padding-left: 10px;
- cursor: default;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- background: none;
- color: #444;
-}
-.selectric-items .selectric-group.disabled li {
- filter: alpha(opacity=100);
- opacity: 1;
-}
-.selectric-items .selectric-group li {
- padding-left: 25px;
-}
diff --git a/public/index.html b/public/index.html
index 55e59c8..d830827 100644
--- a/public/index.html
+++ b/public/index.html
@@ -15,8 +15,6 @@
}
-
-
@@ -42,22 +40,40 @@
Current Tasks ()
@@ -118,7 +134,6 @@
-
diff --git a/public/js/jquery.selectric.js b/public/js/jquery.selectric.js
deleted file mode 100644
index fbde720..0000000
--- a/public/js/jquery.selectric.js
+++ /dev/null
@@ -1,911 +0,0 @@
-/*!
- * ,/
- * ,'/
- * ,' /
- * ,' /_____,
- * .'____ ,'
- * / ,'
- * / ,'
- * /,'
- * /'
- *
- * Selectric ϟ v1.10.1 (Jun 30 2016) - http://lcdsantos.github.io/jQuery-Selectric/
- *
- * Copyright (c) 2016 Leonardo Santos; MIT License
- *
- */
-
-(function(factory) {
- /* global define */
- /* istanbul ignore next */
- if ( typeof define === 'function' && define.amd ) {
- define(['jquery'], factory);
- } else if ( typeof module === 'object' && module.exports ) {
- // Node/CommonJS
- module.exports = function( root, jQuery ) {
- if ( jQuery === undefined ) {
- if ( typeof window !== 'undefined' ) {
- jQuery = require('jquery');
- } else {
- jQuery = require('jquery')(root);
- }
- }
- factory(jQuery);
- return jQuery;
- };
- } else {
- // Browser globals
- factory(jQuery);
- }
-}(function($) {
- 'use strict';
-
- var $doc = $(document);
- var $win = $(window);
-
- var pluginName = 'selectric';
- var classList = 'Input Items Open Disabled TempShow HideSelect Wrapper Focus Hover Responsive Above Scroll Group GroupLabel';
- var bindSufix = '.sl';
-
- var chars = ['a', 'e', 'i', 'o', 'u', 'n', 'c', 'y'];
- var diacritics = [
- /[\xE0-\xE5]/g, // a
- /[\xE8-\xEB]/g, // e
- /[\xEC-\xEF]/g, // i
- /[\xF2-\xF6]/g, // o
- /[\xF9-\xFC]/g, // u
- /[\xF1]/g, // n
- /[\xE7]/g, // c
- /[\xFD-\xFF]/g // y
- ];
-
- /**
- * Create an instance of Selectric
- *
- * @constructor
- * @param {Node} element - The <select> element
- * @param {object} opts - Options
- */
- var Selectric = function(element, opts) {
- var _this = this;
-
- _this.element = element;
- _this.$element = $(element);
-
- _this.state = {
- enabled : false,
- opened : false,
- currValue : -1,
- selectedIdx : -1
- };
-
- _this.eventTriggers = {
- open : _this.open,
- close : _this.close,
- destroy : _this.destroy,
- refresh : _this.refresh,
- init : _this.init
- };
-
- _this.init(opts);
- };
-
- Selectric.prototype = {
- utils: {
- /**
- * Detect mobile browser
- *
- * @return {boolean}
- */
- isMobile: function() {
- return /android|ip(hone|od|ad)/i.test(navigator.userAgent);
- },
-
- /**
- * Escape especial characters in string (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)
- *
- * @param {string} str - The string to be escaped
- * @return {string} The string with the special characters escaped
- */
- escapeRegExp: function(str) {
- return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
- },
-
- /**
- * Replace diacritics
- *
- * @param {string} str - The string to replace the diacritics
- * @return {string} The string with diacritics replaced with ascii characters
- */
- replaceDiacritics: function(str) {
- var k = diacritics.length;
-
- while (k--) {
- str = str.toLowerCase().replace(diacritics[k], chars[k]);
- }
-
- return str;
- },
-
- /**
- * Format string
- * https://gist.github.com/atesgoral/984375
- *
- * @param {string} f - String to be formated
- * @return {string} String formated
- */
- format: function (f) {
- var a = arguments; // store outer arguments
- return ('' + f) // force format specifier to String
- .replace( // replace tokens in format specifier
- /\{(?:(\d+)|(\w+))\}/g, // match {token} references
- function (
- s, // the matched string (ignored)
- i, // an argument index
- p // a property name
- ) {
- return p && a[1] // if property name and first argument exist
- ? a[1][p] // return property from first argument
- : a[i]; // assume argument index and return i-th argument
- });
- },
-
- /**
- * Get the next enabled item in the options list.
- *
- * @param {object} selectItems - The options object.
- * @param {number} selected - Index of the currently selected option.
- * @return {object} The next enabled item.
- */
- nextEnabledItem: function(selectItems, selected) {
- while ( selectItems[ selected = (selected + 1) % selectItems.length ].disabled ) {
- // empty
- }
- return selected;
- },
-
- /**
- * Get the previous enabled item in the options list.
- *
- * @param {object} selectItems - The options object.
- * @param {number} selected - Index of the currently selected option.
- * @return {object} The previous enabled item.
- */
- previousEnabledItem: function(selectItems, selected) {
- while ( selectItems[ selected = (selected > 0 ? selected : selectItems.length) - 1 ].disabled ) {
- // empty
- }
- return selected;
- },
-
- /**
- * Transform camelCase string to dash-case.
- *
- * @param {string} str - The camelCased string.
- * @return {string} The string transformed to dash-case.
- */
- toDash: function(str) {
- return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
- },
-
- /**
- * Calls the events and hooks registered with function name.
- *
- * @param {string} fn - The name of the function.
- * @param {number} scope - Scope that should be set on the function.
- */
- triggerCallback: function(fn, scope) {
- var elm = scope.element;
- var func = scope.options['on' + fn];
-
- if ( $.isFunction(func) ) {
- func.call(elm, elm, scope);
- }
-
- if ( $.fn[pluginName].hooks[fn] ) {
- $.each($.fn[pluginName].hooks[fn], function() {
- this.call(elm, elm, scope);
- });
- }
-
- $(elm).trigger(pluginName + '-' + this.toDash(fn), scope);
- }
- },
-
- /** Initializes */
- init: function(opts) {
- var _this = this;
-
- // Set options
- _this.options = $.extend(true, {}, $.fn[pluginName].defaults, _this.options, opts);
-
- _this.utils.triggerCallback('BeforeInit', _this);
-
- // Preserve data
- _this.destroy(true);
-
- // Disable on mobile browsers
- if ( _this.options.disableOnMobile && _this.utils.isMobile() ) {
- _this.disableOnMobile = true;
- return;
- }
-
- // Get classes
- _this.classes = _this.getClassNames();
-
- // Create elements
- var input = $('