瀏覽代碼

avoid adding config dependency inside db if possible

ashilkn 2 年之前
父節點
當前提交
db235cc9e8
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 1 3
      lib/db/files_db.dart
  2. 4 1
      lib/ui/settings/details_section_widget.dart

+ 1 - 3
lib/db/files_db.dart

@@ -6,7 +6,6 @@ import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:photos/core/configuration.dart';
 import 'package:photos/models/backup_status.dart';
 import 'package:photos/models/count_of_file_types.dart';
 import 'package:photos/models/file.dart';
@@ -1287,8 +1286,7 @@ class FilesDB {
     return deduplicatedFiles;
   }
 
-  Future<CountOfFileTypes> fetchPhotoAndVideoCount() async {
-    final userID = Configuration.instance.getUserID();
+  Future<CountOfFileTypes> fetchPhotoAndVideoCount(int userID) async {
     final db = await instance.database;
     final result = await db.rawQuery(
       "SELECT $columnFileType, COUNT(DISTINCT $columnUploadedFileID) FROM $filesTable WHERE $columnUploadedFileID != -1 AND $columnOwnerID == $userID GROUP BY $columnFileType",

+ 4 - 1
lib/ui/settings/details_section_widget.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:logging/logging.dart';
+import 'package:photos/core/configuration.dart';
 import 'package:photos/db/files_db.dart';
 import 'package:photos/models/count_of_file_types.dart';
 import 'package:photos/models/user_details.dart';
@@ -250,7 +251,9 @@ class _DetailsSectionWidgetState extends State<DetailsSectionWidget> {
                           ],
                         )
                       : FutureBuilder(
-                          future: FilesDB.instance.fetchPhotoAndVideoCount(),
+                          future: FilesDB.instance.fetchPhotoAndVideoCount(
+                            Configuration.instance.getUserID(),
+                          ),
                           builder: (context, snapshot) {
                             if (snapshot.hasData) {
                               final countOfFileTypes =