From 3bba955c821f62d24ea14f9be8a08564196c3c02 Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Sat, 28 Jul 2018 13:58:17 -0400 Subject: [PATCH] updating node packages, fixing typo --- backend/model/threading/TaskQue.ts | 4 +- .../{ThumbnailWoker.ts => ThumbnailWorker.ts} | 16 ++-- backend/model/threading/Worker.ts | 4 +- .../database/database.settings.component.html | 2 +- .../thumbanil.settings.component.html | 2 +- frontend/translate/messages.en.xlf | 12 +-- frontend/translate/messages.hu.xlf | 8 +- package.json | 85 ++++++++++--------- 8 files changed, 67 insertions(+), 66 deletions(-) rename backend/model/threading/{ThumbnailWoker.ts => ThumbnailWorker.ts} (90%) diff --git a/backend/model/threading/TaskQue.ts b/backend/model/threading/TaskQue.ts index 15f27cc9..cc7867ac 100644 --- a/backend/model/threading/TaskQue.ts +++ b/backend/model/threading/TaskQue.ts @@ -1,4 +1,4 @@ -import {RendererInput, ThumbnailWoker} from './ThumbnailWoker'; +import {RendererInput, ThumbnailWorker} from './ThumbnailWoker'; import {Config} from '../../../common/config/private/Config'; @@ -23,7 +23,7 @@ export class TaskQue implements ITaskQue { this.taskInProgress++; const task = this.tasks.shift(); try { - task.promise.resolve(await ThumbnailWoker.render(task.data, Config.Server.thumbnail.processingLibrary)); + task.promise.resolve(await ThumbnailWorker.render(task.data, Config.Server.thumbnail.processingLibrary)); } catch (err) { task.promise.reject(err); } diff --git a/backend/model/threading/ThumbnailWoker.ts b/backend/model/threading/ThumbnailWorker.ts similarity index 90% rename from backend/model/threading/ThumbnailWoker.ts rename to backend/model/threading/ThumbnailWorker.ts index eb7fafd6..a9cdf437 100644 --- a/backend/model/threading/ThumbnailWoker.ts +++ b/backend/model/threading/ThumbnailWorker.ts @@ -3,17 +3,17 @@ import {Dimensions, State} from 'gm'; import {Logger} from '../../Logger'; import {ThumbnailProcessingLib} from '../../../common/config/private/IPrivateConfig'; -export class ThumbnailWoker { +export class ThumbnailWorker { private static renderer: (input: RendererInput) => Promise = null; private static rendererType = null; public static render(input: RendererInput, renderer: ThumbnailProcessingLib): Promise { - if (ThumbnailWoker.rendererType !== renderer) { - ThumbnailWoker.renderer = RendererFactory.build(renderer); - ThumbnailWoker.rendererType = renderer; + if (ThumbnailWorker.rendererType !== renderer) { + ThumbnailWorker.renderer = RendererFactory.build(renderer); + ThumbnailWorker.rendererType = renderer; } - return ThumbnailWoker.renderer(input); + return ThumbnailWorker.renderer(input); } @@ -46,7 +46,7 @@ export class RendererFactory { const Jimp = require('jimp'); return async (input: RendererInput): Promise => { // generate thumbnail - Logger.silly('[JimpThRenderer] rendering thumbnail:', input.imagePath); + Logger.silly('[JimpThRenderer] rendering thumbnail:' + input.imagePath); const image = await Jimp.read(input.imagePath); /** * newWidth * newHeight = size*size @@ -86,7 +86,7 @@ export class RendererFactory { const sharp = require('sharp'); return async (input: RendererInput): Promise => { - Logger.silly('[SharpThRenderer] rendering thumbnail:', input.imagePath); + Logger.silly('[SharpThRenderer] rendering thumbnail:' + input.imagePath); const image: SharpInstance = sharp(input.imagePath); const metadata: Metadata = await image.metadata(); @@ -123,7 +123,7 @@ export class RendererFactory { const gm = require('gm'); return (input: RendererInput): Promise => { return new Promise((resolve, reject) => { - Logger.silly('[GMThRenderer] rendering thumbnail:', input.imagePath); + Logger.silly('[GMThRenderer] rendering thumbnail:' + input.imagePath); let image: State = gm(input.imagePath); image.size((err, value: Dimensions) => { if (err) { diff --git a/backend/model/threading/Worker.ts b/backend/model/threading/Worker.ts index f0cbe8d4..a76d5085 100644 --- a/backend/model/threading/Worker.ts +++ b/backend/model/threading/Worker.ts @@ -1,6 +1,6 @@ import {DiskMangerWorker} from './DiskMangerWorker'; import {Logger} from '../../Logger'; -import {RendererInput, ThumbnailWoker} from './ThumbnailWoker'; +import {RendererInput, ThumbnailWorker} from './ThumbnailWoker'; import {ThumbnailProcessingLib} from '../../../common/config/private/IPrivateConfig'; export class Worker { @@ -19,7 +19,7 @@ export class Worker { } break; case WorkerTaskTypes.thumbnail: - result = await ThumbnailWoker.render((task).input, (task).renderer); + result = await ThumbnailWorker.render((task).input, (task).renderer); break; default: Logger.error('Unknown worker task type'); diff --git a/frontend/app/settings/database/database.settings.component.html b/frontend/app/settings/database/database.settings.component.html index d910373d..b8d3b6dc 100644 --- a/frontend/app/settings/database/database.settings.component.html +++ b/frontend/app/settings/database/database.settings.component.html @@ -26,7 +26,7 @@ [(ngModel)]="settings.mysql.password" name="password"> -

SQLie settings:

+

SQLite settings:

 diff --git a/frontend/app/settings/thumbnail/thumbanil.settings.component.html b/frontend/app/settings/thumbnail/thumbanil.settings.component.html index 99a57ecd..f6423c07 100644 --- a/frontend/app/settings/thumbnail/thumbanil.settings.component.html +++ b/frontend/app/settings/thumbnail/thumbanil.settings.component.html @@ -92,7 +92,7 @@ Size of the thumbnails.
The best matching size will be generated. (More size gives better quality, but use storage to store and CPU to render.)
';' separated integers. If size is 200, tha thumbnail will have 200^2 pixels. + i18n>';' separated integers. If size is 200, that thumbnail will have 200^2 pixels. diff --git a/frontend/translate/messages.en.xlf b/frontend/translate/messages.en.xlf index 190411b1..a56816e9 100644 --- a/frontend/translate/messages.en.xlf +++ b/frontend/translate/messages.en.xlf @@ -434,13 +434,13 @@ Database - - SQLie settings: + + SQLite settings: app/settings/database/database.settings.component.ts 29 - SQLie settings: + SQLite settings: Save @@ -684,13 +684,13 @@ The best matching size will be generated. (More size gives better quality, but use storage to store and CPU to render.) - - ';' separated integers. If size is 200, tha thumbnail will have 200^2 pixels. + + ';' separated integers. If size is 200, that thumbnail will have 200^2 pixels. app/settings/thumbnail/thumbanil.settings.component.ts 95 - ';' separated integers. If size is 200, tha thumbnail will have 200^2 pixels. + ';' separated integers. If size is 200, that thumbnail will have 200^2 pixels. Search settings diff --git a/frontend/translate/messages.hu.xlf b/frontend/translate/messages.hu.xlf index 437d838d..88e9f48b 100644 --- a/frontend/translate/messages.hu.xlf +++ b/frontend/translate/messages.hu.xlf @@ -434,8 +434,8 @@ Adatbázis - - SQLie settings: + + SQLite settings: app/settings/database/database.settings.component.ts 29 @@ -684,8 +684,8 @@ A leginkább eggyező méret lesz generálva. (A nagyobb méret jobb minőségű képet jelent, de nagyobb számításigényű és több helyet is foglal.) - - ';' separated integers. If size is 200, tha thumbnail will have 200^2 pixels. + + ';' separated integers. If size is 200, that thumbnail will have 200^2 pixels. app/settings/thumbnail/thumbanil.settings.component.ts 95 diff --git a/package.json b/package.json index 49a3b71d..42b99526 100644 --- a/package.json +++ b/package.json @@ -30,93 +30,94 @@ "dependencies": { "bcryptjs": "2.4.3", "body-parser": "1.18.3", - "cookie-parser": "^1.4.3", + "cookie-parser": "1.4.3", "cookie-session": "2.0.0-beta.3", "ejs": "2.6.1", "express": "4.16.3", "jimp": "0.2.28", "locale": "0.1.0", "reflect-metadata": "0.1.12", - "sqlite3": "4.0.0", + "sqlite3": "4.0.2", "ts-exif-parser": "0.1.23", "ts-node-iptc": "1.0.9", "typeconfig": "1.0.6", - "typeorm": "0.2.6", + "typeorm": "0.2.7", "winston": "2.4.2" }, "devDependencies": { "@agm/core": "1.0.0-beta.3", - "@angular-devkit/build-angular": "~0.6.5", - "@angular/animations": "6.0.3", - "@angular/cli": "6.0.5", - "@angular/common": "6.0.3", - "@angular/compiler": "6.0.3", - "@angular/compiler-cli": "6.0.3", - "@angular/core": "6.0.3", - "@angular/forms": "6.0.3", - "@angular/http": "6.0.3", - "@angular/language-service": "^6.0.3", - "@angular/platform-browser": "6.0.3", - "@angular/platform-browser-dynamic": "6.0.3", - "@angular/router": "6.0.3", - "@ngx-translate/i18n-polyfill": "0.1.3", + "@angular-devkit/build-angular": "0.7.1", + "@angular-devkit/build-optimizer": "0.7.1", + "@angular/animations": "6.1.0", + "@angular/cli": "6.1.1", + "@angular/common": "6.1.0", + "@angular/compiler": "6.1.0", + "@angular/compiler-cli": "6.1.0", + "@angular/core": "6.1.0", + "@angular/forms": "6.1.0", + "@angular/http": "6.1.0", + "@angular/language-service": "^6.1.0", + "@angular/platform-browser": "6.1.0", + "@angular/platform-browser-dynamic": "6.1.0", + "@angular/router": "6.1.0", + "@ngx-translate/i18n-polyfill": "1.0.0", "@types/bcryptjs": "2.4.1", - "@types/chai": "4.1.3", - "@types/cookie-session": "2.0.34", - "@types/express": "4.11.1", + "@types/chai": "4.1.4", + "@types/cookie-session": "2.0.35", + "@types/express": "4.16.0", "@types/gm": "1.18.0", - "@types/jasmine": "2.8.7", - "@types/node": "10.1.2", - "@types/sharp": "0.17.8", - "@types/winston": "2.3.9", - "bootstrap": "4.1.1", + "@types/jasmine": "2.8.8", + "@types/node": "10.5.4", + "@types/sharp": "0.17.9", + "@types/winston": "^2.3.9", + "bootstrap": "4.1.3", "chai": "4.1.2", - "codelyzer": "4.3.0", + "codelyzer": "4.4.2", "core-js": "2.5.7", "ejs-loader": "0.3.1", "gulp": "3.9.1", "gulp-json-modify": "1.0.2", - "gulp-typescript": "4.0.2", - "gulp-zip": "4.1.0", + "gulp-typescript": "5.0.0-alpha.3", + "gulp-zip": "4.2.0", "hammerjs": "2.0.8", "intl": "1.2.5", "jasmine-core": "3.1.0", "jasmine-spec-reporter": "4.2.1", "jw-bootstrap-switch-ng2": "1.0.10", - "karma": "2.0.2", + "karma": "2.0.5", "karma-chrome-launcher": "2.2.0", "karma-cli": "1.0.1", "karma-coverage-istanbul-reporter": "2.0.1", "karma-jasmine": "1.1.2", - "karma-jasmine-html-reporter": "1.1.0", + "karma-jasmine-html-reporter": "1.2.0", "karma-remap-istanbul": "0.6.0", "karma-systemjs": "0.16.0", "merge2": "1.2.2", "mocha": "5.2.0", "ng2-cookies": "1.0.12", "ng2-slim-loading-bar": "4.0.0", - "ngx-bootstrap": "3.0.0", - "ngx-clipboard": "11.1.0", - "ngx-toastr": "^8.7.3", + "ngx-bootstrap": "3.0.1", + "ngx-clipboard": "11.1.1", + "ngx-toastr": "8.10.0", "open-iconic": "1.1.1", - "protractor": "5.3.2", + "protractor": "5.4.0", "remap-istanbul": "0.11.1", "rimraf": "2.6.2", "run-sequence": "2.2.1", - "rxjs": "6.2.0", - "rxjs-compat": "^6.2.0", + "rxjs": "6.2.2", + "rxjs-compat": "^6.2.2", "ts-helpers": "1.1.2", - "ts-node": "6.0.5", - "tslint": "5.10.0", - "typescript": "2.7.2", + "ts-node": "7.0.0", + "tslint": "5.11.0", + "typescript": "2.9.2", "xlf-google-translate": "1.0.0-beta.11", "zone.js": "0.8.26" }, "optionalDependencies": { - "mysql": "2.15.0", - "bcrypt": "2.0.1", + "mysql": "2.16.0", + "bcrypt": "3.0.0", "gm": "1.23.1", - "sharp": "0.20.2" + "sharp": "0.20.5" }, "engines": { "node": ">= 6.9 <10.0"