From 1d63cfaca40a309ca3dc8322edfb38c05ab422ec Mon Sep 17 00:00:00 2001
From: Braun Patrik <braun.patrik@aut.bme.hu>
Date: Fri, 14 Jul 2017 22:56:25 +0200
Subject: [PATCH] improving diagnostics

---
 backend/ProjectPath.ts             | 8 ++++++--
 backend/model/ConfigDiagnostics.ts | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backend/ProjectPath.ts b/backend/ProjectPath.ts
index 9e78fa9..61611a1 100644
--- a/backend/ProjectPath.ts
+++ b/backend/ProjectPath.ts
@@ -15,10 +15,14 @@ class ProjectPathClass {
     return path.join(pathStr, path.sep);
   }
 
+  getAbsolutePath(pathStr: string): string {
+    return this.isAbsolutePath(pathStr) ? pathStr : path.join(this.Root, pathStr);
+  }
+
   constructor() {
     this.Root = path.join(__dirname, "/../");
-    this.ImageFolder = this.isAbsolutePath(Config.Server.imagesFolder) ? Config.Server.imagesFolder : path.join(this.Root, Config.Server.imagesFolder);
-    this.ThumbnailFolder = this.isAbsolutePath(Config.Server.thumbnail.folder) ? Config.Server.thumbnail.folder : path.join(this.Root, Config.Server.thumbnail.folder);
+    this.ImageFolder = this.getAbsolutePath(Config.Server.imagesFolder);
+    this.ThumbnailFolder = this.getAbsolutePath(Config.Server.thumbnail.folder);
     this.FrontendFolder = path.join(this.Root, 'dist')
   }
 }
diff --git a/backend/model/ConfigDiagnostics.ts b/backend/model/ConfigDiagnostics.ts
index a4935dc..dcce1cd 100644
--- a/backend/model/ConfigDiagnostics.ts
+++ b/backend/model/ConfigDiagnostics.ts
@@ -43,6 +43,7 @@ export class ConfigDiagnostics {
 
   static async testThumbnailFolder(folder: string) {
     await new Promise((resolve, reject) => {
+      folder = ProjectPath.getAbsolutePath(folder);
       if (!fs.existsSync(folder)) {
         reject("Thumbnail folder not exists: '" + folder + "'");
       }
@@ -57,6 +58,7 @@ export class ConfigDiagnostics {
 
   static async testImageFolder(folder: string) {
     await new Promise((resolve, reject) => {
+      folder = ProjectPath.getAbsolutePath(folder);
       if (!fs.existsSync(folder)) {
         reject("Images folder not exists: '" + folder + "'");
       }