refactoring notModified directory property

.travis.yml

@@ -3,27 +3,7 @@ node_js:
 - '7'
 - '6'
 
-before_deploy:
-- npm i gulp -g
-- gulp build-release
-
 deploy:
-  provider: npm
-  email: bra.patrik@gmail.com
-  api_key:
-    secure: bMv+DrQgqKtx3RNsHqZUOl9L3Bp/i/MSZ52ix8rWXfl1QYFzo7nCnFdHxeq67qCCApdsBrPnOqRsnR5IjLSJGiKwyOxlXNCawLJRKJ+EoM8IAolrZP0zg5DhyifZJ40M0QS8fCetDqKVSO6S52rs4I0nc5whFZ6E9j4EfmkBRoGyPGoTPmGCJdK6JrlN7oftCVm18r7kt7lXcr1EvBqDloJC+M4BukQc4v0iAY/psMEgExvvroCwweQEhumWma7DO1hdiixRh8Pclz+VUQwAggVdP1yZGabqnX80/G+KrmpbNrAGIUdgzMHGG5HkiMrxPUU6LAcDQ+IzZ08u3MzVy//ij4zcom7C99oy5/AL4oWh6tZQtefji9MlOOX4SJNikmsfD2D9skHeGwbFuqEPjrjpUPWtUhW9RS5kr5Dt/LJwMs3ADi9nEsAYAkTip1nH9Ts1Yw+ooy3lCfzuMJGMBzZ6vNlMoAGNyTkrjIkGDL76XuBYvn0X3e3USn+KuKF9qO+N6wCw8zTxI2aetx+z6/5gGiiAHPKkFGGz+2jkl+2ZO4DcOX1lR6AgrHwT/52bQF3UQVT02mUohqfUnpn6rSpYkvh+u3e3GE59sqAPcRleEKdkp68KFSFDstzwF/m7uoAjOIHSfKUjN22s7FP818BulikEhHiCknMJsnOYUZ4=
-  on:
-    tags: true
-    repo: bpatrik/pigallery2
-
-  provider: releases
-  api_key:
-    secure: NrgDMoHY4j9r4Ht9oPT6cYiGkcpbNsvR6DxEk51kD5qVRPtUq+V5gpIo0tSwIFfPzgY+5hsqK6Onl2AdSsaotHB8PT2CoZ9oZPJO8BlZFvD7iT83Qi49QcsMo6jjmgqByg6EwzhHLeAiMfYrNSqw1gT0tEONc9Ygq5deFolYSqf6yfplBkcT0HEFSncnDhn5i+s4SS/wOy/UppXJxKk9DE0GaRwaIuBC/aSAtDfoFUuxVwjahTiTb8YuqwguzoZA5lYC/EcoCxbSyb5y58XrsMB13AZmH271NlbSTYmo3c4+HGO4BkcIB/WATw9VcI1NU/huTgSNZnVzAalbtF9oWKG+IKyfa9gMbe6fj07CvB7KwCkaeJmToi5Hw3Eiw0+ioadEzD3KXRr0dchUjlYuYnmZEUxSAVW9jD+tJSdCxQKyna3PxtIcD7QvRlu8/ZXurcerZXVib5FbwmoXUzLZvbMeyaFHEMbawepp5xups/YYqp+I6H0SUqbMcNIAntENb/0doteXKwdOgsSUkdtMVoEM0p6PhFngFJLFPYAdq0yZiC8WQNwHNTBHcSME3CrIWk1sjrDjN8WylFTPljy7fNm2Rl2UFHvdtGHo5e5YEltHGdlcnSD4ZhXKCn3blR7O87taNUEAjljgjxdridbUrAJ3ooJRVPicVfeslVCM+OQ=
-  file: pigallery2.zip
-  skip_cleanup: true
-  on: 
-    tags: true
-
   provider: heroku
   api_key:
     secure: blREfw45CnFXyS1BJKY8pgQ1ZiMDYV5nLWqVMLUufBiO85CRataJNRzyjkPC1E53AkavXB9HQPAzc6bzFlbZZ21xsrfDxmhjhPcUrAeaOWN9uSj68D5hlGyFJGc6P6hEu4n/UrX4H6F2hW0lWfLcl1Mtc62VMpmn5OjBOFdxhk+KtQaXpHN4j5YTeMeUh3U6HTpSfgg6rrGvmLUp5+zCxFzzMZ8Wp1MnRAf5N4oOW3Wj8ax9JB/c4EljQO4sb2LWZk9iSUYxQcXMTK6KmMhY+tGBrKqLz37ZK1DLp3jmFEcUyy+bUGgajIsFW0dLCPlB0bVKjK2Ry1u7SSZ/zpfDlma/nwQ1vVYLhmxhE+LnXxyfIjWN8IXqa6EcovpDbBe7arQ2mxsYf4WMebteDszMPPCcF2FgKE44Re83fzIVJk3R69D1gBxGzXlarPtV8k11L09ZoCSz9RCDBn2ng1ZOaprKpopp3bBPFD+LRwON9/ZRyRa4YbYkMPWxgj8krYNo50VSRrMz/3xR9py9hgVNnK5H/5QQTcdT0bPQf6lbJn3Q86QTUBxWI12FwKrcr2Nvw/setSACwRucGbbx9hLhrSmjYetsENWba1F2ouBdSpENvpjxETvyE2Z+GRNu4xbuFD9aSttogjJqjTYvRc/RJejvbENIc2/UIqnv/ra0PPY=

backend/middlewares/GalleryMWs.ts

@@ -2,7 +2,7 @@ import * as path from "path";
 import * as fs from "fs";
 import {NextFunction, Request, Response} from "express";
 import {ErrorCodes, ErrorDTO} from "../../common/entities/Error";
-import {DirectoryDTO, NotModifiedDirectoryDTO} from "../../common/entities/DirectoryDTO";
+import {DirectoryDTO} from "../../common/entities/DirectoryDTO";
 import {ObjectManagerRepository} from "../model/ObjectManagerRepository";
 import {SearchTypes} from "../../common/entities/AutoCompleteItem";
 import {ContentWrapper} from "../../common/entities/ConentWrapper";
@@ -28,8 +28,8 @@ export class GalleryMWs {
     try {
 
       const directory = await ObjectManagerRepository.getInstance().GalleryManager.listDirectory(directoryName, req.query.knownLastModified, req.query.knownLastScanned);
-      if ((<NotModifiedDirectoryDTO>directory).notModified == true) {
-        req.resultPipe = new ContentWrapper(directory, null);
+      if (directory == null) {
+        req.resultPipe = new ContentWrapper(null, null, true);
         return next();
       }
       if (req.session.user.permissions &&
@@ -52,7 +52,7 @@ export class GalleryMWs {
       return next();
 
     let cw: ContentWrapper = req.resultPipe;
-    if ((<NotModifiedDirectoryDTO>cw.directory).notModified == true) {
+    if (cw.notModified == true) {
       return next();
     }
     let removeDirs = (dir) => {

backend/middlewares/thumbnail/ThumbnailGeneratorMWs.ts

@@ -6,7 +6,7 @@ import * as os from "os";
 import {NextFunction, Request, Response} from "express";
 import {ErrorCodes, ErrorDTO} from "../../../common/entities/Error";
 import {ContentWrapper} from "../../../common/entities/ConentWrapper";
-import {DirectoryDTO, NotModifiedDirectoryDTO} from "../../../common/entities/DirectoryDTO";
+import {DirectoryDTO} from "../../../common/entities/DirectoryDTO";
 import {ProjectPath} from "../../ProjectPath";
 import {PhotoDTO} from "../../../common/entities/PhotoDTO";
 import {Config} from "../../../common/config/private/Config";
@@ -85,7 +85,7 @@ export class ThumbnailGeneratorMWs {
       return next();
 
     let cw: ContentWrapper = req.resultPipe;
-    if ((<NotModifiedDirectoryDTO>cw.directory).notModified == true) {
+    if (cw.notModified == true) {
       return next();
     }
     if (cw.directory) {

backend/model/interfaces/IGalleryManager.ts

@@ -1,7 +1,7 @@
-import {DirectoryDTO, NotModifiedDirectoryDTO} from "../../../common/entities/DirectoryDTO";
+import {DirectoryDTO} from "../../../common/entities/DirectoryDTO";
 
 export interface IGalleryManager {
   listDirectory(relativeDirectoryName: string,
                 knownLastModified?: number,
-                knownLastScanned?: number): Promise<DirectoryDTO | NotModifiedDirectoryDTO>;
+                knownLastScanned?: number): Promise<DirectoryDTO>;
 }

backend/model/interfaces/ISearchManager.ts

@@ -1,5 +1,6 @@
 import {AutoCompleteItem, SearchTypes} from "../../../common/entities/AutoCompleteItem";
-import {SearchResultDTO} from "../../../common/entities/SearchResult";
+import {SearchResultDTO} from "../../../common/entities/SearchResultDTO";
+
 export interface ISearchManager {
   autocomplete(text: string): Promise<AutoCompleteItem[]>;
   search(text: string, searchType: SearchTypes): Promise<SearchResultDTO>;

backend/model/memory/GalleryManager.ts

@@ -1,4 +1,4 @@
-import {DirectoryDTO, NotModifiedDirectoryDTO} from "../../../common/entities/DirectoryDTO";
+import {DirectoryDTO} from "../../../common/entities/DirectoryDTO";
 import {IGalleryManager} from "../interfaces/IGalleryManager";
 import * as path from "path";
 import * as fs from "fs";
@@ -8,13 +8,13 @@ import {Config} from "../../../common/config/private/Config";
 
 export class GalleryManager implements IGalleryManager {
 
-  public listDirectory(relativeDirectoryName: string, knownLastModified?: number, knownLastScanned?: number): Promise<DirectoryDTO | NotModifiedDirectoryDTO> {
+  public listDirectory(relativeDirectoryName: string, knownLastModified?: number, knownLastScanned?: number): Promise<DirectoryDTO> {
     //If it seems that the content did not changed, do not work on it
     if (knownLastModified && knownLastScanned) {
       const stat = fs.statSync(path.join(ProjectPath.ImageFolder, relativeDirectoryName));
       const lastModified = Math.max(stat.ctime.getTime(), stat.mtime.getTime());
       if (Date.now() - knownLastScanned <= Config.Server.cachedFolderTimeout && lastModified == knownLastModified) {
-        return Promise.resolve(<NotModifiedDirectoryDTO>{notModified: true});
+        return Promise.resolve(null);
       }
     }
     return DiskManager.scanDirectory(relativeDirectoryName);

backend/model/memory/SearchManager.ts

@@ -1,6 +1,6 @@
 import {AutoCompleteItem, SearchTypes} from "../../../common/entities/AutoCompleteItem";
 import {ISearchManager} from "../interfaces/ISearchManager";
-import {SearchResultDTO} from "../../../common/entities/SearchResult";
+import {SearchResultDTO} from "../../../common/entities/SearchResultDTO";
 
 export class SearchManager implements ISearchManager {
   autocomplete(text: string): Promise<AutoCompleteItem[]> {

backend/model/mysql/GalleryManager.ts

@@ -1,5 +1,5 @@
 import {IGalleryManager} from "../interfaces/IGalleryManager";
-import {DirectoryDTO, NotModifiedDirectoryDTO} from "../../../common/entities/DirectoryDTO";
+import {DirectoryDTO} from "../../../common/entities/DirectoryDTO";
 import * as path from "path";
 import * as fs from "fs";
 import {DirectoryEntity} from "./enitites/DirectoryEntity";
@@ -15,7 +15,7 @@ export class GalleryManager implements IGalleryManager {
 
   public async listDirectory(relativeDirectoryName: string,
                              knownLastModified?: number,
-                             knownLastScanned?: number): Promise<DirectoryDTO | NotModifiedDirectoryDTO> {
+                             knownLastScanned?: number): Promise<DirectoryDTO> {
     relativeDirectoryName = path.normalize(path.join("." + path.sep, relativeDirectoryName));
     const directoryName = path.basename(relativeDirectoryName);
     const directoryParent = path.join(path.dirname(relativeDirectoryName), path.sep);
@@ -40,7 +40,7 @@ export class GalleryManager implements IGalleryManager {
         if (Date.now() - knownLastScanned <= Config.Server.cachedFolderTimeout &&
           lastModified == knownLastModified &&
           dir.lastScanned == knownLastScanned) {
-          return Promise.resolve(<NotModifiedDirectoryDTO>{notModified: true});
+          return null;
         }
       }
       if (dir.photos) {

backend/model/mysql/SearchManager.ts

@@ -1,6 +1,6 @@
 import {AutoCompleteItem, SearchTypes} from "../../../common/entities/AutoCompleteItem";
 import {ISearchManager} from "../interfaces/ISearchManager";
-import {SearchResultDTO} from "../../../common/entities/SearchResult";
+import {SearchResultDTO} from "../../../common/entities/SearchResultDTO";
 import {MySQLConnection} from "./MySQLConnection";
 import {PhotoEntity} from "./enitites/PhotoEntity";
 import {DirectoryEntity} from "./enitites/DirectoryEntity";

common/entities/ConentWrapper.ts

@@ -1,14 +1,9 @@
-import {DirectoryDTO, NotModifiedDirectoryDTO} from "./DirectoryDTO";
-import {SearchResultDTO} from "./SearchResult";
+import {DirectoryDTO} from "./DirectoryDTO";
+import {SearchResultDTO} from "./SearchResultDTO";
 
 export class ContentWrapper {
-
-  public directory: DirectoryDTO | NotModifiedDirectoryDTO;
-  public searchResult: SearchResultDTO;
-
-  constructor(directory: DirectoryDTO | NotModifiedDirectoryDTO = null, searchResult: SearchResultDTO = null) {
-    this.directory = directory;
-    this.searchResult = searchResult;
+  constructor(public directory: DirectoryDTO = null,
+              public searchResult: SearchResultDTO = null,
+              public notModified?: boolean) {
   }
-
 }

common/entities/DirectoryDTO.ts

@@ -11,10 +11,6 @@ export interface DirectoryDTO {
   photos: Array<PhotoDTO>;
 }
 
-export interface NotModifiedDirectoryDTO {
-  notModified: boolean;
-}
-
 export module DirectoryDTO {
   export const addReferences = (dir: DirectoryDTO): void => {
     dir.photos.forEach((photo: PhotoDTO) => {

common/entities/SearchResultDTO.ts

@@ -1,6 +1,7 @@
 import {DirectoryDTO} from "./DirectoryDTO";
 import {PhotoDTO} from "./PhotoDTO";
 import {SearchTypes} from "./AutoCompleteItem";
+
 export interface SearchResultDTO {
   searchText: string;
   searchType: SearchTypes;

frontend/app/app.component.ts

@@ -21,8 +21,8 @@ export class AppComponent implements OnInit, OnDestroy {
               private _authenticationService: AuthenticationService,
               private _shareService: ShareService,
               private  _title: Title, vcr: ViewContainerRef,
-              notificatin: NotificationService) {
-    notificatin.setRootViewContainerRef(vcr);
+              notificationService: NotificationService) {
+    notificationService.setRootViewContainerRef(vcr);
   }
 
   async ngOnInit() {

frontend/app/gallery/directory/directory.gallery.component.css

@@ -12,9 +12,9 @@ a {
 .no-image {
 
   color: #7f7f7f;
-  font-size: 50px;
-  top: calc(50% - 25px);
-  left: calc(50% - 25px);
+  font-size: 80px;
+  top: calc(50% - 40px);
+  left: calc(50% - 40px);
 }
 
 .photo {

frontend/app/gallery/directory/directory.gallery.component.html

@@ -4,8 +4,8 @@
 
 
   <div class="photo-container"
-       [style.width.px]="size()"
-       [style.height.px]="size()">
+       [style.width.px]="calcSize()"
+       [style.height.px]="calcSize()">
     <div class="photo" *ngIf="thumbnail && thumbnail.Available"
          [style.background-image]="getSanitizedThUrl()"></div>
 

frontend/app/gallery/directory/directory.gallery.component.ts

@@ -24,11 +24,7 @@ export class GalleryDirectoryComponent implements OnInit, OnDestroy {
 
   }
 
-  ngOnInit() {
-    if (this.directory.photos.length > 0) {
-      this.thumbnail = this.thumbnailService.getThumbnail(new Photo(this.directory.photos[0], this.size(), this.size()));
-    }
-  }
+  size: number = null;
 
   getSanitizedThUrl() {
     return this._sanitizer.bypassSecurityTrustStyle('url(' + encodeURI(this.thumbnail.Src).replace(/\(/g, "%28").replace(/\)/g, "%29") + ')');
@@ -50,13 +46,20 @@ export class GalleryDirectoryComponent implements OnInit, OnDestroy {
     }
   }
 
-  size() {
-    let size = 220 + 5;
-    const containerWidth = this.container.nativeElement.parentElement.parentElement.clientWidth;
-    size = containerWidth / Math.round((containerWidth / size));
+  ngOnInit() {
+    if (this.directory.photos.length > 0) {
+      this.thumbnail = this.thumbnailService.getThumbnail(new Photo(this.directory.photos[0], this.calcSize(), this.calcSize()));
+    }
+  }
 
-
-    return Math.floor(size - 5);
+  calcSize() {
+    if (this.size == null ||
+      document.getElementsByTagName('body')[0].style.overflowY == 'scroll') {
+      let size = 220 + 5;
+      const containerWidth = this.container.nativeElement.parentElement.parentElement.clientWidth;
+      this.size = containerWidth / Math.round((containerWidth / size));
+    }
+    return Math.floor(this.size - 5);
   }
 
 }

frontend/app/gallery/gallery.component.ts

@@ -7,7 +7,7 @@ import {GallerySearchComponent} from "./search/search.gallery.component";
 import {SearchTypes} from "../../../common/entities/AutoCompleteItem";
 import {Config} from "../../../common/config/public/Config";
 import {DirectoryDTO} from "../../../common/entities/DirectoryDTO";
-import {SearchResultDTO} from "../../../common/entities/SearchResult";
+import {SearchResultDTO} from "../../../common/entities/SearchResultDTO";
 import {ShareService} from "./share.service";
 import {NavigationService} from "../model/navigation.service";
 import {UserRoles} from "../../../common/entities/UserDTO";

frontend/app/gallery/gallery.service.ts

@@ -1,7 +1,7 @@
 import {Injectable} from "@angular/core";
 import {NetworkService} from "../model/network/network.service";
 import {ContentWrapper} from "../../../common/entities/ConentWrapper";
-import {DirectoryDTO, NotModifiedDirectoryDTO} from "../../../common/entities/DirectoryDTO";
+import {DirectoryDTO} from "../../../common/entities/DirectoryDTO";
 import {SearchTypes} from "../../../common/entities/AutoCompleteItem";
 import {GalleryCacheService} from "./cache.gallery.service";
 import {BehaviorSubject} from "rxjs/BehaviorSubject";
@@ -51,11 +51,11 @@ export class GalleryService {
     const cw = await this.networkService.getJson<ContentWrapper>("/gallery/content/" + directoryName, params);
 
 
-    if (!cw || (<NotModifiedDirectoryDTO>cw.directory).notModified == true) {
+    if (!cw || cw.notModified == true) {
       return;
     }
 
-    this.galleryCacheService.setDirectory(<DirectoryDTO>cw.directory); //save it before adding references
+    this.galleryCacheService.setDirectory(cw.directory); //save it before adding references
 
     if (this.lastRequest.directory != directoryName) {
       return;

frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts

@@ -55,7 +55,7 @@ export class GalleryMapLightboxComponent implements OnChanges {
     };
     this.map.triggerResize();
 
-    document.getElementsByTagName('body')[0].style.overflow = 'hidden';
+    document.getElementsByTagName('body')[0].style.overflowY = 'hidden';
     this.showImages();
 
     setTimeout(() => {
@@ -79,7 +79,7 @@ export class GalleryMapLightboxComponent implements OnChanges {
 
     this.lightboxDimension = this.startPosition;
     this.lightboxDimension.top -= this.getBodyScrollTop();
-    document.getElementsByTagName('body')[0].style.overflow = 'scroll';
+    document.getElementsByTagName('body')[0].style.overflowY = 'scroll';
     this.opacity = 0.0;
     setTimeout(() => {
       this.visible = false;

frontend/app/gallery/overlay.service.ts

@@ -10,7 +10,7 @@ export class OverlayService {
   public showOverlay() {
 
     //disable scrolling
-    document.getElementsByTagName('body')[0].style.overflow = 'hidden';
+    document.getElementsByTagName('body')[0].style.overflowY = 'hidden';
     this.OnOverlayChange.trigger(true);
   }
 
@@ -33,7 +33,7 @@ export class OverlayService {
 
       let widthNoScroll = outer.offsetWidth;
       // force scrollbars
-      outer.style.overflow = "scroll";
+      outer.style.overflowY = "scroll";
 
       // add innerdiv
       let inner = document.createElement("div");
@@ -51,7 +51,7 @@ export class OverlayService {
   }
 
   getPhantomScrollbarWidth() {
-    if (document.getElementsByTagName('body')[0].style.overflow == 'hidden') {
+    if (document.getElementsByTagName('body')[0].style.overflowY == 'hidden') {
       return this.getScrollbarWidth();
     }
     return 0;