2022-02-06 08:07:56 +02:00
|
|
|
import 'dart:async';
|
2022-02-03 18:06:44 +02:00
|
|
|
import 'dart:convert';
|
|
|
|
import 'dart:io';
|
|
|
|
|
2022-08-18 16:41:59 +02:00
|
|
|
import 'package:collection/collection.dart';
|
2022-02-03 18:06:44 +02:00
|
|
|
import 'package:flutter/material.dart';
|
2022-06-25 20:46:51 +02:00
|
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
2024-05-01 04:36:40 +02:00
|
|
|
import 'package:immich_mobile/entities/backup_album.entity.dart';
|
|
|
|
import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
|
|
|
|
import 'package:immich_mobile/entities/duplicated_asset.entity.dart';
|
|
|
|
import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';
|
2023-12-07 17:53:15 +02:00
|
|
|
import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
|
|
|
|
import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
|
2024-05-01 04:36:40 +02:00
|
|
|
import 'package:immich_mobile/entities/store.entity.dart';
|
2022-08-03 07:04:34 +02:00
|
|
|
import 'package:immich_mobile/shared/providers/api.provider.dart';
|
2023-03-18 16:55:11 +02:00
|
|
|
import 'package:immich_mobile/shared/providers/db.provider.dart';
|
2022-07-13 14:23:48 +02:00
|
|
|
import 'package:immich_mobile/shared/services/api.service.dart';
|
2023-03-18 16:55:11 +02:00
|
|
|
import 'package:isar/isar.dart';
|
2023-06-26 17:27:32 +02:00
|
|
|
import 'package:logging/logging.dart';
|
2022-07-13 14:23:48 +02:00
|
|
|
import 'package:openapi/api.dart';
|
2023-06-26 17:27:32 +02:00
|
|
|
import 'package:permission_handler/permission_handler.dart';
|
2022-02-03 18:06:44 +02:00
|
|
|
import 'package:photo_manager/photo_manager.dart';
|
2022-06-18 14:36:58 +02:00
|
|
|
import 'package:cancellation_token_http/http.dart' as http;
|
2023-07-12 05:56:30 +02:00
|
|
|
import 'package:path/path.dart' as p;
|
2022-02-03 18:06:44 +02:00
|
|
|
|
2022-07-13 14:23:48 +02:00
|
|
|
final backupServiceProvider = Provider(
|
|
|
|
(ref) => BackupService(
|
|
|
|
ref.watch(apiServiceProvider),
|
2023-03-18 16:55:11 +02:00
|
|
|
ref.watch(dbProvider),
|
2023-12-07 17:53:15 +02:00
|
|
|
ref.watch(appSettingsServiceProvider),
|
2022-07-13 14:23:48 +02:00
|
|
|
),
|
|
|
|
);
|
2022-06-25 20:46:51 +02:00
|
|
|
|
2022-02-03 18:06:44 +02:00
|
|
|
class BackupService {
|
2023-01-31 00:00:03 +02:00
|
|
|
final httpClient = http.Client();
|
2022-07-13 14:23:48 +02:00
|
|
|
final ApiService _apiService;
|
2023-03-18 16:55:11 +02:00
|
|
|
final Isar _db;
|
2023-06-26 17:27:32 +02:00
|
|
|
final Logger _log = Logger("BackupService");
|
2023-12-07 17:53:15 +02:00
|
|
|
final AppSettingsService _appSetting;
|
2022-08-03 07:04:34 +02:00
|
|
|
|
2023-12-07 17:53:15 +02:00
|
|
|
BackupService(this._apiService, this._db, this._appSetting);
|
2022-07-06 23:12:55 +02:00
|
|
|
|
2022-07-13 14:23:48 +02:00
|
|
|
Future<List<String>?> getDeviceBackupAsset() async {
|
2023-03-23 03:36:44 +02:00
|
|
|
final String deviceId = Store.get(StoreKey.deviceId);
|
2022-07-06 23:12:55 +02:00
|
|
|
|
|
|
|
try {
|
2024-01-02 02:02:30 +02:00
|
|
|
return await _apiService.assetApi.getAllUserAssetsByDeviceId(deviceId);
|
2022-07-06 23:12:55 +02:00
|
|
|
} catch (e) {
|
2022-07-13 14:23:48 +02:00
|
|
|
debugPrint('Error [getDeviceBackupAsset] ${e.toString()}');
|
|
|
|
return null;
|
2022-07-06 23:12:55 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-03-18 16:55:11 +02:00
|
|
|
Future<void> _saveDuplicatedAssetIds(List<String> deviceAssetIds) {
|
|
|
|
final duplicates = deviceAssetIds.map((id) => DuplicatedAsset(id)).toList();
|
|
|
|
return _db.writeTxn(() => _db.duplicatedAssets.putAll(duplicates));
|
2022-10-25 16:51:03 +02:00
|
|
|
}
|
|
|
|
|
2023-03-18 16:55:11 +02:00
|
|
|
/// Get duplicated asset id from database
|
|
|
|
Future<Set<String>> getDuplicatedAssetIds() async {
|
|
|
|
final duplicates = await _db.duplicatedAssets.where().findAll();
|
|
|
|
return duplicates.map((e) => e.id).toSet();
|
2022-10-25 16:51:03 +02:00
|
|
|
}
|
|
|
|
|
2023-03-18 16:55:11 +02:00
|
|
|
QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
|
|
|
|
selectedAlbumsQuery() =>
|
|
|
|
_db.backupAlbums.filter().selectionEqualTo(BackupSelection.select);
|
|
|
|
QueryBuilder<BackupAlbum, BackupAlbum, QAfterFilterCondition>
|
|
|
|
excludedAlbumsQuery() =>
|
|
|
|
_db.backupAlbums.filter().selectionEqualTo(BackupSelection.exclude);
|
|
|
|
|
2022-08-21 18:29:24 +02:00
|
|
|
/// Returns all assets newer than the last successful backup per album
|
|
|
|
Future<List<AssetEntity>> buildUploadCandidates(
|
2023-03-18 16:55:11 +02:00
|
|
|
List<BackupAlbum> selectedBackupAlbums,
|
|
|
|
List<BackupAlbum> excludedBackupAlbums,
|
2022-08-18 16:41:59 +02:00
|
|
|
) async {
|
|
|
|
final filter = FilterOptionGroup(
|
|
|
|
containsPathModified: true,
|
|
|
|
orders: [const OrderOption(type: OrderOptionType.updateDate)],
|
2023-02-04 22:42:42 +02:00
|
|
|
// title is needed to create Assets
|
|
|
|
imageOption: const FilterOption(needTitle: true),
|
|
|
|
videoOption: const FilterOption(needTitle: true),
|
2022-08-18 16:41:59 +02:00
|
|
|
);
|
|
|
|
final now = DateTime.now();
|
|
|
|
final List<AssetPathEntity?> selectedAlbums =
|
2023-03-18 16:55:11 +02:00
|
|
|
await _loadAlbumsWithTimeFilter(selectedBackupAlbums, filter, now);
|
2022-08-18 16:41:59 +02:00
|
|
|
if (selectedAlbums.every((e) => e == null)) {
|
|
|
|
return [];
|
|
|
|
}
|
|
|
|
final int allIdx = selectedAlbums.indexWhere((e) => e != null && e.isAll);
|
|
|
|
if (allIdx != -1) {
|
|
|
|
final List<AssetPathEntity?> excludedAlbums =
|
2023-03-18 16:55:11 +02:00
|
|
|
await _loadAlbumsWithTimeFilter(excludedBackupAlbums, filter, now);
|
2022-08-18 16:41:59 +02:00
|
|
|
final List<AssetEntity> toAdd = await _fetchAssetsAndUpdateLastBackup(
|
|
|
|
selectedAlbums.slice(allIdx, allIdx + 1),
|
2023-03-18 16:55:11 +02:00
|
|
|
selectedBackupAlbums.slice(allIdx, allIdx + 1),
|
2022-08-18 16:41:59 +02:00
|
|
|
now,
|
|
|
|
);
|
|
|
|
final List<AssetEntity> toRemove = await _fetchAssetsAndUpdateLastBackup(
|
|
|
|
excludedAlbums,
|
2023-03-18 16:55:11 +02:00
|
|
|
excludedBackupAlbums,
|
2022-08-18 16:41:59 +02:00
|
|
|
now,
|
|
|
|
);
|
|
|
|
return toAdd.toSet().difference(toRemove.toSet()).toList();
|
|
|
|
} else {
|
|
|
|
return await _fetchAssetsAndUpdateLastBackup(
|
|
|
|
selectedAlbums,
|
2023-03-18 16:55:11 +02:00
|
|
|
selectedBackupAlbums,
|
2022-08-18 16:41:59 +02:00
|
|
|
now,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Future<List<AssetPathEntity?>> _loadAlbumsWithTimeFilter(
|
2023-03-18 16:55:11 +02:00
|
|
|
List<BackupAlbum> albums,
|
2022-08-18 16:41:59 +02:00
|
|
|
FilterOptionGroup filter,
|
|
|
|
DateTime now,
|
|
|
|
) async {
|
2023-03-18 16:55:11 +02:00
|
|
|
List<AssetPathEntity?> result = [];
|
|
|
|
for (BackupAlbum a in albums) {
|
2022-08-18 16:41:59 +02:00
|
|
|
try {
|
|
|
|
final AssetPathEntity album =
|
|
|
|
await AssetPathEntity.obtainPathFromProperties(
|
2023-03-18 16:55:11 +02:00
|
|
|
id: a.id,
|
2022-08-18 16:41:59 +02:00
|
|
|
optionGroup: filter.copyWith(
|
|
|
|
updateTimeCond: DateTimeCond(
|
|
|
|
// subtract 2 seconds to prevent missing assets due to rounding issues
|
2023-03-18 16:55:11 +02:00
|
|
|
min: a.lastBackup.subtract(const Duration(seconds: 2)),
|
2022-08-18 16:41:59 +02:00
|
|
|
max: now,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
maxDateTimeToNow: false,
|
|
|
|
);
|
2023-03-18 16:55:11 +02:00
|
|
|
result.add(album);
|
2022-08-18 16:41:59 +02:00
|
|
|
} on StateError {
|
|
|
|
// either there are no assets matching the filter criteria OR the album no longer exists
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
Future<List<AssetEntity>> _fetchAssetsAndUpdateLastBackup(
|
|
|
|
List<AssetPathEntity?> albums,
|
2023-03-18 16:55:11 +02:00
|
|
|
List<BackupAlbum> backupAlbums,
|
2022-08-18 16:41:59 +02:00
|
|
|
DateTime now,
|
|
|
|
) async {
|
|
|
|
List<AssetEntity> result = [];
|
|
|
|
for (int i = 0; i < albums.length; i++) {
|
|
|
|
final AssetPathEntity? a = albums[i];
|
2023-03-18 16:55:11 +02:00
|
|
|
if (a != null &&
|
|
|
|
a.lastModified?.isBefore(backupAlbums[i].lastBackup) != true) {
|
2022-09-18 23:11:24 +02:00
|
|
|
result.addAll(
|
|
|
|
await a.getAssetListRange(start: 0, end: await a.assetCountAsync),
|
|
|
|
);
|
2023-03-18 16:55:11 +02:00
|
|
|
backupAlbums[i].lastBackup = now;
|
2022-08-18 16:41:59 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2022-08-21 18:29:24 +02:00
|
|
|
/// Returns a new list of assets not yet uploaded
|
|
|
|
Future<List<AssetEntity>> removeAlreadyUploadedAssets(
|
2022-08-18 16:41:59 +02:00
|
|
|
List<AssetEntity> candidates,
|
|
|
|
) async {
|
2022-10-25 16:51:03 +02:00
|
|
|
if (candidates.isEmpty) {
|
|
|
|
return candidates;
|
|
|
|
}
|
2023-03-18 16:55:11 +02:00
|
|
|
final Set<String> duplicatedAssetIds = await getDuplicatedAssetIds();
|
2022-10-25 16:51:03 +02:00
|
|
|
candidates = duplicatedAssetIds.isEmpty
|
|
|
|
? candidates
|
|
|
|
: candidates
|
|
|
|
.whereNot((asset) => duplicatedAssetIds.contains(asset.id))
|
|
|
|
.toList();
|
|
|
|
if (candidates.isEmpty) {
|
|
|
|
return candidates;
|
|
|
|
}
|
|
|
|
final Set<String> existing = {};
|
|
|
|
try {
|
2023-03-23 03:36:44 +02:00
|
|
|
final String deviceId = Store.get(StoreKey.deviceId);
|
2022-10-25 16:51:03 +02:00
|
|
|
final CheckExistingAssetsResponseDto? duplicates =
|
|
|
|
await _apiService.assetApi.checkExistingAssets(
|
|
|
|
CheckExistingAssetsDto(
|
|
|
|
deviceAssetIds: candidates.map((e) => e.id).toList(),
|
|
|
|
deviceId: deviceId,
|
2022-08-18 16:41:59 +02:00
|
|
|
),
|
|
|
|
);
|
2022-10-25 16:51:03 +02:00
|
|
|
if (duplicates != null) {
|
|
|
|
existing.addAll(duplicates.existingIds);
|
|
|
|
}
|
|
|
|
} on ApiException {
|
|
|
|
// workaround for older server versions or when checking for too many assets at once
|
2022-08-18 16:41:59 +02:00
|
|
|
final List<String>? allAssetsInDatabase = await getDeviceBackupAsset();
|
2022-10-25 16:51:03 +02:00
|
|
|
if (allAssetsInDatabase != null) {
|
|
|
|
existing.addAll(allAssetsInDatabase);
|
2022-08-18 16:41:59 +02:00
|
|
|
}
|
|
|
|
}
|
2022-10-25 16:51:03 +02:00
|
|
|
return existing.isEmpty
|
|
|
|
? candidates
|
|
|
|
: candidates.whereNot((e) => existing.contains(e.id)).toList();
|
2022-08-18 16:41:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Future<bool> backupAsset(
|
|
|
|
Iterable<AssetEntity> assetList,
|
2022-07-06 23:12:55 +02:00
|
|
|
http.CancellationToken cancelToken,
|
2023-12-10 17:56:39 +02:00
|
|
|
PMProgressHandler? pmProgressHandler,
|
2022-10-25 16:51:03 +02:00
|
|
|
Function(String, String, bool) uploadSuccessCb,
|
2022-07-06 23:12:55 +02:00
|
|
|
Function(int, int) uploadProgressCb,
|
|
|
|
Function(CurrentUploadAsset) setCurrentUploadAssetCb,
|
2023-09-13 05:50:16 +02:00
|
|
|
Function(ErrorUploadAsset) errorCb, {
|
|
|
|
bool sortAssets = false,
|
|
|
|
}) async {
|
2023-12-07 17:53:15 +02:00
|
|
|
final bool isIgnoreIcloudAssets =
|
|
|
|
_appSetting.getSetting(AppSettingsEnum.ignoreIcloudAssets);
|
|
|
|
|
2023-06-26 17:27:32 +02:00
|
|
|
if (Platform.isAndroid &&
|
|
|
|
!(await Permission.accessMediaLocation.status).isGranted) {
|
|
|
|
// double check that permission is granted here, to guard against
|
|
|
|
// uploading corrupt assets without EXIF information
|
|
|
|
_log.warning("Media location permission is not granted. "
|
|
|
|
"Cannot access original assets for backup.");
|
|
|
|
return false;
|
|
|
|
}
|
2023-03-23 03:36:44 +02:00
|
|
|
final String deviceId = Store.get(StoreKey.deviceId);
|
|
|
|
final String savedEndpoint = Store.get(StoreKey.serverEndpoint);
|
2022-08-18 16:41:59 +02:00
|
|
|
bool anyErrors = false;
|
2022-10-25 16:51:03 +02:00
|
|
|
final List<String> duplicatedAssetIds = [];
|
2022-02-03 18:06:44 +02:00
|
|
|
|
2023-09-11 12:31:15 +02:00
|
|
|
// DON'T KNOW WHY BUT THIS HELPS BACKGROUND BACKUP TO WORK ON IOS
|
2023-09-19 11:39:54 +02:00
|
|
|
if (Platform.isIOS) {
|
|
|
|
await PhotoManager.requestPermissionExtend();
|
|
|
|
}
|
2023-09-11 12:31:15 +02:00
|
|
|
|
2023-09-13 05:50:16 +02:00
|
|
|
List<AssetEntity> assetsToUpload = sortAssets
|
|
|
|
// Upload images before video assets
|
|
|
|
// these are further sorted by using their creation date
|
|
|
|
? assetList.sorted(
|
|
|
|
(a, b) {
|
|
|
|
final cmp = a.typeInt - b.typeInt;
|
|
|
|
if (cmp != 0) return cmp;
|
|
|
|
return a.createDateTime.compareTo(b.createDateTime);
|
|
|
|
},
|
|
|
|
)
|
|
|
|
: assetList.toList();
|
|
|
|
|
|
|
|
for (var entity in assetsToUpload) {
|
2023-12-12 19:36:37 +02:00
|
|
|
File? file;
|
|
|
|
File? livePhotoFile;
|
|
|
|
|
2022-02-03 18:06:44 +02:00
|
|
|
try {
|
2023-12-12 04:20:36 +02:00
|
|
|
final isAvailableLocally =
|
|
|
|
await entity.isLocallyAvailable(isOrigin: true);
|
2023-12-07 17:53:15 +02:00
|
|
|
|
|
|
|
// Handle getting files from iCloud
|
|
|
|
if (!isAvailableLocally && Platform.isIOS) {
|
|
|
|
// Skip iCloud assets if the user has disabled this feature
|
|
|
|
if (isIgnoreIcloudAssets) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
setCurrentUploadAssetCb(
|
|
|
|
CurrentUploadAsset(
|
|
|
|
id: entity.id,
|
|
|
|
fileCreatedAt: entity.createDateTime.year == 1970
|
|
|
|
? entity.modifiedDateTime
|
|
|
|
: entity.createDateTime,
|
|
|
|
fileName: await entity.titleAsync,
|
|
|
|
fileType: _getAssetType(entity.type),
|
|
|
|
iCloudAsset: true,
|
|
|
|
),
|
|
|
|
);
|
|
|
|
|
|
|
|
file = await entity.loadFile(progressHandler: pmProgressHandler);
|
2023-12-12 04:20:36 +02:00
|
|
|
livePhotoFile = await entity.loadFile(
|
|
|
|
withSubtype: true,
|
|
|
|
progressHandler: pmProgressHandler,
|
|
|
|
);
|
2022-02-06 08:07:56 +02:00
|
|
|
} else {
|
2023-12-07 17:53:15 +02:00
|
|
|
if (entity.type == AssetType.video) {
|
|
|
|
file = await entity.originFile;
|
|
|
|
} else {
|
|
|
|
file = await entity.originFile.timeout(const Duration(seconds: 5));
|
2023-12-12 04:20:36 +02:00
|
|
|
if (entity.isLivePhoto) {
|
|
|
|
livePhotoFile = await entity.originFileWithSubtype
|
|
|
|
.timeout(const Duration(seconds: 5));
|
|
|
|
}
|
2023-12-07 17:53:15 +02:00
|
|
|
}
|
2022-02-06 08:07:56 +02:00
|
|
|
}
|
2022-02-03 18:06:44 +02:00
|
|
|
|
|
|
|
if (file != null) {
|
2022-08-18 23:27:08 +02:00
|
|
|
String originalFileName = await entity.titleAsync;
|
2022-06-18 14:36:58 +02:00
|
|
|
var fileStream = file.openRead();
|
|
|
|
var assetRawUploadData = http.MultipartFile(
|
|
|
|
"assetData",
|
|
|
|
fileStream,
|
|
|
|
file.lengthSync(),
|
2023-05-28 03:53:29 +02:00
|
|
|
filename: originalFileName,
|
2022-03-22 08:22:04 +02:00
|
|
|
);
|
2022-02-03 18:06:44 +02:00
|
|
|
|
2022-06-25 20:46:51 +02:00
|
|
|
var req = MultipartRequest(
|
2022-07-13 14:23:48 +02:00
|
|
|
'POST',
|
|
|
|
Uri.parse('$savedEndpoint/asset/upload'),
|
|
|
|
onProgress: ((bytes, totalBytes) =>
|
|
|
|
uploadProgressCb(bytes, totalBytes)),
|
|
|
|
);
|
2024-02-04 22:35:13 +02:00
|
|
|
req.headers["x-immich-user-token"] = Store.get(StoreKey.accessToken);
|
2023-03-28 20:41:55 +02:00
|
|
|
req.headers["Transfer-Encoding"] = "chunked";
|
2022-06-18 14:36:58 +02:00
|
|
|
|
|
|
|
req.fields['deviceAssetId'] = entity.id;
|
|
|
|
req.fields['deviceId'] = deviceId;
|
2023-09-11 12:31:15 +02:00
|
|
|
req.fields['fileCreatedAt'] =
|
|
|
|
entity.createDateTime.toUtc().toIso8601String();
|
2023-03-18 16:55:11 +02:00
|
|
|
req.fields['fileModifiedAt'] =
|
2023-08-25 06:08:19 +02:00
|
|
|
entity.modifiedDateTime.toUtc().toIso8601String();
|
2022-06-18 14:36:58 +02:00
|
|
|
req.fields['isFavorite'] = entity.isFavorite.toString();
|
|
|
|
req.fields['duration'] = entity.videoDuration.toString();
|
|
|
|
|
|
|
|
req.files.add(assetRawUploadData);
|
2022-03-22 08:22:04 +02:00
|
|
|
|
feat(mobile): Adds file upload progress stats (#7760)
* feat(mobile): Adds file upload progress stats: current upload file size uploaded, current file size and formatted bytes per second upload speed. Closes #7379
* chore(mobile): Fix stan issues
* chore(mobile): Remove non-'en-US' translations, as I saw on another PR review (just looking around) that localisation is done via Localizely and this was the instruction (to only provide the en-US localisation).
* fix(mobile): Provide boundary checks to ensure overflow issues are accounted for on erroneous upload speed calculation, sometimes the numbers received back from the upload handler can be a bit wild.
* fix(mobile): Some heuristic bug fixing. Whilst thinking what could trigger overflow issues or 'zero' readouts, left over values from the previous file may do that. So adding the last upload sent bytes to the values to be reset may help! The time isn't necessary, as the period/cycle is inconsequential in this circumstance, well it should be anyway.
* fix(mobile): Actually, in combination to the last commit, some more heuristic bug fixing. I was thinking it would be advantageous not to reset the update time, as it would trigger a quicker first upload speed calculation. However, I realised that could also cause the calculation to be incorrect on the first cycle as the period wouldn't align. Not really sure if it would be a big deal, but I'm taking wild guesses in the dark here. Again, some purely heuristic debugging as I can't re-produce the underlying issue. This is mainly just ensuring that the state is fully reset and is a known state at the beginning of each file as a common strategy to reduce issues.
* refactor(mobile): Move the UI for the file progress to underneath the progress bar, it makes more sense there than in the file information table which contains only static information pertaining to the file itself. Switching to a monospace font to keep the UI from jumping around as the numbers change.
* refactor(mobile): In order to have the UI always present an 'active' upload speed (as per the discussion on PR #7760), this stores the 'upload speeds' (capped at the latest 10) in a list and calculates the current upload speed as the average over them. This way the UI can always display a 'constant' upload speed during uploading, instead of starting a fresh when each file starts uploading. Limiting it to the 10 latest keeps the average somewhat recent and ensures some level of sensible memory allocation.
2024-03-14 22:15:22 +02:00
|
|
|
var fileSize = file.lengthSync();
|
|
|
|
|
2023-12-11 18:38:02 +02:00
|
|
|
if (entity.isLivePhoto) {
|
2023-12-12 04:20:36 +02:00
|
|
|
if (livePhotoFile != null) {
|
|
|
|
final livePhotoTitle = p.setExtension(
|
|
|
|
originalFileName,
|
|
|
|
p.extension(livePhotoFile.path),
|
|
|
|
);
|
|
|
|
final fileStream = livePhotoFile.openRead();
|
|
|
|
final livePhotoRawUploadData = http.MultipartFile(
|
|
|
|
"livePhotoData",
|
|
|
|
fileStream,
|
|
|
|
livePhotoFile.lengthSync(),
|
|
|
|
filename: livePhotoTitle,
|
|
|
|
);
|
2023-12-11 18:38:02 +02:00
|
|
|
req.files.add(livePhotoRawUploadData);
|
feat(mobile): Adds file upload progress stats (#7760)
* feat(mobile): Adds file upload progress stats: current upload file size uploaded, current file size and formatted bytes per second upload speed. Closes #7379
* chore(mobile): Fix stan issues
* chore(mobile): Remove non-'en-US' translations, as I saw on another PR review (just looking around) that localisation is done via Localizely and this was the instruction (to only provide the en-US localisation).
* fix(mobile): Provide boundary checks to ensure overflow issues are accounted for on erroneous upload speed calculation, sometimes the numbers received back from the upload handler can be a bit wild.
* fix(mobile): Some heuristic bug fixing. Whilst thinking what could trigger overflow issues or 'zero' readouts, left over values from the previous file may do that. So adding the last upload sent bytes to the values to be reset may help! The time isn't necessary, as the period/cycle is inconsequential in this circumstance, well it should be anyway.
* fix(mobile): Actually, in combination to the last commit, some more heuristic bug fixing. I was thinking it would be advantageous not to reset the update time, as it would trigger a quicker first upload speed calculation. However, I realised that could also cause the calculation to be incorrect on the first cycle as the period wouldn't align. Not really sure if it would be a big deal, but I'm taking wild guesses in the dark here. Again, some purely heuristic debugging as I can't re-produce the underlying issue. This is mainly just ensuring that the state is fully reset and is a known state at the beginning of each file as a common strategy to reduce issues.
* refactor(mobile): Move the UI for the file progress to underneath the progress bar, it makes more sense there than in the file information table which contains only static information pertaining to the file itself. Switching to a monospace font to keep the UI from jumping around as the numbers change.
* refactor(mobile): In order to have the UI always present an 'active' upload speed (as per the discussion on PR #7760), this stores the 'upload speeds' (capped at the latest 10) in a list and calculates the current upload speed as the average over them. This way the UI can always display a 'constant' upload speed during uploading, instead of starting a fresh when each file starts uploading. Limiting it to the 10 latest keeps the average somewhat recent and ensures some level of sensible memory allocation.
2024-03-14 22:15:22 +02:00
|
|
|
fileSize += livePhotoFile.lengthSync();
|
2023-12-12 04:20:36 +02:00
|
|
|
} else {
|
|
|
|
_log.warning(
|
|
|
|
"Failed to obtain motion part of the livePhoto - $originalFileName",
|
|
|
|
);
|
2023-12-11 18:38:02 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-07-06 23:12:55 +02:00
|
|
|
setCurrentUploadAssetCb(
|
|
|
|
CurrentUploadAsset(
|
|
|
|
id: entity.id,
|
2023-02-19 18:44:53 +02:00
|
|
|
fileCreatedAt: entity.createDateTime.year == 1970
|
2023-01-23 06:40:56 +02:00
|
|
|
? entity.modifiedDateTime
|
|
|
|
: entity.createDateTime,
|
2022-07-06 23:12:55 +02:00
|
|
|
fileName: originalFileName,
|
|
|
|
fileType: _getAssetType(entity.type),
|
feat(mobile): Adds file upload progress stats (#7760)
* feat(mobile): Adds file upload progress stats: current upload file size uploaded, current file size and formatted bytes per second upload speed. Closes #7379
* chore(mobile): Fix stan issues
* chore(mobile): Remove non-'en-US' translations, as I saw on another PR review (just looking around) that localisation is done via Localizely and this was the instruction (to only provide the en-US localisation).
* fix(mobile): Provide boundary checks to ensure overflow issues are accounted for on erroneous upload speed calculation, sometimes the numbers received back from the upload handler can be a bit wild.
* fix(mobile): Some heuristic bug fixing. Whilst thinking what could trigger overflow issues or 'zero' readouts, left over values from the previous file may do that. So adding the last upload sent bytes to the values to be reset may help! The time isn't necessary, as the period/cycle is inconsequential in this circumstance, well it should be anyway.
* fix(mobile): Actually, in combination to the last commit, some more heuristic bug fixing. I was thinking it would be advantageous not to reset the update time, as it would trigger a quicker first upload speed calculation. However, I realised that could also cause the calculation to be incorrect on the first cycle as the period wouldn't align. Not really sure if it would be a big deal, but I'm taking wild guesses in the dark here. Again, some purely heuristic debugging as I can't re-produce the underlying issue. This is mainly just ensuring that the state is fully reset and is a known state at the beginning of each file as a common strategy to reduce issues.
* refactor(mobile): Move the UI for the file progress to underneath the progress bar, it makes more sense there than in the file information table which contains only static information pertaining to the file itself. Switching to a monospace font to keep the UI from jumping around as the numbers change.
* refactor(mobile): In order to have the UI always present an 'active' upload speed (as per the discussion on PR #7760), this stores the 'upload speeds' (capped at the latest 10) in a list and calculates the current upload speed as the average over them. This way the UI can always display a 'constant' upload speed during uploading, instead of starting a fresh when each file starts uploading. Limiting it to the 10 latest keeps the average somewhat recent and ensures some level of sensible memory allocation.
2024-03-14 22:15:22 +02:00
|
|
|
fileSize: fileSize,
|
2023-12-07 17:53:15 +02:00
|
|
|
iCloudAsset: false,
|
2022-07-06 23:12:55 +02:00
|
|
|
),
|
|
|
|
);
|
|
|
|
|
2023-01-31 00:00:03 +02:00
|
|
|
var response =
|
|
|
|
await httpClient.send(req, cancellationToken: cancelToken);
|
2022-02-03 18:06:44 +02:00
|
|
|
|
2022-10-25 16:51:03 +02:00
|
|
|
if (response.statusCode == 200) {
|
|
|
|
// asset is a duplicate (already exists on the server)
|
|
|
|
duplicatedAssetIds.add(entity.id);
|
|
|
|
uploadSuccessCb(entity.id, deviceId, true);
|
|
|
|
} else if (response.statusCode == 201) {
|
|
|
|
// stored a new asset on the server
|
|
|
|
uploadSuccessCb(entity.id, deviceId, false);
|
2022-07-06 23:12:55 +02:00
|
|
|
} else {
|
|
|
|
var data = await response.stream.bytesToString();
|
|
|
|
var error = jsonDecode(data);
|
2024-01-17 04:08:31 +02:00
|
|
|
var errorMessage = error['message'] ?? error['error'];
|
2022-07-06 23:12:55 +02:00
|
|
|
|
|
|
|
debugPrint(
|
2022-07-13 14:23:48 +02:00
|
|
|
"Error(${error['statusCode']}) uploading ${entity.id} | $originalFileName | Created on ${entity.createDateTime} | ${error['error']}",
|
|
|
|
);
|
|
|
|
|
|
|
|
errorCb(
|
|
|
|
ErrorUploadAsset(
|
|
|
|
asset: entity,
|
|
|
|
id: entity.id,
|
2023-02-19 18:44:53 +02:00
|
|
|
fileCreatedAt: entity.createDateTime,
|
2022-07-13 14:23:48 +02:00
|
|
|
fileName: originalFileName,
|
|
|
|
fileType: _getAssetType(entity.type),
|
2024-01-17 04:08:31 +02:00
|
|
|
errorMessage: errorMessage,
|
2022-07-13 14:23:48 +02:00
|
|
|
),
|
|
|
|
);
|
2024-01-17 04:08:31 +02:00
|
|
|
|
|
|
|
if (errorMessage == "Quota has been exceeded!") {
|
|
|
|
anyErrors = true;
|
|
|
|
break;
|
|
|
|
}
|
2022-07-06 23:12:55 +02:00
|
|
|
continue;
|
2022-02-03 18:06:44 +02:00
|
|
|
}
|
|
|
|
}
|
2022-06-18 14:36:58 +02:00
|
|
|
} on http.CancelledException {
|
|
|
|
debugPrint("Backup was cancelled by the user");
|
2022-10-25 16:51:03 +02:00
|
|
|
anyErrors = true;
|
|
|
|
break;
|
2022-02-03 18:06:44 +02:00
|
|
|
} catch (e) {
|
|
|
|
debugPrint("ERROR backupAsset: ${e.toString()}");
|
2022-08-18 16:41:59 +02:00
|
|
|
anyErrors = true;
|
2022-02-03 18:06:44 +02:00
|
|
|
continue;
|
|
|
|
} finally {
|
|
|
|
if (Platform.isIOS) {
|
2023-12-18 17:54:42 +02:00
|
|
|
try {
|
|
|
|
await file?.delete();
|
|
|
|
await livePhotoFile?.delete();
|
|
|
|
} catch (e) {
|
|
|
|
debugPrint("ERROR deleting file: ${e.toString()}");
|
|
|
|
}
|
2022-02-03 18:06:44 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-10-25 16:51:03 +02:00
|
|
|
if (duplicatedAssetIds.isNotEmpty) {
|
2023-03-18 16:55:11 +02:00
|
|
|
await _saveDuplicatedAssetIds(duplicatedAssetIds);
|
2022-10-25 16:51:03 +02:00
|
|
|
}
|
2022-08-18 16:41:59 +02:00
|
|
|
return !anyErrors;
|
2022-02-03 18:06:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
String _getAssetType(AssetType assetType) {
|
|
|
|
switch (assetType) {
|
|
|
|
case AssetType.audio:
|
|
|
|
return "AUDIO";
|
|
|
|
case AssetType.image:
|
|
|
|
return "IMAGE";
|
|
|
|
case AssetType.video:
|
|
|
|
return "VIDEO";
|
|
|
|
case AssetType.other:
|
|
|
|
return "OTHER";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-06-18 14:36:58 +02:00
|
|
|
|
|
|
|
class MultipartRequest extends http.MultipartRequest {
|
|
|
|
/// Creates a new [MultipartRequest].
|
|
|
|
MultipartRequest(
|
2024-01-27 18:14:32 +02:00
|
|
|
super.method,
|
|
|
|
super.url, {
|
2022-06-18 14:36:58 +02:00
|
|
|
required this.onProgress,
|
2024-01-27 18:14:32 +02:00
|
|
|
});
|
2022-06-18 14:36:58 +02:00
|
|
|
|
|
|
|
final void Function(int bytes, int totalBytes) onProgress;
|
|
|
|
|
|
|
|
/// Freezes all mutable fields and returns a
|
|
|
|
/// single-subscription [http.ByteStream]
|
|
|
|
/// that will emit the request body.
|
|
|
|
@override
|
|
|
|
http.ByteStream finalize() {
|
|
|
|
final byteStream = super.finalize();
|
|
|
|
|
|
|
|
final total = contentLength;
|
|
|
|
var bytes = 0;
|
|
|
|
|
|
|
|
final t = StreamTransformer.fromHandlers(
|
|
|
|
handleData: (List<int> data, EventSink<List<int>> sink) {
|
|
|
|
bytes += data.length;
|
|
|
|
onProgress.call(bytes, total);
|
|
|
|
sink.add(data);
|
|
|
|
},
|
|
|
|
);
|
|
|
|
final stream = byteStream.transform(t);
|
|
|
|
return http.ByteStream(stream);
|
|
|
|
}
|
|
|
|
}
|