beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'handle-B2-errors' of https://github.com/ente-io/bada-frame into handle-B2-errors

Browse source
This commit is contained in:
Abhinav-grd 2021-02-22 13:22:00 +05:30
parent 2c705cd665 879fa5160f
commit 8f758f3ba5
1 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/services/uploadService.ts
View file

@ -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,38 +360,30 @@ 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;
var locationData = null;
if ( if (
metaDataObject['latitude'] == null || metadataJSON['geoData']['latitude'] != 0.0 ||
(metaDataObject['latitude'] == 0.0 && metadataJSON['geoData']['longitude'] != 0.0
metaDataObject['longitude'] == 0.0)
) { ) {
var locationData = null; locationData = metadataJSON['geoData'];
if ( } else if (
metadataJSON['geoData']['latitude'] != 0.0 || metadataJSON['geoDataExif']['latitude'] != 0.0 ||
metadataJSON['geoData']['longitude'] != 0.0 metadataJSON['geoDataExif']['longitude'] != 0.0
) { ) {
locationData = metadataJSON['geoData']; locationData = metadataJSON['geoDataExif'];
} else if (
metadataJSON['geoDataExif']['latitude'] != 0.0 ||
metadataJSON['geoDataExif']['longitude'] != 0.0
) {
locationData = metadataJSON['geoDataExif'];
}
if (locationData != null) {
metaDataObject['latitude'] = locationData['latitide'];
metaDataObject['longitude'] = locationData['longitude'];
}
} }
if (locationData != null) {
metaDataObject['latitude'] = locationData['latitide'];
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}`