Merge branch 'handle-B2-errors' of https://github.com/ente-io/bada-frame into handle-B2-errors
This commit is contained in:
commit
8f758f3ba5
|
@ -224,7 +224,6 @@ class UploadService {
|
||||||
recievedFile
|
recievedFile
|
||||||
);
|
);
|
||||||
const metadata = Object.assign(
|
const metadata = Object.assign(
|
||||||
this.metadataMap.get(recievedFile.name) ?? {},
|
|
||||||
{
|
{
|
||||||
title: recievedFile.name,
|
title: recievedFile.name,
|
||||||
creationTime:
|
creationTime:
|
||||||
|
@ -233,7 +232,8 @@ class UploadService {
|
||||||
latitude: location?.latitude,
|
latitude: location?.latitude,
|
||||||
longitude: location?.latitude,
|
longitude: location?.latitude,
|
||||||
fileType,
|
fileType,
|
||||||
}
|
},
|
||||||
|
this.metadataMap.get(recievedFile.name)
|
||||||
);
|
);
|
||||||
return {
|
return {
|
||||||
filedata,
|
filedata,
|
||||||
|
@ -360,21 +360,13 @@ class UploadService {
|
||||||
reader.readAsText(recievedFile);
|
reader.readAsText(recievedFile);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
if (!this.metadataMap.has(metadataJSON['title'])) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const metaDataObject = this.metadataMap.get(metadataJSON['title']);
|
const metaDataObject = {};
|
||||||
metaDataObject['creationTime'] =
|
metaDataObject['creationTime'] =
|
||||||
metadataJSON['photoTakenTime']['timestamp'] * 1000000;
|
metadataJSON['photoTakenTime']['timestamp'] * 1000000;
|
||||||
metaDataObject['modificationTime'] =
|
metaDataObject['modificationTime'] =
|
||||||
metadataJSON['modificationTime']['timestamp'] * 1000000;
|
metadataJSON['modificationTime']['timestamp'] * 1000000;
|
||||||
|
|
||||||
if (
|
|
||||||
metaDataObject['latitude'] == null ||
|
|
||||||
(metaDataObject['latitude'] == 0.0 &&
|
|
||||||
metaDataObject['longitude'] == 0.0)
|
|
||||||
) {
|
|
||||||
var locationData = null;
|
var locationData = null;
|
||||||
if (
|
if (
|
||||||
metadataJSON['geoData']['latitude'] != 0.0 ||
|
metadataJSON['geoData']['latitude'] != 0.0 ||
|
||||||
|
@ -391,7 +383,7 @@ class UploadService {
|
||||||
metaDataObject['latitude'] = locationData['latitide'];
|
metaDataObject['latitude'] = locationData['latitide'];
|
||||||
metaDataObject['longitude'] = locationData['longitude'];
|
metaDataObject['longitude'] = locationData['longitude'];
|
||||||
}
|
}
|
||||||
}
|
this.metadataMap.set(metadataJSON['title'], metaDataObject);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
const error = new Error(
|
const error = new Error(
|
||||||
`Error reading metaDataFile ${recievedFile.name}`
|
`Error reading metaDataFile ${recievedFile.name}`
|
||||||
|
|
Loading…
Reference in a new issue