mirror of
https://github.com/immich-app/immich.git
synced 2024-12-24 10:37:28 +02:00
9bd79ffc00
* 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.
95 lines
2.5 KiB
Dart
95 lines
2.5 KiB
Dart
// ignore_for_file: public_member_api_docs, sort_constructors_first
|
|
import 'dart:convert';
|
|
|
|
class CurrentUploadAsset {
|
|
final String id;
|
|
final DateTime fileCreatedAt;
|
|
final String fileName;
|
|
final String fileType;
|
|
final int? fileSize;
|
|
final bool? iCloudAsset;
|
|
|
|
CurrentUploadAsset({
|
|
required this.id,
|
|
required this.fileCreatedAt,
|
|
required this.fileName,
|
|
required this.fileType,
|
|
this.fileSize,
|
|
this.iCloudAsset,
|
|
});
|
|
|
|
CurrentUploadAsset copyWith({
|
|
String? id,
|
|
DateTime? fileCreatedAt,
|
|
String? fileName,
|
|
String? fileType,
|
|
int? fileSize,
|
|
bool? iCloudAsset,
|
|
}) {
|
|
return CurrentUploadAsset(
|
|
id: id ?? this.id,
|
|
fileCreatedAt: fileCreatedAt ?? this.fileCreatedAt,
|
|
fileName: fileName ?? this.fileName,
|
|
fileType: fileType ?? this.fileType,
|
|
fileSize: fileSize ?? this.fileSize,
|
|
iCloudAsset: iCloudAsset ?? this.iCloudAsset,
|
|
);
|
|
}
|
|
|
|
Map<String, dynamic> toMap() {
|
|
return <String, dynamic>{
|
|
'id': id,
|
|
'fileCreatedAt': fileCreatedAt.millisecondsSinceEpoch,
|
|
'fileName': fileName,
|
|
'fileType': fileType,
|
|
'fileSize': fileSize,
|
|
'iCloudAsset': iCloudAsset,
|
|
};
|
|
}
|
|
|
|
factory CurrentUploadAsset.fromMap(Map<String, dynamic> map) {
|
|
return CurrentUploadAsset(
|
|
id: map['id'] as String,
|
|
fileCreatedAt:
|
|
DateTime.fromMillisecondsSinceEpoch(map['fileCreatedAt'] as int),
|
|
fileName: map['fileName'] as String,
|
|
fileType: map['fileType'] as String,
|
|
fileSize: map['fileSize'] as int,
|
|
iCloudAsset:
|
|
map['iCloudAsset'] != null ? map['iCloudAsset'] as bool : null,
|
|
);
|
|
}
|
|
|
|
String toJson() => json.encode(toMap());
|
|
|
|
factory CurrentUploadAsset.fromJson(String source) =>
|
|
CurrentUploadAsset.fromMap(json.decode(source) as Map<String, dynamic>);
|
|
|
|
@override
|
|
String toString() {
|
|
return 'CurrentUploadAsset(id: $id, fileCreatedAt: $fileCreatedAt, fileName: $fileName, fileType: $fileType, fileSize: $fileSize, iCloudAsset: $iCloudAsset)';
|
|
}
|
|
|
|
@override
|
|
bool operator ==(covariant CurrentUploadAsset other) {
|
|
if (identical(this, other)) return true;
|
|
|
|
return other.id == id &&
|
|
other.fileCreatedAt == fileCreatedAt &&
|
|
other.fileName == fileName &&
|
|
other.fileType == fileType &&
|
|
other.fileSize == fileSize &&
|
|
other.iCloudAsset == iCloudAsset;
|
|
}
|
|
|
|
@override
|
|
int get hashCode {
|
|
return id.hashCode ^
|
|
fileCreatedAt.hashCode ^
|
|
fileName.hashCode ^
|
|
fileType.hashCode ^
|
|
fileSize.hashCode ^
|
|
iCloudAsset.hashCode;
|
|
}
|
|
}
|