From d2fdd2fe10dffd188265bc0b0fa319766d15bddf Mon Sep 17 00:00:00 2001
From: Patrik Braun <bra.patrik@gmail.com>
Date: Tue, 25 Jul 2017 16:14:35 +0200
Subject: [PATCH] optimizing module loading

---
 backend/index.ts                            |  5 +--
 backend/model/sql/enitites/PhotoEntity.ts   | 43 +++++++++++----------
 backend/model/threading/DiskMangerWorker.ts |  6 +--
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/backend/index.ts b/backend/index.ts
index c1e374e0..1a8a1227 100644
--- a/backend/index.ts
+++ b/backend/index.ts
@@ -1,10 +1,9 @@
 import * as cluster from "cluster";
-import {Worker} from "./model/threading/Worker";
-import {Server} from "./server";
-
 
 if (cluster.isMaster) {
+  const Server = require("./server").Server;
   new Server();
 } else {
+  const Worker = require("./model/threading/Worker").Worker;
   Worker.process();
 }
diff --git a/backend/model/sql/enitites/PhotoEntity.ts b/backend/model/sql/enitites/PhotoEntity.ts
index 6acb0eee..eadd4554 100644
--- a/backend/model/sql/enitites/PhotoEntity.ts
+++ b/backend/model/sql/enitites/PhotoEntity.ts
@@ -9,27 +9,6 @@ import {
 } from "../../../../common/entities/PhotoDTO";
 import {DirectoryEntity} from "./DirectoryEntity";
 
-@Entity()
-export class PhotoEntity implements PhotoDTO {
-
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column("string")
-  name: string;
-
-  @ManyToOne(type => DirectoryEntity, directory => directory.photos, {onDelete: "CASCADE"})
-  directory: DirectoryDTO;
-
-  @Embedded(type => PhotoMetadataEntity)
-  metadata: PhotoMetadataEntity;
-
-  readyThumbnails: Array<number> = [];
-
-  readyIcon: boolean = false;
-
-}
-
 
 @EmbeddableEntity()
 export class PhotoMetadataEntity implements PhotoMetadata {
@@ -69,6 +48,28 @@ export class PhotoMetadataEntity implements PhotoMetadata {
   }
 }
 
+@Entity()
+export class PhotoEntity implements PhotoDTO {
+
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column("string")
+  name: string;
+
+  @ManyToOne(type => DirectoryEntity, directory => directory.photos, {onDelete: "CASCADE"})
+  directory: DirectoryDTO;
+
+  @Embedded(type => PhotoMetadataEntity)
+  metadata: PhotoMetadataEntity;
+
+  readyThumbnails: Array<number> = [];
+
+  readyIcon: boolean = false;
+
+}
+
+
 /*
  @EmbeddableTable()
  export class CameraMetadataEntity implements CameraMetadata {
diff --git a/backend/model/threading/DiskMangerWorker.ts b/backend/model/threading/DiskMangerWorker.ts
index 25d342cc..b94239a2 100644
--- a/backend/model/threading/DiskMangerWorker.ts
+++ b/backend/model/threading/DiskMangerWorker.ts
@@ -1,8 +1,8 @@
+import * as fs from "fs";
+import * as path from "path";
 import {DirectoryDTO} from "../../../common/entities/DirectoryDTO";
 import {CameraMetadata, GPSMetadata, ImageSize, PhotoDTO, PhotoMetadata} from "../../../common/entities/PhotoDTO";
 import {Logger} from "../../Logger";
-import * as fs from "fs";
-import * as path from "path";
 import {IptcParser} from "ts-node-iptc";
 import {ExifParserFactory} from "ts-exif-parser";
 import {ProjectPath} from "../../ProjectPath";
@@ -85,7 +85,7 @@ export class DiskMangerWorker {
 
   private static loadPhotoMetadata(fullPath: string): Promise<PhotoMetadata> {
     return new Promise<PhotoMetadata>((resolve, reject) => {
-      fs.readFile(fullPath, (err, data) => {
+        fs.readFile(fullPath, (err, data) => {
           if (err) {
             return reject({file: fullPath, error: err});
           }