Browse Source

Hide hidden collections from memories

Neeraj Gupta 3 years ago
parent
commit
03ea93f277
2 changed files with 8 additions and 2 deletions
  1. 3 1
      lib/db/files_db.dart
  2. 5 1
      lib/services/memories_service.dart

+ 3 - 1
lib/db/files_db.dart

@@ -580,6 +580,7 @@ class FilesDB {
 
 
   Future<List<File>> getFilesCreatedWithinDurations(
   Future<List<File>> getFilesCreatedWithinDurations(
     List<List<int>> durations,
     List<List<int>> durations,
+      Set<int> ignoredCollectionIDs,
   ) async {
   ) async {
     final db = await instance.database;
     final db = await instance.database;
     String whereClause = "";
     String whereClause = "";
@@ -598,7 +599,8 @@ class FilesDB {
       where: whereClause,
       where: whereClause,
       orderBy: '$columnCreationTime ASC',
       orderBy: '$columnCreationTime ASC',
     );
     );
-    return _convertToFiles(results);
+    final files = _convertToFiles(results);
+    return _deduplicatedAndFilterIgnoredFiles(files, ignoredCollectionIDs)
   }
   }
 
 
   Future<List<File>> getFilesToBeUploadedWithinFolders(
   Future<List<File>> getFilesToBeUploadedWithinFolders(

+ 5 - 1
lib/services/memories_service.dart

@@ -5,6 +5,7 @@ import 'package:photos/db/files_db.dart';
 import 'package:photos/db/memories_db.dart';
 import 'package:photos/db/memories_db.dart';
 import 'package:photos/models/filters/important_items_filter.dart';
 import 'package:photos/models/filters/important_items_filter.dart';
 import 'package:photos/models/memory.dart';
 import 'package:photos/models/memory.dart';
+import 'package:photos/services/collections_service.dart';
 
 
 class MemoriesService extends ChangeNotifier {
 class MemoriesService extends ChangeNotifier {
   final _logger = Logger("MemoryService");
   final _logger = Logger("MemoryService");
@@ -70,7 +71,10 @@ class MemoriesService extends ChangeNotifier {
           date.add(Duration(days: daysAfter)).microsecondsSinceEpoch;
           date.add(Duration(days: daysAfter)).microsecondsSinceEpoch;
       durations.add([startCreationTime, endCreationTime]);
       durations.add([startCreationTime, endCreationTime]);
     }
     }
-    final files = await _filesDB.getFilesCreatedWithinDurations(durations);
+    final archivedCollectionIds =
+        CollectionsService.instance.getArchivedCollections();
+    final files = await _filesDB.getFilesCreatedWithinDurations(
+        durations, archivedCollectionIds);
     final seenTimes = await _memoriesDB.getSeenTimes();
     final seenTimes = await _memoriesDB.getSeenTimes();
     final List<Memory> memories = [];
     final List<Memory> memories = [];
     final filter = ImportantItemsFilter();
     final filter = ImportantItemsFilter();