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

Refactor some code

Browse source
This commit is contained in:
Vishnu Mohandas 2020-03-30 20:38:50 +05:30
parent f5225cda20
commit 0bbf7d1604
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/models/photo.dart
View file

@ -34,14 +34,18 @@ class Photo {
var file = (await asset.originFile);
photo.localPath = file.path;
photo.hash = getHash(file);
await setThumbnail(photo);
return photo;
}
static Future<void> setThumbnail(Photo photo) async {
var externalPath = (await getApplicationDocumentsDirectory()).path;
var thumbnailPath = externalPath + "/photos/thumbnails/" + photo.hash + ".thumbnail";
var args = Map<String, String>();
args["assetPath"] = file.path;
args["assetPath"] = photo.localPath;
args["thumbnailPath"] = thumbnailPath;
photo.thumbnailPath = thumbnailPath;
await compute(getThumbnailPath, args);
return photo;
photo.thumbnailPath = thumbnailPath;
}
static String getHash(File file) {

16
lib/photo_sync_manager.dart
View file

@ -55,7 +55,8 @@ class PhotoSyncManager {
photos.clear();
PhotoLoader.instance.reloadPhotos();
_logger.i("Inserted " + photos.length.toString() + " photos.");
await prefs.setInt(_lastDBUpdateTimestampKey, asset.createDateTime.millisecondsSinceEpoch);
await prefs.setInt(_lastDBUpdateTimestampKey,
asset.createDateTime.millisecondsSinceEpoch);
}
}
}
@ -130,9 +131,13 @@ class PhotoSyncManager {
"lastSyncTimestamp": lastSyncTimestamp
}).catchError(_onError);
_logger.i(response.toString());
return (response.data["diff"] as List)
.map((photo) => new Photo.fromJson(photo))
.toList();
if (response != null) {
return (response.data["diff"] as List)
.map((photo) => new Photo.fromJson(photo))
.toList();
} else {
return List<Photo>();
}
}
Future<Photo> _uploadFile(String path, String hash) async {
@ -145,9 +150,8 @@ class PhotoSyncManager {
.catchError(_onError);
_logger.i(response.toString());
var photo = Photo.fromJson(response.data);
_logger.i("Locally computed hash for " + path + ": " + hash);
_logger.i("Server computed hash for " + path + ": " + photo.hash);
photo.localPath = path;
Photo.setThumbnail(photo);
return photo;
}