exiftool-vendored 15.4.0 → 15.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +36 -0
- package/README.md +36 -4
- package/dist/Array.d.ts +1 -0
- package/dist/Array.js +9 -1
- package/dist/Array.js.map +1 -1
- package/dist/DeleteAllTagsArgs.d.ts +1 -0
- package/dist/DeleteAllTagsArgs.js +5 -0
- package/dist/DeleteAllTagsArgs.js.map +1 -0
- package/dist/ExifDate.d.ts +8 -0
- package/dist/ExifDate.js +12 -0
- package/dist/ExifDate.js.map +1 -1
- package/dist/ExifDateTime.d.ts +14 -0
- package/dist/ExifDateTime.js +23 -3
- package/dist/ExifDateTime.js.map +1 -1
- package/dist/ExifTime.d.ts +8 -0
- package/dist/ExifTime.js +12 -0
- package/dist/ExifTime.js.map +1 -1
- package/dist/ExifTool.d.ts +7 -2
- package/dist/ExifTool.js +16 -9
- package/dist/ExifTool.js.map +1 -1
- package/dist/ExifToolTask.js +2 -3
- package/dist/ExifToolTask.js.map +1 -1
- package/dist/File.d.ts +1 -0
- package/dist/File.js +30 -0
- package/dist/File.js.map +1 -0
- package/dist/JSON.d.ts +1 -0
- package/dist/JSON.js +16 -0
- package/dist/JSON.js.map +1 -0
- package/dist/Maybe.d.ts +0 -1
- package/dist/Maybe.js +1 -10
- package/dist/Maybe.js.map +1 -1
- package/dist/ReadRawTask.js +1 -2
- package/dist/ReadRawTask.js.map +1 -1
- package/dist/ReadTask.d.ts +2 -2
- package/dist/ReadTask.js +37 -32
- package/dist/ReadTask.js.map +1 -1
- package/dist/RewriteAllTagsTask.js +9 -5
- package/dist/RewriteAllTagsTask.js.map +1 -1
- package/dist/Sidecars.d.ts +2 -0
- package/dist/Sidecars.js +11 -0
- package/dist/Sidecars.js.map +1 -0
- package/dist/Tags.d.ts +30 -12
- package/dist/Timezones.js +6 -3
- package/dist/Timezones.js.map +1 -1
- package/dist/WriteTask.d.ts +2 -2
- package/dist/WriteTask.js +18 -4
- package/dist/WriteTask.js.map +1 -1
- package/package.json +20 -20
package/dist/Maybe.js
CHANGED
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.denull = exports.firstDefinedThunk = exports.first = exports.
|
|
4
|
-
const Object_1 = require("./Object");
|
|
3
|
+
exports.denull = exports.firstDefinedThunk = exports.first = exports.map = void 0;
|
|
5
4
|
function map(maybeT, f) {
|
|
6
5
|
return maybeT == null ? undefined : f(maybeT);
|
|
7
6
|
}
|
|
8
7
|
exports.map = map;
|
|
9
|
-
function orElse(obj, defaultValue) {
|
|
10
|
-
return obj != null
|
|
11
|
-
? obj
|
|
12
|
-
: (0, Object_1.isFunction)(defaultValue)
|
|
13
|
-
? defaultValue()
|
|
14
|
-
: defaultValue;
|
|
15
|
-
}
|
|
16
|
-
exports.orElse = orElse;
|
|
17
8
|
function first(iter, f) {
|
|
18
9
|
for (const t of iter) {
|
|
19
10
|
if (t != null) {
|
package/dist/Maybe.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Maybe.js","sourceRoot":"","sources":["../src/Maybe.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Maybe.js","sourceRoot":"","sources":["../src/Maybe.ts"],"names":[],"mappings":";;;AAGA,SAAgB,GAAG,CAAO,MAAoB,EAAE,CAAc;IAC5D,OAAO,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AAC/C,CAAC;AAFD,kBAEC;AAED,SAAgB,KAAK,CACnB,IAAwB,EACxB,CAAqB;IAErB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,IAAI,CAAC,IAAI,IAAI,EAAE;YACb,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YACd,IAAI,CAAC,IAAI,IAAI;gBAAE,OAAO,CAAC,CAAA;SACxB;KACF;IACD,OAAM;AACR,CAAC;AAXD,sBAWC;AAED,SAAgB,iBAAiB,CAAI,IAA8B;IACjE,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,MAAM,MAAM,GAAG,CAAC,EAAE,CAAA;QAClB,IAAI,MAAM,IAAI,IAAI;YAAE,OAAO,MAAM,CAAA;KAClC;IACD,OAAM;AACR,CAAC;AAND,8CAMC;AAED;;GAEG;AACH,SAAgB,MAAM,CAAI,CAAW;IACnC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;AAClC,CAAC;AAFD,wBAEC"}
|
package/dist/ReadRawTask.js
CHANGED
|
@@ -23,7 +23,6 @@ exports.ReadRawTask = void 0;
|
|
|
23
23
|
const batch_cluster_1 = require("batch-cluster");
|
|
24
24
|
const _path = __importStar(require("path"));
|
|
25
25
|
const ExifToolTask_1 = require("./ExifToolTask");
|
|
26
|
-
const Maybe_1 = require("./Maybe");
|
|
27
26
|
class ReadRawTask extends ExifToolTask_1.ExifToolTask {
|
|
28
27
|
constructor(sourceFile, args) {
|
|
29
28
|
super(args);
|
|
@@ -47,7 +46,7 @@ class ReadRawTask extends ExifToolTask_1.ExifToolTask {
|
|
|
47
46
|
}
|
|
48
47
|
catch (jsonError) {
|
|
49
48
|
(0, batch_cluster_1.logger)().error("ExifTool.ReadRawTask(): Invalid JSON", { data });
|
|
50
|
-
throw
|
|
49
|
+
throw err !== null && err !== void 0 ? err : jsonError;
|
|
51
50
|
}
|
|
52
51
|
}
|
|
53
52
|
}
|
package/dist/ReadRawTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadRawTask.js","sourceRoot":"","sources":["../src/ReadRawTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAsC;AACtC,4CAA6B;
|
|
1
|
+
{"version":3,"file":"ReadRawTask.js","sourceRoot":"","sources":["../src/ReadRawTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAsC;AACtC,4CAA6B;AAC7B,iDAA6C;AAG7C,MAAa,WAAY,SAAQ,2BAAkB;IASjD,YACW,UAAkB,EACT,IAAc;QAEhC,KAAK,CAAC,IAAI,CAAC,CAAA;QAHF,eAAU,GAAV,UAAU,CAAQ;QACT,SAAI,GAAJ,IAAI,CAAU;IAGlC,CAAC;IAbD,MAAM,CAAC,GAAG,CAAC,QAAgB,EAAE,eAAyB,EAAE;QACtD,MAAM,IAAI,GAAG,CAAC,GAAG,YAAY,CAAC,CAAA;QAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAClD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACrB,OAAO,IAAI,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAC1C,CAAC;IASQ,QAAQ;QACf,OAAO,aAAa,GAAG,IAAI,CAAC,UAAU,GAAG,GAAG,CAAA;IAC9C,CAAC;IAES,KAAK,CAAC,IAAY,EAAE,GAAW;QACvC,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;SAC3B;QAAC,OAAO,SAAS,EAAE;YAClB,IAAA,sBAAM,GAAE,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YAChE,MAAM,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,SAAS,CAAA;SACvB;IACH,CAAC;CACF;AA5BD,kCA4BC"}
|
package/dist/ReadTask.d.ts
CHANGED
|
@@ -18,11 +18,11 @@ export declare class ReadTask extends ExifToolTask<Tags> {
|
|
|
18
18
|
private constructor();
|
|
19
19
|
static for(filename: string, numericTags: string[], optionalArgs?: string[]): ReadTask;
|
|
20
20
|
toString(): string;
|
|
21
|
-
|
|
21
|
+
parse(data: string, err?: Error): Tags;
|
|
22
22
|
private tagName;
|
|
23
23
|
private parseTags;
|
|
24
|
-
private latlon;
|
|
25
24
|
private extractLatLon;
|
|
25
|
+
private latlon;
|
|
26
26
|
private extractTzOffset;
|
|
27
27
|
private parseTag;
|
|
28
28
|
}
|
package/dist/ReadTask.js
CHANGED
|
@@ -66,8 +66,6 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
|
|
|
66
66
|
"-json",
|
|
67
67
|
"-struct",
|
|
68
68
|
...optionalArgs,
|
|
69
|
-
"-coordFormat",
|
|
70
|
-
"%.8f", // Just a float, please, not the default of "22 deg 20' 7.58\" N"
|
|
71
69
|
];
|
|
72
70
|
// IMPORTANT: "-all" must be after numeric tag references (first reference
|
|
73
71
|
// in wins)
|
|
@@ -90,7 +88,7 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
|
|
|
90
88
|
err,
|
|
91
89
|
jsonError,
|
|
92
90
|
});
|
|
93
|
-
throw
|
|
91
|
+
throw err !== null && err !== void 0 ? err : jsonError;
|
|
94
92
|
}
|
|
95
93
|
// ExifTool does "humorous" things to paths, like flip path separators. resolve() undoes that.
|
|
96
94
|
const SourceFile = _path.resolve(this._raw.SourceFile);
|
|
@@ -110,7 +108,8 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
|
|
|
110
108
|
return this.parseTags();
|
|
111
109
|
}
|
|
112
110
|
tagName(k) {
|
|
113
|
-
|
|
111
|
+
var _a;
|
|
112
|
+
return this.degroup ? (_a = k.split(":")[1]) !== null && _a !== void 0 ? _a : k : k;
|
|
114
113
|
}
|
|
115
114
|
parseTags() {
|
|
116
115
|
this.extractLatLon();
|
|
@@ -122,30 +121,37 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
|
|
|
122
121
|
this.tags.errors = this.errors;
|
|
123
122
|
return this.tags;
|
|
124
123
|
}
|
|
124
|
+
extractLatLon() {
|
|
125
|
+
var _a, _b;
|
|
126
|
+
(_a = this.lat) !== null && _a !== void 0 ? _a : (this.lat = this.latlon("GPSLatitude", "S", 90));
|
|
127
|
+
(_b = this.lon) !== null && _b !== void 0 ? _b : (this.lon = this.latlon("GPSLongitude", "W", 180));
|
|
128
|
+
if (this.invalidLatLon) {
|
|
129
|
+
this.lat = this.lon = undefined;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
125
132
|
latlon(tagName, negateRef, maxValid) {
|
|
126
133
|
const tagValue = this._tags[tagName];
|
|
127
|
-
const
|
|
128
|
-
|
|
134
|
+
const ref = this._tags[tagName + "Ref"];
|
|
135
|
+
const result = (0, Number_1.toF)(tagValue);
|
|
136
|
+
if (result == null) {
|
|
129
137
|
return;
|
|
130
|
-
|
|
131
|
-
|
|
138
|
+
}
|
|
139
|
+
else if (Math.abs(result) > maxValid) {
|
|
140
|
+
this.errors.push(`Invalid ${tagName}: ${JSON.stringify(tagValue)}`);
|
|
132
141
|
this.invalidLatLon = true;
|
|
133
142
|
return;
|
|
134
143
|
}
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
return
|
|
144
|
+
else if ((0, String_1.blank)(ref)) {
|
|
145
|
+
// Videos may not have a GPSLatitudeRef or GPSLongitudeRef: if this is the case, assume the given sign is correct.
|
|
146
|
+
return result;
|
|
138
147
|
}
|
|
139
148
|
else {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
}
|
|
147
|
-
if (!this.invalidLatLon && this.lon == null) {
|
|
148
|
-
this.lon = this.latlon("GPSLongitude", "W", 180);
|
|
149
|
+
// Versions of ExifTool pre-12 returned properly-negated lat/lon. ExifTool
|
|
150
|
+
// 12+ always returns positive values (!!). Also: if '-GPS*#' is set,
|
|
151
|
+
// we'll see "S" instead of "South", hence the .startsWith() instead of
|
|
152
|
+
// ===:
|
|
153
|
+
const negative = (0, String_1.toS)(ref).toUpperCase().startsWith(negateRef);
|
|
154
|
+
return (negative ? -1 : 1) * Math.abs(result);
|
|
149
155
|
}
|
|
150
156
|
}
|
|
151
157
|
extractTzOffset() {
|
|
@@ -169,6 +175,7 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
|
|
|
169
175
|
]), (ea) => ({ tz: this.tz, src: this.tzSource } = ea));
|
|
170
176
|
}
|
|
171
177
|
parseTag(tagNameWithGroup, value) {
|
|
178
|
+
var _a, _b, _c, _d, _e, _f;
|
|
172
179
|
if (nullish(value))
|
|
173
180
|
return undefined;
|
|
174
181
|
const tagName = this.tagName(tagNameWithGroup);
|
|
@@ -182,19 +189,17 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
|
|
|
182
189
|
if (tagName === "GPSLongitude") {
|
|
183
190
|
return this.lon;
|
|
184
191
|
}
|
|
192
|
+
const tz = tagName.includes("UTC") || tagName.startsWith("GPS") ? "UTC" : this.tz;
|
|
193
|
+
if (typeof value === "string" && tagName.includes("DateTime")) {
|
|
194
|
+
const d = (_a = ExifDateTime_1.ExifDateTime.fromExifStrict(value, tz)) !== null && _a !== void 0 ? _a : ExifDateTime_1.ExifDateTime.fromISO(value, tz);
|
|
195
|
+
if (d != null) {
|
|
196
|
+
return d;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
185
199
|
if (typeof value === "string" && tagName.includes("Date")) {
|
|
186
|
-
const
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
? "UTC"
|
|
190
|
-
: this.tz),
|
|
191
|
-
() => ExifDate_1.ExifDate.fromISO(value),
|
|
192
|
-
() => ExifDateTime_1.ExifDateTime.fromISO(value, this.tz),
|
|
193
|
-
() => ExifDate_1.ExifDate.fromExifLoose(value),
|
|
194
|
-
() => ExifDateTime_1.ExifDateTime.fromExifLoose(value, this.tz),
|
|
195
|
-
]);
|
|
196
|
-
if (dt != null) {
|
|
197
|
-
return dt;
|
|
200
|
+
const d = (_f = (_e = (_d = (_c = (_b = ExifDateTime_1.ExifDateTime.fromExifStrict(value, tz)) !== null && _b !== void 0 ? _b : ExifDateTime_1.ExifDateTime.fromISO(value, tz)) !== null && _c !== void 0 ? _c : ExifDateTime_1.ExifDateTime.fromExifLoose(value, tz)) !== null && _d !== void 0 ? _d : ExifDate_1.ExifDate.fromExifStrict(value)) !== null && _e !== void 0 ? _e : ExifDate_1.ExifDate.fromISO(value)) !== null && _f !== void 0 ? _f : ExifDate_1.ExifDate.fromExifLoose(value);
|
|
201
|
+
if (d != null) {
|
|
202
|
+
return d;
|
|
198
203
|
}
|
|
199
204
|
}
|
|
200
205
|
if (typeof value === "string" && tagName.includes("Time")) {
|
package/dist/ReadTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadTask.js","sourceRoot":"","sources":["../src/ReadTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAsC;AACtC,4CAA6B;AAC7B,yCAAqC;AACrC,iDAA6C;AAC7C,yCAAqC;AACrC,iDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"ReadTask.js","sourceRoot":"","sources":["../src/ReadTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,6 @@ exports.RewriteAllTagsTask = void 0;
|
|
|
23
23
|
const _path = __importStar(require("path"));
|
|
24
24
|
const Array_1 = require("./Array");
|
|
25
25
|
const ExifToolTask_1 = require("./ExifToolTask");
|
|
26
|
-
const Maybe_1 = require("./Maybe");
|
|
27
26
|
class RewriteAllTagsTask extends ExifToolTask_1.ExifToolTask {
|
|
28
27
|
constructor(args) {
|
|
29
28
|
super(args);
|
|
@@ -45,11 +44,16 @@ class RewriteAllTagsTask extends ExifToolTask_1.ExifToolTask {
|
|
|
45
44
|
return new RewriteAllTagsTask(args);
|
|
46
45
|
}
|
|
47
46
|
parse(data, error) {
|
|
48
|
-
|
|
49
|
-
|
|
47
|
+
var _a;
|
|
48
|
+
if (error != null) {
|
|
49
|
+
const str = String(error);
|
|
50
|
+
// Ignore warnings:
|
|
51
|
+
if (str.match(/\berror\b/i) != null && !str.match(/\bwarning\b/i)) {
|
|
52
|
+
throw error;
|
|
53
|
+
}
|
|
50
54
|
}
|
|
51
|
-
if (data.
|
|
52
|
-
throw (0
|
|
55
|
+
if (null == data.match(/^\s*1 image files creat/i)) {
|
|
56
|
+
throw (error !== null && error !== void 0 ? error : new Error((_a = data.trim().split("\n")[0]) !== null && _a !== void 0 ? _a : "Missing expected status message"));
|
|
53
57
|
}
|
|
54
58
|
}
|
|
55
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RewriteAllTagsTask.js","sourceRoot":"","sources":["../src/RewriteAllTagsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA6B;
|
|
1
|
+
{"version":3,"file":"RewriteAllTagsTask.js","sourceRoot":"","sources":["../src/RewriteAllTagsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA6B;AAC7B,mCAAiC;AACjC,iDAA6C;AAE7C,MAAa,kBAAmB,SAAQ,2BAAkB;IACxD,YAAoB,IAAc;QAChC,KAAK,CAAC,IAAI,CAAC,CAAA;IACb,CAAC;IAED,MAAM,CAAC,GAAG,CACR,MAAc,EACd,OAAe,EACf,oBAA6B;QAE7B,8DAA8D;QAE9D,MAAM,IAAI,GAAG,IAAA,eAAO,EAAC;YACnB,OAAO;YACP,eAAe;YACf,GAAG;YACH,UAAU;YACV,SAAS;YACT,cAAc;YACd,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YACvC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YACrB,MAAM;YACN,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;SACvB,CAAC,CAAA;QACF,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,KAAa;;QAC/B,IAAI,KAAK,IAAI,IAAI,EAAE;YACjB,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;YACzB,mBAAmB;YACnB,IAAI,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;gBACjE,MAAM,KAAK,CAAA;aACZ;SACF;QACD,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,EAAE;YAClD,MAAM,CACJ,KAAK,aAAL,KAAK,cAAL,KAAK,GACL,IAAI,KAAK,CACP,MAAA,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,mCAAI,iCAAiC,CAChE,CACF,CAAA;SACF;IACH,CAAC;CACF;AA5CD,gDA4CC"}
|
package/dist/Sidecars.js
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isSidecarExt = exports.SidecarExts = void 0;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
exports.SidecarExts = [".exif", ".exv", ".mie", ".xmp"];
|
|
6
|
+
function isSidecarExt(filename) {
|
|
7
|
+
const p = (0, path_1.parse)(filename);
|
|
8
|
+
return exports.SidecarExts.includes(String(p.ext).toLowerCase());
|
|
9
|
+
}
|
|
10
|
+
exports.isSidecarExt = isSidecarExt;
|
|
11
|
+
//# sourceMappingURL=Sidecars.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Sidecars.js","sourceRoot":"","sources":["../src/Sidecars.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAEf,QAAA,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;AAE5D,SAAgB,YAAY,CAAC,QAAgB;IAC3C,MAAM,CAAC,GAAG,IAAA,YAAK,EAAC,QAAQ,CAAC,CAAA;IACzB,OAAO,mBAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAA;AAC1D,CAAC;AAHD,oCAGC"}
|
package/dist/Tags.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { Struct } from "./Struct";
|
|
|
7
7
|
export interface ExifToolTags {
|
|
8
8
|
/** ☆☆☆☆ ✔ Example: "File is empty" */
|
|
9
9
|
Error?: string;
|
|
10
|
-
/** ★★★★ ✔ Example: 12.
|
|
10
|
+
/** ★★★★ ✔ Example: 12.38 */
|
|
11
11
|
ExifToolVersion?: number;
|
|
12
12
|
/** ☆☆☆☆ ✔ Example: "Unrecognized IPTC record 0 (ignored)" */
|
|
13
13
|
Warning?: string;
|
|
@@ -33,9 +33,9 @@ export interface FileTags {
|
|
|
33
33
|
EncodingProcess?: string;
|
|
34
34
|
/** ★★★★ ✔ Example: "Little-endian (Intel, II)" */
|
|
35
35
|
ExifByteOrder?: string;
|
|
36
|
-
/** ★★★★ ✔ Example: 2021-
|
|
36
|
+
/** ★★★★ ✔ Example: 2021-12-20T17:04:11.000-08:00 */
|
|
37
37
|
FileAccessDate?: ExifDateTime | string;
|
|
38
|
-
/** ★★★★ ✔ Example: 2021-
|
|
38
|
+
/** ★★★★ ✔ Example: 2021-12-18T15:34:05.000-08:00 */
|
|
39
39
|
FileInodeChangeDate?: ExifDateTime | string;
|
|
40
40
|
/** ★★★★ ✔ Example: 2021-06-08T12:53:12.000-07:00 */
|
|
41
41
|
FileModifyDate?: ExifDateTime | string;
|
|
@@ -995,7 +995,7 @@ export interface IPTCTags {
|
|
|
995
995
|
SpecialInstructions?: string;
|
|
996
996
|
/** ☆☆☆☆ ✔ Example: "" */
|
|
997
997
|
SupplementalCategories?: string;
|
|
998
|
-
/** ☆☆☆☆ ✔ Example: 23:
|
|
998
|
+
/** ☆☆☆☆ ✔ Example: 23:47:00 */
|
|
999
999
|
TimeCreated?: ExifTime | string;
|
|
1000
1000
|
/** ☆☆☆☆ ✔ Example: "" */
|
|
1001
1001
|
TimeSent?: string;
|
|
@@ -1527,7 +1527,7 @@ export interface MakerNotesTags {
|
|
|
1527
1527
|
AFPointPosition?: string;
|
|
1528
1528
|
/** ☆☆☆☆ ✔ Example: "Center" */
|
|
1529
1529
|
AFPointRegistration?: string;
|
|
1530
|
-
/** ☆☆☆☆ ✔ Example: "Use
|
|
1530
|
+
/** ☆☆☆☆ ✔ Example: "Use Half" */
|
|
1531
1531
|
AFPointSel?: string;
|
|
1532
1532
|
/** ☆☆☆☆ ✔ Example: "n/a" */
|
|
1533
1533
|
AFPointSelected?: string;
|
|
@@ -1653,7 +1653,7 @@ export interface MakerNotesTags {
|
|
|
1653
1653
|
AssignMovieFunc2Button?: string;
|
|
1654
1654
|
/** ☆☆☆☆ ✔ Example: "None" */
|
|
1655
1655
|
AssignMoviePreviewButtonPlusDials?: string;
|
|
1656
|
-
/** ☆☆☆☆ ✔ Example: "
|
|
1656
|
+
/** ☆☆☆☆ ✔ Example: "Shutter/Aperture Lock" */
|
|
1657
1657
|
AssignMovieRecordButton?: string;
|
|
1658
1658
|
/** ☆☆☆☆ ✔ Example: "None" */
|
|
1659
1659
|
AssignMovieRecordButtonPlusDials?: string;
|
|
@@ -2359,6 +2359,8 @@ export interface MakerNotesTags {
|
|
|
2359
2359
|
EffectiveMaxAperture?: number;
|
|
2360
2360
|
/** ☆☆☆☆ ✔ Example: "On" */
|
|
2361
2361
|
ElectronicFrontCurtainShutter?: string;
|
|
2362
|
+
/** ☆☆☆☆ ✔ Example: "On" */
|
|
2363
|
+
EnergySavingMode?: string;
|
|
2362
2364
|
/** ☆☆☆☆ Example: "Off" */
|
|
2363
2365
|
Enhancement?: string;
|
|
2364
2366
|
/** ☆☆☆☆ ✔ Example: 960 */
|
|
@@ -2835,7 +2837,7 @@ export interface MakerNotesTags {
|
|
|
2835
2837
|
FullImageSize?: string;
|
|
2836
2838
|
/** ☆☆☆☆ Example: "Off" */
|
|
2837
2839
|
FullPressSnap?: string;
|
|
2838
|
-
/** ☆☆☆☆ ✔ Example: "
|
|
2840
|
+
/** ☆☆☆☆ ✔ Example: "Zoom (High)" */
|
|
2839
2841
|
Func1Button?: string;
|
|
2840
2842
|
/** ☆☆☆☆ ✔ Example: "Choose Image Area (DX/1.3x)" */
|
|
2841
2843
|
Func1ButtonPlusDials?: string;
|
|
@@ -2873,6 +2875,14 @@ export interface MakerNotesTags {
|
|
|
2873
2875
|
GripBatteryState?: string;
|
|
2874
2876
|
/** ☆☆☆☆ ✔ Example: "Squares" */
|
|
2875
2877
|
GroupAreaAFIllumination?: string;
|
|
2878
|
+
/** ☆☆☆☆ ✔ Example: "Unknown (5)" */
|
|
2879
|
+
HDMIBitDepth?: string;
|
|
2880
|
+
/** ☆☆☆☆ ✔ Example: "Off" */
|
|
2881
|
+
HDMIExternalRecorder?: string;
|
|
2882
|
+
/** ☆☆☆☆ ✔ Example: "Auto" */
|
|
2883
|
+
HDMIOutputRange?: string;
|
|
2884
|
+
/** ☆☆☆☆ ✔ Example: "Auto" */
|
|
2885
|
+
HDMIOutputResolution?: string;
|
|
2876
2886
|
/** ★☆☆☆ ✔ Example: "On" */
|
|
2877
2887
|
HDR?: string;
|
|
2878
2888
|
/** ☆☆☆☆ ✔ Example: "Natural" */
|
|
@@ -2929,9 +2939,9 @@ export interface MakerNotesTags {
|
|
|
2929
2939
|
ISO2?: number;
|
|
2930
2940
|
/** ☆☆☆☆ Example: "On" */
|
|
2931
2941
|
ISOAuto?: string;
|
|
2932
|
-
/** ☆☆☆☆ ✔ Example: "
|
|
2942
|
+
/** ☆☆☆☆ ✔ Example: "ISO 1600" */
|
|
2933
2943
|
ISOAutoFlashLimit?: string;
|
|
2934
|
-
/** ☆☆☆☆ ✔ Example: "Unknown (
|
|
2944
|
+
/** ☆☆☆☆ ✔ Example: "Unknown (0x6)" */
|
|
2935
2945
|
ISOAutoHiLimit?: string;
|
|
2936
2946
|
/** ☆☆☆☆ ✔ Example: 6400 */
|
|
2937
2947
|
ISOAutoMax?: number;
|
|
@@ -3407,6 +3417,8 @@ export interface MakerNotesTags {
|
|
|
3407
3417
|
ModifiedWhiteBalanceBlue?: number;
|
|
3408
3418
|
/** ☆☆☆☆ ✔ Example: 0 */
|
|
3409
3419
|
ModifiedWhiteBalanceRed?: number;
|
|
3420
|
+
/** ☆☆☆☆ ✔ Example: 0 */
|
|
3421
|
+
MonitorBrightness?: number;
|
|
3410
3422
|
/** ☆☆☆☆ ✔ Example: "Automatic" */
|
|
3411
3423
|
MonitorDisplayOff?: string;
|
|
3412
3424
|
/** ☆☆☆☆ ✔ Example: "8 s" */
|
|
@@ -3431,9 +3443,11 @@ export interface MakerNotesTags {
|
|
|
3431
3443
|
MotionSensitivity?: number;
|
|
3432
3444
|
/** ☆☆☆☆ ✔ Example: "AE/AF Lock" */
|
|
3433
3445
|
MovieAELockButtonAssignment?: string;
|
|
3446
|
+
/** ☆☆☆☆ ✔ Example: "Auto (People)" */
|
|
3447
|
+
MovieAFAreaMode?: string;
|
|
3434
3448
|
/** ☆☆☆☆ ✔ Example: "4 (Normal)" */
|
|
3435
3449
|
MovieAFTrackingSensitivity?: string;
|
|
3436
|
-
/** ☆☆☆☆ ✔ Example: "
|
|
3450
|
+
/** ☆☆☆☆ ✔ Example: "Zoom (Low)" */
|
|
3437
3451
|
MovieFunc1Button?: string;
|
|
3438
3452
|
/** ☆☆☆☆ ✔ Example: "Zoom (1:1)" */
|
|
3439
3453
|
MovieFunc2Button?: string;
|
|
@@ -3447,7 +3461,7 @@ export interface MakerNotesTags {
|
|
|
3447
3461
|
MovieHighlightDisplayThreshold?: number;
|
|
3448
3462
|
/** ☆☆☆☆ ✔ Example: "On" */
|
|
3449
3463
|
MovieISOAutoControlManualMode?: string;
|
|
3450
|
-
/** ☆☆☆☆ ✔ Example: "
|
|
3464
|
+
/** ☆☆☆☆ ✔ Example: "ISO 6400" */
|
|
3451
3465
|
MovieISOAutoHiLimit?: string;
|
|
3452
3466
|
/** ☆☆☆☆ ✔ Example: "Center Focus Point" */
|
|
3453
3467
|
MovieMultiSelector?: string;
|
|
@@ -3461,6 +3475,8 @@ export interface MakerNotesTags {
|
|
|
3461
3475
|
MovieSubSelectorAssignment?: string;
|
|
3462
3476
|
/** ☆☆☆☆ ✔ Example: "None" */
|
|
3463
3477
|
MovieSubSelectorAssignmentPlusDials?: string;
|
|
3478
|
+
/** ☆☆☆☆ ✔ Example: "Yes" */
|
|
3479
|
+
MovieWhiteBalanceSameAsPhoto?: string;
|
|
3464
3480
|
/** ☆☆☆☆ ✔ Example: "Off" */
|
|
3465
3481
|
MultiControllerWhileMetering?: string;
|
|
3466
3482
|
/** ☆☆☆☆ ✔ Example: "n/a" */
|
|
@@ -3990,6 +4006,8 @@ export interface MakerNotesTags {
|
|
|
3990
4006
|
/** ☆☆☆☆ ✔ Example: 3 */
|
|
3991
4007
|
SaturationUserDef3?: number;
|
|
3992
4008
|
/** ☆☆☆☆ ✔ Example: "Off" */
|
|
4009
|
+
SaveFocus?: string;
|
|
4010
|
+
/** ☆☆☆☆ ✔ Example: "Off" */
|
|
3993
4011
|
ScanImageEnhancer?: string;
|
|
3994
4012
|
/** ☆☆☆☆ ✔ Example: "Two-Shot" */
|
|
3995
4013
|
SceneAssist?: string;
|
|
@@ -4173,7 +4191,7 @@ export interface MakerNotesTags {
|
|
|
4173
4191
|
ShutterSpeedSetting?: string;
|
|
4174
4192
|
/** ☆☆☆☆ ✔ Example: "Normal" */
|
|
4175
4193
|
ShutterType?: string;
|
|
4176
|
-
/** ☆☆☆☆ ✔ Example: "
|
|
4194
|
+
/** ☆☆☆☆ ✔ Example: "On" */
|
|
4177
4195
|
SilentPhotography?: string;
|
|
4178
4196
|
/** ☆☆☆☆ ✔ Example: "Low" */
|
|
4179
4197
|
SingleFrameBracketing?: string;
|
package/dist/Timezones.js
CHANGED
|
@@ -62,9 +62,12 @@ function extractOffset(tz) {
|
|
|
62
62
|
if ((0, String_1.isString)(tz) && luxon_1.Info.isValidIANAZone(tz)) {
|
|
63
63
|
return { tz, src: "validIANAZone" };
|
|
64
64
|
}
|
|
65
|
-
return (0, Maybe_1.map)(tzRe.exec(tz), (m) =>
|
|
66
|
-
|
|
67
|
-
|
|
65
|
+
return (0, Maybe_1.map)(tzRe.exec(tz), (m) => {
|
|
66
|
+
var _a;
|
|
67
|
+
return (0, Maybe_1.map)(offsetMinutesToZoneName((m[1] === "-" ? -1 : 1) *
|
|
68
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
69
|
+
(parseInt(m[2]) * 60 + parseInt((_a = m[3]) !== null && _a !== void 0 ? _a : "0"))), (ea) => ({ tz: ea, src: "offsetMinutesToZoneName" }));
|
|
70
|
+
});
|
|
68
71
|
}
|
|
69
72
|
exports.extractOffset = extractOffset;
|
|
70
73
|
function extractTzOffsetFromTags(t) {
|
package/dist/Timezones.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Timezones.js","sourceRoot":"","sources":["../src/Timezones.ts"],"names":[],"mappings":";;;AAAA,iCAA6C;AAC7C,mCAAiC;AACjC,yCAAqC;AACrC,iDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"Timezones.js","sourceRoot":"","sources":["../src/Timezones.ts"],"names":[],"mappings":"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"}
|
package/dist/WriteTask.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export declare class WriteTask extends ExifToolTask<void> {
|
|
|
4
4
|
readonly sourceFile: string;
|
|
5
5
|
readonly args: string[];
|
|
6
6
|
private constructor();
|
|
7
|
-
static for(filename: string, tags: WriteTags, optionalArgs?: string[]): WriteTask
|
|
7
|
+
static for(filename: string, tags: WriteTags, optionalArgs?: string[]): Promise<WriteTask | ExifToolTask<void>>;
|
|
8
8
|
toString(): string;
|
|
9
|
-
protected parse(data: string,
|
|
9
|
+
protected parse(data: string, error: Error): void;
|
|
10
10
|
}
|
package/dist/WriteTask.js
CHANGED
|
@@ -21,12 +21,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
22
|
exports.WriteTask = void 0;
|
|
23
23
|
const _path = __importStar(require("path"));
|
|
24
|
+
const Array_1 = require("./Array");
|
|
24
25
|
const DateTime_1 = require("./DateTime");
|
|
26
|
+
const DeleteAllTagsArgs_1 = require("./DeleteAllTagsArgs");
|
|
25
27
|
const ExifToolTask_1 = require("./ExifToolTask");
|
|
28
|
+
const File_1 = require("./File");
|
|
26
29
|
const Number_1 = require("./Number");
|
|
27
30
|
const Object_1 = require("./Object");
|
|
28
31
|
const String_1 = require("./String");
|
|
29
32
|
const Struct_1 = require("./Struct");
|
|
33
|
+
const VersionTask_1 = require("./VersionTask");
|
|
30
34
|
const successRE = /1 image files? (?:created|updated)/;
|
|
31
35
|
const sep = String.fromCharCode(31); // unit separator
|
|
32
36
|
// See https://exiftool.org/faq.html#Q10
|
|
@@ -73,9 +77,18 @@ class WriteTask extends ExifToolTask_1.ExifToolTask {
|
|
|
73
77
|
this.sourceFile = sourceFile;
|
|
74
78
|
this.args = args;
|
|
75
79
|
}
|
|
76
|
-
static for(filename, tags, optionalArgs = []) {
|
|
80
|
+
static async for(filename, tags, optionalArgs = []) {
|
|
77
81
|
const sourceFile = _path.resolve(filename);
|
|
78
82
|
const args = [...utfCharsetArgs];
|
|
83
|
+
// ExifTool complains "Nothing to write" if the task will only remove values
|
|
84
|
+
// and the file is missing.
|
|
85
|
+
if ((optionalArgs.length === 0 ||
|
|
86
|
+
(0, Array_1.shallowArrayEql)(optionalArgs, DeleteAllTagsArgs_1.DeleteAllTagsArgs)) &&
|
|
87
|
+
Object.values(tags).every((ea) => ea == null) &&
|
|
88
|
+
(await (0, File_1.isFileEmpty)(filename))) {
|
|
89
|
+
// no-op!
|
|
90
|
+
return new VersionTask_1.VersionTask();
|
|
91
|
+
}
|
|
79
92
|
for (const key of (0, Object_1.keys)(tags)) {
|
|
80
93
|
const val = tags[key];
|
|
81
94
|
args.push(`-${key}=${enc(val)}`);
|
|
@@ -88,9 +101,10 @@ class WriteTask extends ExifToolTask_1.ExifToolTask {
|
|
|
88
101
|
toString() {
|
|
89
102
|
return "WriteTask(" + this.sourceFile + ")";
|
|
90
103
|
}
|
|
91
|
-
parse(data,
|
|
92
|
-
|
|
93
|
-
|
|
104
|
+
parse(data, error) {
|
|
105
|
+
// console.log(this.toString() + ".parse()", { data, error })
|
|
106
|
+
if (error != null)
|
|
107
|
+
throw error;
|
|
94
108
|
if (this.errors.length > 0)
|
|
95
109
|
throw new Error(this.errors.join(";"));
|
|
96
110
|
data = data.trim();
|
package/dist/WriteTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WriteTask.js","sourceRoot":"","sources":["../src/WriteTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA6B;AAC7B,yCAAuD;AAEvD,iDAA6C;
|
|
1
|
+
{"version":3,"file":"WriteTask.js","sourceRoot":"","sources":["../src/WriteTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA6B;AAC7B,mCAAyC;AACzC,yCAAuD;AACvD,2DAAuD;AAEvD,iDAA6C;AAC7C,iCAAoC;AAEpC,qCAAmC;AACnC,qCAA+B;AAC/B,qCAA+C;AAC/C,qCAAmC;AACnC,+CAA2C;AAE3C,MAAM,SAAS,GAAG,oCAAoC,CAAA;AACtD,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA,CAAC,iBAAiB;AAErD,wCAAwC;AACxC,sCAAsC;AACtC,MAAM,cAAc,GAAG;IACrB,UAAU;IACV,eAAe;IACf,yBAAyB;IACzB,MAAM;IACN,GAAG,GAAG,EAAE;IACR,IAAI,EAAE,oDAAoD;CAC3D,CAAA;AAED,SAAS,GAAG,CAAC,CAAM;IACjB,IAAI,CAAC,IAAI,IAAI,EAAE;QACb,OAAO,EAAE,CAAA;KACV;SAAM,IAAI,IAAA,iBAAQ,EAAC,CAAC,CAAC,EAAE;QACtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;KACjB;SAAM,IAAI,IAAA,iBAAQ,EAAC,CAAC,CAAC,EAAE;QACtB,OAAO,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;KAC7B;SAAM,IAAI,IAAA,uBAAY,EAAC,CAAC,CAAC,EAAE;QAC1B,OAAO,IAAA,uBAAY,EAAC,CAAC,CAAC,CAAA;KACvB;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC3B,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,iBAAQ,EAAC,EAAE,CAAC,IAAI,IAAA,iBAAQ,EAAC,EAAE,CAAC,CAAC,CAAA;QACpE,OAAO,cAAc;YACnB,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC3B,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;KAChC;SAAM,IAAI,IAAA,iBAAQ,EAAC,CAAC,CAAC,EAAE;QACtB,OAAO,IAAI,IAAA,aAAI,EAAC,CAAC,CAAC;aACf,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;KAChB;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;KACtD;AACH,CAAC;AAED,MAAa,SAAU,SAAQ,2BAAkB;IAC/C,YACW,UAAkB,EACT,IAAc;QAEhC,KAAK,CAAC,IAAI,CAAC,CAAA;QAHF,eAAU,GAAV,UAAU,CAAQ;QACT,SAAI,GAAJ,IAAI,CAAU;IAGlC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,CACd,QAAgB,EAChB,IAAe,EACf,eAAyB,EAAE;QAE3B,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAE1C,MAAM,IAAI,GAAa,CAAC,GAAG,cAAc,CAAC,CAAA;QAE1C,4EAA4E;QAC5E,2BAA2B;QAE3B,IACE,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;YACxB,IAAA,uBAAe,EAAC,YAAY,EAAE,qCAAiB,CAAC,CAAC;YACnD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,IAAI,CAAC;YAC7C,CAAC,MAAM,IAAA,kBAAW,EAAC,QAAQ,CAAC,CAAC,EAC7B;YACA,SAAS;YACT,OAAO,IAAI,yBAAW,EAAS,CAAA;SAChC;QAED,KAAK,MAAM,GAAG,IAAI,IAAA,aAAI,EAAC,IAAI,CAAC,EAAE;YAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;YACrB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;SACjC;QAED,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QAC3C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACrB,2EAA2E;QAC3E,OAAO,IAAI,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACxC,CAAC;IAEQ,QAAQ;QACf,OAAO,YAAY,GAAG,IAAI,CAAC,UAAU,GAAG,GAAG,CAAA;IAC7C,CAAC;IAES,KAAK,CAAC,IAAY,EAAE,KAAY;QACxC,6DAA6D;QAC7D,IAAI,KAAK,IAAI,IAAI;YAAE,MAAM,KAAK,CAAA;QAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAClE,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QAClB,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE;YAChC,OAAM;SACP;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAA;SAC/C;IACH,CAAC;CACF;AAxDD,8BAwDC"}
|