ソースを参照

Enable tag detection in file info (#1079)

Neeraj Gupta 2 年 前
コミット
0b624bee20

+ 3 - 3
lib/main.dart

@@ -187,9 +187,9 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
     });
     });
   }
   }
   FeatureFlagService.instance.init();
   FeatureFlagService.instance.init();
-  if (FeatureFlagService.instance.isInternalUserOrDebugBuild()) {
-    await ObjectDetectionService.instance.init();
-  }
+
+  unawaited(ObjectDetectionService.instance.init());
+
   _logger.info("Initialization done");
   _logger.info("Initialization done");
 }
 }
 
 

+ 5 - 0
lib/services/object_detection/object_detection_service.dart

@@ -21,6 +21,7 @@ class ObjectDetectionService {
   late IsolateUtils _isolateUtils;
   late IsolateUtils _isolateUtils;
 
 
   ObjectDetectionService._privateConstructor();
   ObjectDetectionService._privateConstructor();
+  bool inInitiated = false;
 
 
   Future<void> init() async {
   Future<void> init() async {
     _isolateUtils = IsolateUtils();
     _isolateUtils = IsolateUtils();
@@ -40,6 +41,7 @@ class ObjectDetectionService {
     } catch (e, s) {
     } catch (e, s) {
       _logger.severe("Could not initialize sceneclassifier", e, s);
       _logger.severe("Could not initialize sceneclassifier", e, s);
     }
     }
+    inInitiated = true;
   }
   }
 
 
   static ObjectDetectionService instance =
   static ObjectDetectionService instance =
@@ -47,6 +49,9 @@ class ObjectDetectionService {
 
 
   Future<List<String>> predict(Uint8List bytes) async {
   Future<List<String>> predict(Uint8List bytes) async {
     try {
     try {
+      if (!inInitiated) {
+        return Future.error("ObjectDetectionService init is not completed");
+      }
       final results = <String>{};
       final results = <String>{};
       results.addAll(await _getObjects(bytes));
       results.addAll(await _getObjects(bytes));
       results.addAll(await _getMobileNetResults(bytes));
       results.addAll(await _getMobileNetResults(bytes));

+ 7 - 7
lib/ui/viewer/file/file_details_widget.dart

@@ -6,7 +6,6 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/models/file.dart";
 import "package:photos/models/file.dart";
 import "package:photos/models/file_type.dart";
 import "package:photos/models/file_type.dart";
 import "package:photos/models/magic_metadata.dart";
 import "package:photos/models/magic_metadata.dart";
-import "package:photos/services/feature_flag_service.dart";
 import "package:photos/services/file_magic_service.dart";
 import "package:photos/services/file_magic_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
@@ -25,6 +24,7 @@ import "package:photos/utils/exif_util.dart";
 
 
 class FileDetailsWidget extends StatefulWidget {
 class FileDetailsWidget extends StatefulWidget {
   final File file;
   final File file;
+
   const FileDetailsWidget(
   const FileDetailsWidget(
     this.file, {
     this.file, {
     Key? key,
     Key? key,
@@ -175,12 +175,12 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
         )
         )
       ]);
       ]);
     }
     }
-    if (FeatureFlagService.instance.isInternalUserOrDebugBuild()) {
-      fileDetailsTiles.addAll([
-        ObjectsItemWidget(file),
-        const FileDetailsDivider(),
-      ]);
-    }
+
+    fileDetailsTiles.addAll([
+      ObjectsItemWidget(file),
+      const FileDetailsDivider(),
+    ]);
+
     if (file.uploadedFileID != null && file.updationTime != null) {
     if (file.uploadedFileID != null && file.updationTime != null) {
       fileDetailsTiles.addAll(
       fileDetailsTiles.addAll(
         [
         [

+ 1 - 1
pubspec.yaml

@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
 
-version: 0.7.47+447
+version: 0.7.51+451
 
 
 environment:
 environment:
   sdk: '>=2.17.0 <3.0.0'
   sdk: '>=2.17.0 <3.0.0'