cotugno/immich
2
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-11-15 09:59:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(mobile): Revert - upload motion and live part of LivePhotos together (#5601)

Browse Source
This commit is contained in:
Alex 2023-12-11 10:38:02 -06:00 committed by GitHub
parent e3e4fb40fd
commit 64e985d600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mobile/lib/modules/backup/services/backup.service.dart
View File

@ -310,6 +310,13 @@ class BackupService {
req.files.add(assetRawUploadData); req.files.add(assetRawUploadData);
if (entity.isLivePhoto) {
var livePhotoRawUploadData = await _getLivePhotoFile(entity);
if (livePhotoRawUploadData != null) {
req.files.add(livePhotoRawUploadData);
}
}
setCurrentUploadAssetCb( setCurrentUploadAssetCb(
CurrentUploadAsset( CurrentUploadAsset(
id: entity.id, id: entity.id,
@ -325,29 +332,6 @@ class BackupService {
var response = var response =
await httpClient.send(req, cancellationToken: cancelToken); await httpClient.send(req, cancellationToken: cancelToken);
// Send live photo separately
if (entity.isLivePhoto) {
var livePhotoRawUploadData = await _getLivePhotoFile(entity);
if (livePhotoRawUploadData != null) {
var livePhotoReq = MultipartRequest(
req.method,
req.url,
onProgress: req.onProgress,
)
..headers.addAll(req.headers)
..fields.addAll(req.fields);
livePhotoReq.files.add(livePhotoRawUploadData);
// Send live photo only if the non-motion part is successful
if (response.statusCode == 200 || response.statusCode == 201) {
response = await httpClient.send(
livePhotoReq,
cancellationToken: cancelToken,
);
}
}
}
if (response.statusCode == 200) { if (response.statusCode == 200) {
// asset is a duplicate (already exists on the server) // asset is a duplicate (already exists on the server)
duplicatedAssetIds.add(entity.id); duplicatedAssetIds.add(entity.id);
@ -405,7 +389,7 @@ class BackupService {
var fileStream = motionFile.openRead(); var fileStream = motionFile.openRead();
String fileName = p.basename(motionFile.path); String fileName = p.basename(motionFile.path);
return http.MultipartFile( return http.MultipartFile(
"assetData", "livePhotoData",
fileStream, fileStream,
motionFile.lengthSync(), motionFile.lengthSync(),
filename: fileName, filename: fileName,