1
0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00

exif test fix

This commit is contained in:
Braun Patrik 2017-07-11 18:43:10 +02:00
parent 7478c5106b
commit 07619e2f05
3 changed files with 12 additions and 10 deletions

View File

@ -15,14 +15,13 @@ declare module "exif-parser" {
imageSize: any; imageSize: any;
} }
export interface ExifObject { export interface ExifObject {
enableTagNames(value: boolean);
enableImageSize(value: boolean);
enableReturnTags(value: boolean);
parse(): ExifData; parse(): ExifData;
} }
export function create(data: any): ExifObject; export function create(data: any): ExifObject;
export function enableTagNames(value: boolean);
export function enableImageSize(value: boolean);
export function enableReturnTags(value: boolean);
} }

View File

@ -11,9 +11,6 @@ import {ProjectPath} from "../../ProjectPath";
const LOG_TAG = "[DiskManagerTask]"; const LOG_TAG = "[DiskManagerTask]";
exif_parser.enableTagNames(true);
exif_parser.enableImageSize(true);
exif_parser.enableReturnTags(true);
export class DiskMangerWorker { export class DiskMangerWorker {
private static isImage(fullPath: string) { private static isImage(fullPath: string) {
let imageMimeTypes = [ let imageMimeTypes = [
@ -55,7 +52,13 @@ export class DiskMangerWorker {
}); });
try { try {
const exif = exif_parser.create(data).parse(); const exif_obj = exif_parser.create(data);
exif_obj.enableTagNames(true);
exif_obj.enableImageSize(true);
exif_obj.enableReturnTags(true);
const exif = exif_obj.parse();
Logger.debug(LOG_TAG, "exif data", exif); Logger.debug(LOG_TAG, "exif data", exif);
metadata.cameraData = <CameraMetadata> { metadata.cameraData = <CameraMetadata> {
ISO: exif.tags.ISO, ISO: exif.tags.ISO,

View File

@ -8,7 +8,7 @@
"main": "./backend/index.js", "main": "./backend/index.js",
"bin": "./backend/index.js", "bin": "./backend/index.js",
"scripts": { "scripts": {
"build": "ng build", "build": "tsc && ng build",
"pretest": "tsc", "pretest": "tsc",
"test": "ng test --single-run && mocha --recursive test/backend/unit", "test": "ng test --single-run && mocha --recursive test/backend/unit",
"start": "node ./backend/index", "start": "node ./backend/index",