PR updates

Author: angelosilvestre

lib/src/goldens/golden_scenes.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:flutter/rendering.dart';
@@ -23,10 +22,13 @@ GoldenCollection extractGoldenCollectionFromSceneFile(File file) {
   final scenePngBytes = file.readAsBytesSync();
 
   // Extract scene metadata from PNG.
-  final sceneMetadata = _extractGoldenSceneMetadataFromBytes(scenePngBytes);
-  if (sceneMetadata == null) {
+  final pngText = scenePngBytes.readTextMetadata();
+  final sceneJsonText = pngText["flutter_test_goldens"];
+  if (sceneJsonText == null) {
     throw Exception("Golden image is missing scene metadata: ${file.path}");
   }
+  final sceneJson = JsonDecoder().convert(sceneJsonText);
+  final sceneMetadata = GoldenSceneMetadata.fromJson(sceneJson);
 
   // Decode PNG data to an image.
   final sceneImage = decodePng(scenePngBytes);
@@ -82,31 +84,6 @@ Future<GoldenCollection> extractGoldenCollectionFromSceneWidgetTree(
   return _extractCollectionFromScene(sceneMetadata, treeImage);
 }
 
-/// Extracts then golden scene metadata within the given image [file].
-GoldenSceneMetadata extractGoldenSceneMetadataFromFile(File file) {
-  // Read the scene PNG data into memory.
-  final scenePngBytes = file.readAsBytesSync();
-
-  // Extract scene metadata from PNG.
-  final sceneMetadata = _extractGoldenSceneMetadataFromBytes(scenePngBytes);
-  if (sceneMetadata == null) {
-    throw Exception("Golden image is missing scene metadata: ${file.path}");
-  }
-
-  return sceneMetadata;
-}
-
-GoldenSceneMetadata? _extractGoldenSceneMetadataFromBytes(Uint8List pngBytes) {
-  // Extract scene metadata from PNG.
-  final pngText = pngBytes.readTextMetadata();
-  final sceneJsonText = pngText["flutter_test_goldens"];
-  if (sceneJsonText == null) {
-    return null;
-  }
-  final sceneJson = JsonDecoder().convert(sceneJsonText);
-  return GoldenSceneMetadata.fromJson(sceneJson);
-}
-
 GoldenCollection _extractCollectionFromScene(GoldenSceneMetadata sceneMetadata, Image sceneImage) {
   // Cut each golden image out of the scene.
   final goldenImages = <String, GoldenImage>{};

lib/src/scenes/gallery.dart

@@ -461,7 +461,16 @@ class Gallery {
       throw Exception("Can't compare goldens. Golden file doesn't exist: ${goldenFile.path}");
     }
     final goldenCollection = extractGoldenCollectionFromSceneFile(goldenFile);
-    final metadata = extractGoldenSceneMetadataFromFile(goldenFile);
+
+    // Extract scene metadata from the existing golden file.
+    final scenePngBytes = goldenFile.readAsBytesSync();
+    final pngText = scenePngBytes.readTextMetadata();
+    final sceneJsonText = pngText["flutter_test_goldens"];
+    if (sceneJsonText == null) {
+      throw Exception("Golden image is missing scene metadata: ${goldenFile.path}");
+    }
+    final sceneJson = JsonDecoder().convert(sceneJsonText);
+    final metadata = GoldenSceneMetadata.fromJson(sceneJson);
 
     // Extract scene metadata from the current widget tree.
     FtgLog.pipeline.fine("Extracting golden collection from current widget tree (screenshots).");