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

corrected metadataMap seeding function

Browse source
This commit is contained in:
Abhinav-grd 2021-02-18 14:59:09 +05:30
parent 4cb835cefe
commit ec3763997c
1 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/services/uploadService.ts
View file

@ -220,7 +220,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:
@ -229,7 +228,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,
@ -237,7 +237,7 @@ class UploadService {
metadata, metadata,
}; };
} catch (e) { } catch (e) {
console.log('error reading files ' + e); console.log('error reading files ', e);
throw e; throw e;
} }
} }
@ -280,7 +280,7 @@ class UploadService {
}; };
return result; return result;
} catch (e) { } catch (e) {
console.log('Error encrypting files ' + e); console.log('Error encrypting files ', e);
throw e; throw e;
} }
} }
@ -306,7 +306,7 @@ class UploadService {
return file; return file;
} catch (e) { } catch (e) {
console.log('error uploading to bucket ' + e); console.log('error uploading to bucket ', e);
throw e; throw e;
} }
} }
@ -336,7 +336,7 @@ class UploadService {
return response.data; return response.data;
} catch (e) { } catch (e) {
console.log('upload Files Failed ' + e); console.log('upload Files Failed ', e);
throw e; throw e;
} }
} }
@ -356,21 +356,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 ||
@ -387,7 +379,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}`
@ -479,7 +471,7 @@ class UploadService {
const thumbnail = await this.getUint8ArrayView(thumbnailBlob); const thumbnail = await this.getUint8ArrayView(thumbnailBlob);
return thumbnail; return thumbnail;
} catch (e) { } catch (e) {
console.log('Error generating thumbnail ' + e); console.log('Error generating thumbnail ', e);
throw e; throw e;
} }
} }
@ -502,7 +494,7 @@ class UploadService {
reader.readAsArrayBuffer(file); reader.readAsArrayBuffer(file);
}); });
} catch (e) { } catch (e) {
console.log('error readinf file to bytearray ' + e); console.log('error readinf file to bytearray ', e);
throw e; throw e;
} }
} }
@ -534,7 +526,7 @@ class UploadService {
} }
return this.uploadURLFetchInProgress; return this.uploadURLFetchInProgress;
} catch (e) { } catch (e) {
console.log('fetch upload-url failed ' + e); console.log('fetch upload-url failed ', e);
throw e; throw e;
} }
} }
@ -550,7 +542,7 @@ class UploadService {
}); });
return fileUploadURL.objectKey; return fileUploadURL.objectKey;
} catch (e) { } catch (e) {
console.log('putFile to dataStore failed ' + e); console.log('putFile to dataStore failed ', e);
throw e; throw e;
} }
} }