Skip to content
Snippets Groups Projects
Commit c78f0e30 authored by LHOUTELLIER Maël's avatar LHOUTELLIER Maël
Browse files

Working api from electron

parent 0dca2b5e
Branches
No related tags found
No related merge requests found
{
"name": "skypatterns",
"version": "0.2.1",
"version": "0.7.5",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
......
This diff is collapsed.
{
"name": "api-skypattern",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"start": "node index.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Alexis, Maël, Géraud",
"license": "MIT",
"dependencies": {
"cors": "^2.8.5",
"express": "^4.17.1"
}
}
......@@ -3,7 +3,7 @@ const datasets = function (app, fs) {
const pathDatasets = __dirname + '/../datasets/'
const dataExtention = 'dat'
const noClassesPath = './config/noclasses.json'
const noClassesPath = __dirname + '/../config/noclasses.json'
app.get('/datasets', (req, res) => {
fs.readdir(pathDatasets, (err, files) => {
......
const launcher = function (app, fs) {
const path = require('path')
const file = require('./file.js')
const pathJar = __dirname + '/../'
const update_status = function (name, status) {
file.readFile(fs, function (data) {
......@@ -102,7 +102,8 @@ const launcher = function (app, fs) {
const minimum_frequency = function (value, name) {
// TODO => transformer le % en valeur absolue
fileBuffer = fs.readFileSync(`./datasets/${name}.dat`)
fileBuffer = fs.readFileSync(path.join(path.dirname(__dirname), 'datasets', `${name}.dat`))
split_lines = fileBuffer.toString().split('\n')
const count = split_lines.length - 1
return Math.round(count * (value / 100))
......@@ -121,7 +122,8 @@ const launcher = function (app, fs) {
try {
if ('path' in body) {
name = body['path']
source = `-d datasets/${body['path']}.dat`
const datasetPath = path.join(path.dirname(__dirname), 'datasets', `${name}.dat`)
source = `-d ${datasetPath}`
}
if ('command' in body) {
......@@ -205,16 +207,17 @@ const launcher = function (app, fs) {
}
}
// `java -jar ${pathJar}skypattern.jar`
const pathResults = path.join(path.dirname(__dirname), 'results', `${name}.json`)
const Pathjar = path.join(path.dirname(__dirname), 'skypattern.jar')
// name += `_${parameters.join('_')}`.replace(/\s-/g, '') // remove whitespaces
parameters = [command, source, `--sp`, `--json results/${name}.json`, ...parameters]
parameters = [command, source, `--sp`, `--json ${pathResults}`, ...parameters]
console.log(`java -jar ${pathJar}skypattern.jar ${parameters.join(' ')}`)
const full_command = `java -jar ${Pathjar} ${parameters.join(' ')}`
console.log(full_command)
console.log(parameters)
update_status(name, 'ONGOING')
exec(`java -jar ${pathJar}skypattern.jar ${parameters.join(' ')}`, [], function (error, stdout, stderr) {
exec(full_command, [], function (error, stdout, stderr) {
if (error) {
console.error(stderr)
update_status(name, 'STOPPED')
......
......@@ -90,7 +90,7 @@ const results = function (app, fs) {
res.json(returnedJSON)
},
true,
'results/' + id + '.json',
__dirname + '/../results/' + id + '.json',
)
})
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment