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

Merge pull request #635 from ente-io/logging_improvements

Browse source
This commit is contained in:
Vishnu Mohandas 2022-11-12 15:16:55 +05:30 committed by GitHub
parent 8805956c71 16beff3b0f
commit ab7b78576a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 80 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/events/event.dart
View file

@ -1,3 +1,3 @@
class Event {
String get reason => toString();
String get reason => '$runtimeType';
}

2
lib/events/files_updated_event.dart
View file

@ -15,7 +15,7 @@ class FilesUpdatedEvent extends Event {
});
@override
String get reason => '${toString()}{type: ${type.name}, "via": $source}';
String get reason => '$runtimeType{type: ${type.name}, "via": $source}';
}
enum EventType {

2
lib/events/force_reload_home_gallery_event.dart
View file

@ -6,5 +6,5 @@ class ForceReloadHomeGalleryEvent extends Event {
ForceReloadHomeGalleryEvent(this.message);
@override
String get reason => 'ForceReloadHomeGalleryEvent - $message';
String get reason => '$runtimeType - $message';
}

2
lib/events/local_photos_updated_event.dart
View file

@ -1,7 +1,7 @@
import 'package:photos/events/files_updated_event.dart';
class LocalPhotosUpdatedEvent extends FilesUpdatedEvent {
LocalPhotosUpdatedEvent(updatedFiles, {type, source})
LocalPhotosUpdatedEvent(updatedFiles, {type, required source})
: super(
updatedFiles,
type: type ?? EventType.addedOrUpdated,

9
lib/services/collections_service.dart
View file

@ -103,7 +103,12 @@ class CollectionsService {
if (collection.isDeleted) {
await _filesDB.deleteCollection(collection.id);
await setCollectionSyncTime(collection.id, null);
Bus.instance.fire(LocalPhotosUpdatedEvent(List<File>.empty()));
Bus.instance.fire(
LocalPhotosUpdatedEvent(
List<File>.empty(),
source: "syncCollectionDeleted",
),
);
}
// remove reference for incoming collections when unshared/deleted
if (collection.isDeleted && ownerID != collection?.owner?.id) {
@ -876,7 +881,7 @@ class CollectionsService {
await _filesDB.removeFromCollection(collectionID, params["fileIDs"]);
Bus.instance
.fire(CollectionUpdatedEvent(collectionID, files, "removeFrom"));
Bus.instance.fire(LocalPhotosUpdatedEvent(files));
Bus.instance.fire(LocalPhotosUpdatedEvent(files, source: "removeFrom"));
RemoteSyncService.instance.sync(silently: true).ignore();
}

18
lib/services/file_magic_service.dart
View file

@ -37,11 +37,21 @@ class FileMagicService {
if (visibility == visibilityVisible) {
// Force reload home gallery to pull in the now unarchived files
Bus.instance.fire(ForceReloadHomeGalleryEvent("unarchivedFiles"));
Bus.instance
.fire(LocalPhotosUpdatedEvent(files, type: EventType.unarchived));
Bus.instance.fire(
LocalPhotosUpdatedEvent(
files,
type: EventType.unarchived,
source: "vizChange",
),
);
} else {
Bus.instance
.fire(LocalPhotosUpdatedEvent(files, type: EventType.archived));
Bus.instance.fire(
LocalPhotosUpdatedEvent(
files,
type: EventType.archived,
source: "vizChange",
),
);
}
}

9
lib/services/local_sync_service.dart
View file

@ -232,7 +232,10 @@ class LocalSyncService {
);
if (hasAnyMappingChanged || hasUnsyncedFiles) {
Bus.instance.fire(
LocalPhotosUpdatedEvent(localDiffResult.uniqueLocalFiles),
LocalPhotosUpdatedEvent(
localDiffResult.uniqueLocalFiles,
source: "syncAllChange",
),
);
}
_logger.info("syncAll took ${stopwatch.elapsed.inMilliseconds}ms ");
@ -359,7 +362,9 @@ class LocalSyncService {
conflictAlgorithm: ConflictAlgorithm.ignore,
);
_logger.info("Inserted " + files.length.toString() + " files.");
Bus.instance.fire(LocalPhotosUpdatedEvent(allFiles));
Bus.instance.fire(
LocalPhotosUpdatedEvent(allFiles, source: "loadedPhoto"),
);
}
await _prefs.setInt(kDbUpdationTimeKey, toTime);
}

4
lib/services/remote_sync_service.dart
View file

@ -354,7 +354,9 @@ class RemoteSyncService {
// remove all collectionIDs which are still marked for backup
oldCollectionIDsForAutoSync.removeAll(newCollectionIDsForAutoSync);
await removeFilesQueuedForUpload(oldCollectionIDsForAutoSync.toList());
Bus.instance.fire(LocalPhotosUpdatedEvent(<File>[]));
Bus.instance.fire(
LocalPhotosUpdatedEvent(<File>[], source: "deviceFolderSync"),
);
Bus.instance.fire(BackupFoldersUpdatedEvent());
}

2
lib/ui/tools/editor/image_editor_page.dart
View file

@ -360,7 +360,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
}
newFile.generatedID = await FilesDB.instance.insert(newFile);
await LocalSyncService.instance.trackEditedFile(newFile);
Bus.instance.fire(LocalPhotosUpdatedEvent([newFile]));
Bus.instance.fire(LocalPhotosUpdatedEvent([newFile], source: "editSave"));
SyncService.instance.sync();
showToast(context, "Edits saved");
_logger.info("Original file " + widget.originalFile.toString());

7
lib/ui/viewer/file/fading_app_bar.dart
View file

@ -458,7 +458,12 @@ class FadingAppBarState extends State<FadingAppBar> {
await IgnoredFilesService.instance.cacheAndInsert([ignoreVideoFile]);
file.localID = savedAsset.id;
await FilesDB.instance.insert(file);
Bus.instance.fire(LocalPhotosUpdatedEvent([file]));
Bus.instance.fire(
LocalPhotosUpdatedEvent(
[file],
source: "download",
),
);
} else if (!downloadLivePhotoOnDroid && savedAsset == null) {
_logger.severe('Failed to save assert of type $type');
}

1
lib/ui/viewer/file/thumbnail_widget.dart
View file

@ -176,6 +176,7 @@ class _ThumbnailWidgetState extends State<ThumbnailWidget> {
LocalPhotosUpdatedEvent(
[widget.file],
type: EventType.deletedFromDevice,
source: "thumbFileDeleted",
),
);
}

1
lib/ui/viewer/file/zoomable_image.dart
View file

@ -183,6 +183,7 @@ class _ZoomableImageState extends State<ZoomableImage>
LocalPhotosUpdatedEvent(
[_photo],
type: EventType.deletedFromDevice,
source: "zoomPreview",
),
);
}

16
lib/ui/viewer/gallery/gallery.dart
View file

@ -89,9 +89,16 @@ class _GalleryState extends State<Gallery> {
_itemScroller = ItemScrollController();
if (widget.reloadEvent != null) {
_reloadEventSubscription = widget.reloadEvent.listen((event) async {
_logger.info("Reloading ALL files on ${event.type.name} event");
// In soft refresh, setState is called for entire gallery only when
// number of child change
_logger.finest("Soft refresh all files on ${event.reason} ");
final result = await _loadFiles();
_onFilesLoaded(result.files);
final bool hasReloaded = _onFilesLoaded(result.files);
if (hasReloaded && kDebugMode) {
_logger.finest(
"Reloaded gallery on soft refresh all files on ${event.reason}",
);
}
});
}
_tabDoubleTapEvent =
@ -109,8 +116,7 @@ class _GalleryState extends State<Gallery> {
for (final event in widget.forceReloadEvents) {
_forceReloadEventSubscriptions.add(
event.listen((event) async {
_logger.info(event.reason);
_logger.finest("Force refresh all files on ${event.reason}");
final result = await _loadFiles();
_setFilesAndReload(result.files);
}),
@ -138,7 +144,7 @@ class _GalleryState extends State<Gallery> {
}
Future<FileLoadResult> _loadFiles({int limit}) async {
_logger.info("Loading files");
_logger.info("Loading ${limit ?? "all"} files");
try {
final startTime = DateTime.now().microsecondsSinceEpoch;
final result = await widget.asyncLoader(

15
lib/utils/delete_file_util.dart
View file

@ -126,6 +126,7 @@ Future<void> deleteFilesFromEverywhere(
LocalPhotosUpdatedEvent(
deletedFiles,
type: EventType.deletedFromEverywhere,
source: "deleteFilesEverywhere",
),
);
if (hasLocalOnlyFiles && Platform.isAndroid) {
@ -182,8 +183,13 @@ Future<void> deleteFilesFromRemoteOnly(
),
);
}
Bus.instance
.fire(LocalPhotosUpdatedEvent(files, type: EventType.deletedFromRemote));
Bus.instance.fire(
LocalPhotosUpdatedEvent(
files,
type: EventType.deletedFromRemote,
source: "deleteFromRemoteOnly",
),
);
SyncService.instance.sync();
await dialog.hide();
RemoteSyncService.instance.sync(silently: true);
@ -245,6 +251,7 @@ Future<void> deleteFilesOnDeviceOnly(
LocalPhotosUpdatedEvent(
deletedFiles,
type: EventType.deletedFromDevice,
source: "deleteFilesOnDeviceOnly",
),
);
}
@ -343,7 +350,9 @@ Future<bool> deleteLocalFiles(
final deletedFiles = await FilesDB.instance.getLocalFiles(deletedIDs);
await FilesDB.instance.deleteLocalFiles(deletedIDs);
_logger.info(deletedFiles.length.toString() + " files deleted locally");
Bus.instance.fire(LocalPhotosUpdatedEvent(deletedFiles));
Bus.instance.fire(
LocalPhotosUpdatedEvent(deletedFiles, source: "deleteLocal"),
);
return true;
} else {
showToast(context, "Could not free up space");

11
lib/utils/file_uploader.dart
View file

@ -448,7 +448,12 @@ class FileUploader {
await FilesDB.instance.update(remoteFile);
}
if (!_isBackground) {
Bus.instance.fire(LocalPhotosUpdatedEvent([remoteFile]));
Bus.instance.fire(
LocalPhotosUpdatedEvent(
[remoteFile],
source: "downloadComplete",
),
);
}
_logger.info("File upload complete for " + remoteFile.toString());
uploadCompleted = true;
@ -533,7 +538,8 @@ class FileUploader {
Bus.instance.fire(
LocalPhotosUpdatedEvent(
[fileToUpload],
type: EventType.deletedFromEverywhere, //
type: EventType.deletedFromEverywhere,
source: "sameLocalSameCollection", //
),
);
return Tuple2(true, sameLocalSameCollection);
@ -562,6 +568,7 @@ class FileUploader {
Bus.instance.fire(
LocalPhotosUpdatedEvent(
[fileToUpload],
source: "alreadyUploadedInSameCollection",
type: EventType.deletedFromEverywhere, //
),
);

7
test/utils/date_time_util_test.dart
View file

@ -31,10 +31,11 @@ void main() {
});
test("verify constants", () {
final date = DateTime.fromMicrosecondsSinceEpoch(jan011981Time);
expect(
jan011981Time,
DateTime(1981, 1, 1).toUtc().microsecondsSinceEpoch,
reason: "constant mismatch",
date.year == 1981 && date.month == 1,
true,
reason: "constant mismatch : ${date.toIso8601String()}",
);
});
}