mirror of
https://github.com/xuthus83/pigallery2.git
synced 2025-01-14 14:43:17 +08:00
updating packages
This commit is contained in:
parent
76b439289a
commit
cfb3299fed
@ -10,7 +10,7 @@ declare global {
|
|||||||
|
|
||||||
resultPipe?: any;
|
resultPipe?: any;
|
||||||
body?: {
|
body?: {
|
||||||
loginCredential: LoginCredential
|
loginCredential?: LoginCredential
|
||||||
};
|
};
|
||||||
locale?: string;
|
locale?: string;
|
||||||
}
|
}
|
||||||
|
@ -56,14 +56,12 @@ export class UserMWs {
|
|||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await ObjectManagers.getInstance().UserManager.deleteUser(req.params.id);
|
await ObjectManagers.getInstance().UserManager.deleteUser(parseInt(req.params.id, 10));
|
||||||
return next();
|
return next();
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return next(new ErrorDTO(ErrorCodes.GENERAL_ERROR, null, err));
|
return next(new ErrorDTO(ErrorCodes.GENERAL_ERROR, null, err));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async changeRole(req: Request, res: Response, next: NextFunction) {
|
public static async changeRole(req: Request, res: Response, next: NextFunction) {
|
||||||
@ -76,7 +74,7 @@ export class UserMWs {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await ObjectManagers.getInstance().UserManager.changeRole(req.params.id, req.body.newRole);
|
await ObjectManagers.getInstance().UserManager.changeRole(parseInt(req.params.id, 10), req.body.newRole);
|
||||||
return next();
|
return next();
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
import {TaskProgressDTO} from '../../../common/entities/settings/TaskProgressDTO';
|
|
||||||
import {ConfigTemplateEntry, DefaultsTasks} from '../../../common/entities/task/TaskDTO';
|
|
||||||
import {Utils} from '../../../common/Utils';
|
|
||||||
import {Task} from './Task';
|
|
||||||
|
|
||||||
const LOG_TAG = '[DummyTask]';
|
|
||||||
|
|
||||||
export class DummyTask extends Task {
|
|
||||||
public readonly Name = DefaultsTasks[DefaultsTasks.Dummy];
|
|
||||||
counter = 0;
|
|
||||||
|
|
||||||
public readonly ConfigTemplate: ConfigTemplateEntry[] = null;
|
|
||||||
|
|
||||||
|
|
||||||
public get Supported(): boolean {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async init() {
|
|
||||||
this.counter = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async step(): Promise<TaskProgressDTO> {
|
|
||||||
await Utils.wait(1000);
|
|
||||||
if (!this.running) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
this.counter++;
|
|
||||||
this.progress.progress = this.counter;
|
|
||||||
this.progress.left = Math.pow(10, Math.floor(Math.log10(this.counter)) + 1) - this.counter;
|
|
||||||
return this.progress;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
@ -1,7 +1,6 @@
|
|||||||
import {ITask} from './ITask';
|
import {ITask} from './ITask';
|
||||||
import {IndexingTask} from './IndexingTask';
|
import {IndexingTask} from './IndexingTask';
|
||||||
import {DBRestTask} from './DBResetTask';
|
import {DBRestTask} from './DBResetTask';
|
||||||
import {DummyTask} from './DummyTask';
|
|
||||||
|
|
||||||
export class TaskRepository {
|
export class TaskRepository {
|
||||||
|
|
||||||
@ -27,4 +26,3 @@ export class TaskRepository {
|
|||||||
|
|
||||||
TaskRepository.Instance.register(new IndexingTask());
|
TaskRepository.Instance.register(new IndexingTask());
|
||||||
TaskRepository.Instance.register(new DBRestTask());
|
TaskRepository.Instance.register(new DBRestTask());
|
||||||
// TaskRepository.Instance.register(new DummyTask());
|
|
||||||
|
@ -3,7 +3,7 @@ import {FaceRegion, PhotoMetadata} from '../../../common/entities/PhotoDTO';
|
|||||||
import {Config} from '../../../common/config/private/Config';
|
import {Config} from '../../../common/config/private/Config';
|
||||||
import {Logger} from '../../Logger';
|
import {Logger} from '../../Logger';
|
||||||
import * as fs from 'fs';
|
import * as fs from 'fs';
|
||||||
import * as sizeOf from 'image-size';
|
import {imageSize} from 'image-size';
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import * as ExifReader from 'exifreader';
|
import * as ExifReader from 'exifreader';
|
||||||
import {ExifParserFactory, OrientationTypes} from 'ts-exif-parser';
|
import {ExifParserFactory, OrientationTypes} from 'ts-exif-parser';
|
||||||
@ -49,8 +49,8 @@ export class MetadataLoader {
|
|||||||
metadata.size.width = data.streams[i].width;
|
metadata.size.width = data.streams[i].width;
|
||||||
metadata.size.height = data.streams[i].height;
|
metadata.size.height = data.streams[i].height;
|
||||||
|
|
||||||
if (Utils.isInt32(Math.floor(data.streams[i].duration * 1000))) {
|
if (Utils.isInt32(Math.floor(parseFloat(data.streams[i].duration) * 1000))) {
|
||||||
metadata.duration = Math.floor(data.streams[i].duration * 1000);
|
metadata.duration = Math.floor(parseFloat(data.streams[i].duration) * 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Utils.isInt32(parseInt(data.streams[i].bit_rate, 10))) {
|
if (Utils.isInt32(parseInt(data.streams[i].bit_rate, 10))) {
|
||||||
@ -150,13 +150,13 @@ export class MetadataLoader {
|
|||||||
} else if (exif.tags.RelatedImageWidth && exif.tags.RelatedImageHeight) {
|
} else if (exif.tags.RelatedImageWidth && exif.tags.RelatedImageHeight) {
|
||||||
metadata.size = {width: exif.tags.RelatedImageWidth, height: exif.tags.RelatedImageHeight};
|
metadata.size = {width: exif.tags.RelatedImageWidth, height: exif.tags.RelatedImageHeight};
|
||||||
} else {
|
} else {
|
||||||
const info = sizeOf(fullPath);
|
const info = imageSize(fullPath);
|
||||||
metadata.size = {width: info.width, height: info.height};
|
metadata.size = {width: info.width, height: info.height};
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
Logger.debug(LOG_TAG, 'Error parsing exif', fullPath, err);
|
Logger.debug(LOG_TAG, 'Error parsing exif', fullPath, err);
|
||||||
try {
|
try {
|
||||||
const info = sizeOf(fullPath);
|
const info = imageSize(fullPath);
|
||||||
metadata.size = {width: info.width, height: info.height};
|
metadata.size = {width: info.width, height: info.height};
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
metadata.size = {width: 1, height: 1};
|
metadata.size = {width: 1, height: 1};
|
||||||
|
@ -14,7 +14,7 @@ import {Config} from '../../../../common/config/public/Config';
|
|||||||
})
|
})
|
||||||
export class AdminComponent implements OnInit {
|
export class AdminComponent implements OnInit {
|
||||||
|
|
||||||
simplifiedMode = false;
|
simplifiedMode = true;
|
||||||
text = {
|
text = {
|
||||||
Advanced: 'Advanced',
|
Advanced: 'Advanced',
|
||||||
Simplified: 'Simplified'
|
Simplified: 'Simplified'
|
||||||
|
5649
package-lock.json
generated
5649
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
116
package.json
116
package.json
@ -8,7 +8,7 @@
|
|||||||
"main": "./backend/index.js",
|
"main": "./backend/index.js",
|
||||||
"bin": "./backend/index.js",
|
"bin": "./backend/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"install": "tsc && gulp build-prod",
|
"installx": "tsc && gulp build-prod",
|
||||||
"build-release": "gulp build-release",
|
"build-release": "gulp build-release",
|
||||||
"build-backend": "tsc",
|
"build-backend": "tsc",
|
||||||
"pretest": "tsc",
|
"pretest": "tsc",
|
||||||
@ -29,103 +29,101 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bcryptjs": "2.4.3",
|
"bcryptjs": "2.4.3",
|
||||||
"body-parser": "1.19.0",
|
"body-parser": "1.19.0",
|
||||||
"bootstrap": "4.1.1",
|
|
||||||
"cookie-parser": "1.4.4",
|
"cookie-parser": "1.4.4",
|
||||||
"cookie-session": "2.0.0-beta.3",
|
"cookie-session": "2.0.0-beta.3",
|
||||||
"ejs": "2.6.2",
|
"ejs": "3.0.1",
|
||||||
"exifreader": "2.8.2",
|
"exifreader": "2.12.0",
|
||||||
"express": "4.17.1",
|
"express": "4.17.1",
|
||||||
"fluent-ffmpeg": "2.1.2",
|
"fluent-ffmpeg": "2.1.2",
|
||||||
"image-size": "0.7.4",
|
"image-size": "0.8.3",
|
||||||
"jdataview": "2.5.0",
|
"jdataview": "2.5.0",
|
||||||
"jimp": "0.6.4",
|
"jimp": "0.9.3",
|
||||||
"locale": "0.1.0",
|
"locale": "0.1.0",
|
||||||
"ngx-bootstrap": "^4.1.1",
|
"npm-check-updates": "^3.2.2",
|
||||||
"npm-check-updates": "^3.1.20",
|
|
||||||
"reflect-metadata": "0.1.13",
|
"reflect-metadata": "0.1.13",
|
||||||
"sqlite3": "4.0.9",
|
"sqlite3": "4.1.1",
|
||||||
"ts-exif-parser": "0.1.4",
|
"ts-exif-parser": "0.1.4",
|
||||||
"ts-node-iptc": "1.0.11",
|
"ts-node-iptc": "1.0.11",
|
||||||
"typeconfig": "1.0.7",
|
"typeconfig": "1.0.7",
|
||||||
"typeorm": "0.2.18",
|
"typeorm": "0.2.21",
|
||||||
"winston": "2.4.4",
|
"winston": "2.4.4",
|
||||||
"xmldom": "0.1.27"
|
"xmldom": "0.1.27"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/build-angular": "0.801.2",
|
"@angular-devkit/build-angular": "0.803.20",
|
||||||
"@angular-devkit/build-optimizer": "0.801.2",
|
"@angular-devkit/build-optimizer": "0.803.20",
|
||||||
"@angular/animations": "8.1.2",
|
"@angular/animations": "8.2.14",
|
||||||
"@angular/cli": "8.1.2",
|
"@angular/cli": "8.3.20",
|
||||||
"@angular/common": "8.1.2",
|
"@angular/common": "8.2.14",
|
||||||
"@angular/compiler": "8.1.2",
|
"@angular/compiler": "8.2.14",
|
||||||
"@angular/compiler-cli": "8.1.2",
|
"@angular/compiler-cli": "8.2.14",
|
||||||
"@angular/core": "8.1.2",
|
"@angular/core": "8.2.14",
|
||||||
"@angular/forms": "8.1.2",
|
"@angular/forms": "8.2.14",
|
||||||
"@angular/http": "7.2.15",
|
"@angular/http": "7.2.15",
|
||||||
"@angular/language-service": "8.1.2",
|
"@angular/language-service": "8.2.14",
|
||||||
"@angular/platform-browser": "8.1.2",
|
"@angular/platform-browser": "8.2.14",
|
||||||
"@angular/platform-browser-dynamic": "8.1.2",
|
"@angular/platform-browser-dynamic": "8.2.14",
|
||||||
"@angular/router": "8.1.2",
|
"@angular/router": "8.2.14",
|
||||||
"@ngx-translate/i18n-polyfill": "1.0.0",
|
"@ngx-translate/i18n-polyfill": "1.0.0",
|
||||||
"@types/bcryptjs": "2.4.2",
|
"@types/bcryptjs": "2.4.2",
|
||||||
"@types/chai": "4.1.7",
|
"@types/chai": "4.2.6",
|
||||||
"@types/cookie-parser": "1.4.1",
|
"@types/cookie-parser": "1.4.2",
|
||||||
"@types/cookie-session": "2.0.37",
|
"@types/cookie-session": "2.0.37",
|
||||||
"@types/ejs": "2.6.3",
|
"@types/ejs": "3.0.0",
|
||||||
"@types/express": "4.17.0",
|
"@types/express": "4.17.2",
|
||||||
"@types/fluent-ffmpeg": "2.1.10",
|
"@types/fluent-ffmpeg": "2.1.11",
|
||||||
"@types/gm": "1.18.3",
|
"@types/gm": "1.18.6",
|
||||||
"@types/gulp": "4.0.6",
|
"@types/gulp": "4.0.6",
|
||||||
"@types/gulp-zip": "4.0.0",
|
"@types/gulp-zip": "4.0.1",
|
||||||
"@types/image-size": "0.7.0",
|
"@types/image-size": "0.8.0",
|
||||||
"@types/jasmine": "3.3.13",
|
"@types/jasmine": "3.5.0",
|
||||||
"@types/node": "12.6.8",
|
"@types/node": "12.12.14",
|
||||||
"@types/sharp": "0.22.2",
|
"@types/sharp": "0.23.1",
|
||||||
"@types/winston": "2.4.4",
|
"@types/winston": "2.4.4",
|
||||||
"@yaga/leaflet-ng2": "1.0.0",
|
"@yaga/leaflet-ng2": "1.0.0",
|
||||||
"bootstrap": "4.3.1",
|
"bootstrap": "4.4.1",
|
||||||
"chai": "4.2.0",
|
"chai": "4.2.0",
|
||||||
"codelyzer": "5.1.0",
|
"codelyzer": "5.2.0",
|
||||||
"core-js": "3.1.4",
|
"core-js": "3.4.7",
|
||||||
"ejs-loader": "0.3.3",
|
"ejs-loader": "0.3.5",
|
||||||
"gulp": "4.0.2",
|
"gulp": "4.0.2",
|
||||||
"gulp-json-modify": "1.0.2",
|
"gulp-json-modify": "1.0.2",
|
||||||
"gulp-typescript": "5.0.1",
|
"gulp-typescript": "5.0.1",
|
||||||
"gulp-zip": "5.0.0",
|
"gulp-zip": "5.0.1",
|
||||||
"hammerjs": "2.0.8",
|
"hammerjs": "2.0.8",
|
||||||
"intl": "1.2.5",
|
"intl": "1.2.5",
|
||||||
"jasmine-core": "3.4.0",
|
"jasmine-core": "3.5.0",
|
||||||
"jasmine-spec-reporter": "4.2.1",
|
"jasmine-spec-reporter": "4.2.1",
|
||||||
"jw-bootstrap-switch-ng2": "2.0.5",
|
"jw-bootstrap-switch-ng2": "2.0.5",
|
||||||
"karma": "4.2.0",
|
"karma": "4.4.1",
|
||||||
"karma-chrome-launcher": "3.0.0",
|
"karma-chrome-launcher": "3.1.0",
|
||||||
"karma-cli": "2.0.0",
|
"karma-cli": "2.0.0",
|
||||||
"karma-coverage-istanbul-reporter": "2.0.5",
|
"karma-coverage-istanbul-reporter": "2.1.1",
|
||||||
"karma-jasmine": "2.0.1",
|
"karma-jasmine": "2.0.1",
|
||||||
"karma-jasmine-html-reporter": "1.4.2",
|
"karma-jasmine-html-reporter": "1.4.2",
|
||||||
"karma-remap-istanbul": "0.6.0",
|
"karma-remap-istanbul": "0.6.0",
|
||||||
"karma-systemjs": "0.16.0",
|
"karma-systemjs": "0.16.0",
|
||||||
"merge2": "1.2.3",
|
"merge2": "1.3.0",
|
||||||
"mocha": "6.1.4",
|
"mocha": "6.2.2",
|
||||||
"ng2-cookies": "1.0.12",
|
"ng2-cookies": "1.0.12",
|
||||||
"ng2-slim-loading-bar": "4.0.0",
|
"ng2-slim-loading-bar": "4.0.0",
|
||||||
"ngx-bootstrap": "5.1.0",
|
"ngx-bootstrap": "5.2.0",
|
||||||
"ngx-clipboard": "12.2.0",
|
"ngx-clipboard": "12.3.0",
|
||||||
"ngx-toastr": "10.0.4",
|
"ngx-toastr": "11.2.1",
|
||||||
"open-iconic": "1.1.1",
|
"open-iconic": "1.1.1",
|
||||||
"protractor": "5.4.2",
|
"protractor": "5.4.2",
|
||||||
"remap-istanbul": "0.13.0",
|
"remap-istanbul": "0.13.0",
|
||||||
"rimraf": "2.6.3",
|
"rimraf": "3.0.0",
|
||||||
"run-sequence": "2.2.1",
|
"run-sequence": "2.2.1",
|
||||||
"rxjs": "6.5.2",
|
"rxjs": "6.5.3",
|
||||||
"rxjs-compat": "6.5.2",
|
"rxjs-compat": "6.5.3",
|
||||||
"terser": "4.1.2",
|
"terser": "4.4.2",
|
||||||
"ts-helpers": "1.1.2",
|
"ts-helpers": "1.1.2",
|
||||||
"ts-node": "8.3.0",
|
"ts-node": "8.5.4",
|
||||||
"tslint": "5.18.0",
|
"tslint": "5.20.1",
|
||||||
"typescript": "3.4.5",
|
"typescript": "3.5.3",
|
||||||
"xlf-google-translate": "1.0.0-beta.15",
|
"xlf-google-translate": "1.0.0-beta.15",
|
||||||
"zone.js": "0.9.1"
|
"zone.js": "0.10.2"
|
||||||
},
|
},
|
||||||
"//": [
|
"//": [
|
||||||
"TODO: remove terser version lock once webpack is fixed",
|
"TODO: remove terser version lock once webpack is fixed",
|
||||||
@ -135,12 +133,12 @@
|
|||||||
"natives": "1.1.3"
|
"natives": "1.1.3"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@ffmpeg-installer/ffmpeg": "1.0.19",
|
"@ffmpeg-installer/ffmpeg": "1.0.20",
|
||||||
"@ffprobe-installer/ffprobe": "1.0.12",
|
"@ffprobe-installer/ffprobe": "1.0.12",
|
||||||
"bcrypt": "3.0.6",
|
"bcrypt": "3.0.7",
|
||||||
"gm": "1.23.1",
|
"gm": "1.23.1",
|
||||||
"mysql": "2.17.1",
|
"mysql": "2.17.1",
|
||||||
"sharp": "0.22.1"
|
"sharp": "0.23.4"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 6.9 <11.0"
|
"node": ">= 6.9 <11.0"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user