self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2025-12-03 23:00:25 +02:00
Code Issues Releases Activity

improving diagnostics

Browse Source
This commit is contained in:
Braun Patrik
2017-07-14 22:56:25 +02:00
parent be74b854b7
commit 1d63cfaca4
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/ProjectPath.ts
View File

@@ -15,10 +15,14 @@ class ProjectPathClass {
return path.join(pathStr, path.sep); return path.join(pathStr, path.sep);
} }
getAbsolutePath(pathStr: string): string {
return this.isAbsolutePath(pathStr) ? pathStr : path.join(this.Root, pathStr);
}
constructor() { constructor() {
this.Root = path.join(__dirname, "/../"); this.Root = path.join(__dirname, "/../");
this.ImageFolder = this.isAbsolutePath(Config.Server.imagesFolder) ? Config.Server.imagesFolder : path.join(this.Root, Config.Server.imagesFolder); this.ImageFolder = this.getAbsolutePath(Config.Server.imagesFolder);
this.ThumbnailFolder = this.isAbsolutePath(Config.Server.thumbnail.folder) ? Config.Server.thumbnail.folder : path.join(this.Root, Config.Server.thumbnail.folder); this.ThumbnailFolder = this.getAbsolutePath(Config.Server.thumbnail.folder);
this.FrontendFolder = path.join(this.Root, 'dist') this.FrontendFolder = path.join(this.Root, 'dist')
} }
} }

2
backend/model/ConfigDiagnostics.ts
View File

@@ -43,6 +43,7 @@ export class ConfigDiagnostics {
static async testThumbnailFolder(folder: string) { static async testThumbnailFolder(folder: string) {
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
folder = ProjectPath.getAbsolutePath(folder);
if (!fs.existsSync(folder)) { if (!fs.existsSync(folder)) {
reject("Thumbnail folder not exists: '" + folder + "'"); reject("Thumbnail folder not exists: '" + folder + "'");
} }
@@ -57,6 +58,7 @@ export class ConfigDiagnostics {
static async testImageFolder(folder: string) { static async testImageFolder(folder: string) {
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
folder = ProjectPath.getAbsolutePath(folder);
if (!fs.existsSync(folder)) { if (!fs.existsSync(folder)) {
reject("Images folder not exists: '" + folder + "'"); reject("Images folder not exists: '" + folder + "'");
} }