From 4ec5af5977a5f02a9cb506035a491b090dc6ccff Mon Sep 17 00:00:00 2001
From: rozetko <rozetko09@gmail.com>
Date: Mon, 28 May 2018 13:39:05 +0300
Subject: [PATCH] Fix paths

---
 analytics/config.py         | 5 ++---
 server/src/config.ts        | 1 -
 server/src/services/data.ts | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/analytics/config.py b/analytics/config.py
index d713458..602c714 100644
--- a/analytics/config.py
+++ b/analytics/config.py
@@ -1,8 +1,7 @@
 import os
 
-DATA_FOLDER = '../../data'
-DATASOURCE_FOLDER = os.path.join(DATA_FOLDER, "datasources/")
+DATA_FOLDER = '../data'
 DATASET_FOLDER = os.path.join(DATA_FOLDER, "datasets/")
 ANOMALIES_FOLDER = os.path.join(DATA_FOLDER, "anomalies/")
 MODELS_FOLDER = os.path.join(DATA_FOLDER, "models/")
-METRICS_FOLDER = os.path.join(DATA_FOLDER, "metrics/")
\ No newline at end of file
+METRICS_FOLDER = os.path.join(DATA_FOLDER, "metrics/")
diff --git a/server/src/config.ts b/server/src/config.ts
index ee4d3d4..0b3678c 100644
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -4,7 +4,6 @@ export const ANALYTICS_PATH = path.join(__dirname, '../../analytics');
 
 export const DATA_PATH = path.join(__dirname, '../../data');
 
-export const DATASOURCES_PATH = path.join(DATA_PATH, 'datasources');
 export const DATASETS_PATH = path.join(DATA_PATH, 'datasets');
 export const ANOMALIES_PATH = path.join(DATA_PATH, 'anomalies');
 export const MODELS_PATH = path.join(DATA_PATH, 'models');
diff --git a/server/src/services/data.ts b/server/src/services/data.ts
index 212820d..e7744b2 100644
--- a/server/src/services/data.ts
+++ b/server/src/services/data.ts
@@ -5,7 +5,7 @@ import * as fs from 'fs';
 // see analytics/pattern_detection_model.py with folders available
 
 function maybeCreate(path: string): void {
-  if(fs.existsSync(config.DATA_PATH)) {
+  if(fs.existsSync(path)) {
     return;
   }
   fs.mkdirSync(path);
@@ -14,11 +14,10 @@ function maybeCreate(path: string): void {
 export function checkDataFolders(): void {
   var folders = [
     config.DATA_PATH,
-    config.DATASOURCES_PATH,
     config.DATASETS_PATH,
     config.ANOMALIES_PATH,
     config.MODELS_PATH,
     config.METRICS_PATH,
     config.SEGMENTS_PATH
   ].forEach(maybeCreate);
-}
\ No newline at end of file
+}