don't use version in the status cache

Author: vaind

scripts/flutter_symbol_collector/bin/flutter_symbol_collector.dart

@@ -63,7 +63,7 @@ Future<void> processFlutterVerion(FlutterVersion version) async {
   final archives = await source.listSymbolArchives(version);
   final dir = tempDir.childDirectory(version.tagName);
   for (final archive in archives) {
-    final status = await stateCache.getStatus(version, archive);
+    final status = await stateCache.getStatus(archive);
     if (status == SymbolArchiveStatus.success) {
       Logger.root
           .info('Skipping ${archive.path} - already processed successfully');
@@ -74,12 +74,11 @@ Future<void> processFlutterVerion(FlutterVersion version) async {
     try {
       if (await source.downloadAndExtractTo(archiveDir, archive.path)) {
         if (await collector.upload(archiveDir, archive.platform, version)) {
-          await stateCache.setStatus(
-              version, archive, SymbolArchiveStatus.success);
+          await stateCache.setStatus(archive, SymbolArchiveStatus.success);
           continue;
         }
       }
-      await stateCache.setStatus(version, archive, SymbolArchiveStatus.error);
+      await stateCache.setStatus(archive, SymbolArchiveStatus.error);
     } finally {
       if (await archiveDir.exists()) {
         await archiveDir.delete(recursive: true);

scripts/flutter_symbol_collector/lib/src/status_cache.dart

@@ -1,7 +1,6 @@
 import 'package:file/file.dart';
 import 'package:logging/logging.dart';
 
-import 'flutter_version.dart';
 import 'symbol_archive.dart';
 
 enum SymbolArchiveStatus {
@@ -17,10 +16,8 @@ enum SymbolArchiveStatus {
 
 /// Stores and retrieves information about symbol processing status.
 abstract class SymbolArchiveStatusCache {
-  Future<void> setStatus(FlutterVersion version, SymbolArchive archive,
-      SymbolArchiveStatus status);
-  Future<SymbolArchiveStatus> getStatus(
-      FlutterVersion version, SymbolArchive archive);
+  Future<void> setStatus(SymbolArchive archive, SymbolArchiveStatus status);
+  Future<SymbolArchiveStatus> getStatus(SymbolArchive archive);
 }
 
 /// Stores information about symbol processing status in a local directory.
@@ -31,13 +28,12 @@ class DirectoryStatusCache implements SymbolArchiveStatusCache {
     _dir.createSync(recursive: true);
   }
 
-  File _statusFile(FlutterVersion version, SymbolArchive archive) =>
-      _dir.childFile('${version.tagName}/${archive.path.toLowerCase()}.status');
+  File _statusFile(SymbolArchive archive) =>
+      _dir.childFile('${archive.path.toLowerCase()}.status');
 
   @override
-  Future<SymbolArchiveStatus> getStatus(
-      FlutterVersion version, SymbolArchive archive) async {
-    final file = _statusFile(version, archive);
+  Future<SymbolArchiveStatus> getStatus(SymbolArchive archive) async {
+    final file = _statusFile(archive);
     if (!await file.exists()) {
       return SymbolArchiveStatus.pending;
     }
@@ -55,9 +51,9 @@ class DirectoryStatusCache implements SymbolArchiveStatusCache {
   }
 
   @override
-  Future<void> setStatus(FlutterVersion version, SymbolArchive archive,
-      SymbolArchiveStatus status) async {
-    final file = _statusFile(version, archive);
+  Future<void> setStatus(
+      SymbolArchive archive, SymbolArchiveStatus status) async {
+    final file = _statusFile(archive);
     Logger.root.info('Setting ${file.path} status to ${status.name}');
     await file.create(recursive: true);
     await file.writeAsString(status.name);

scripts/flutter_symbol_collector/test/status_cache_test.dart

@@ -12,7 +12,6 @@ void main() {
   group('DirectoryStatusCache', () {
     late FileSystem fs;
     late SymbolArchiveStatusCache sut;
-    final version = FlutterVersion('1.2.3');
     final archive = SymbolArchive('path/to/archive.zip', LocalPlatform());
 
     setUp(() {
@@ -21,38 +20,24 @@ void main() {
     });
 
     test('retrieve unprocessed file', () async {
-      expect(
-          await sut.getStatus(version, archive), SymbolArchiveStatus.pending);
+      expect(await sut.getStatus(archive), SymbolArchiveStatus.pending);
     });
 
     test('store and retrieve error', () async {
-      await sut.setStatus(version, archive, SymbolArchiveStatus.error);
-      expect(await sut.getStatus(version, archive), SymbolArchiveStatus.error);
+      await sut.setStatus(archive, SymbolArchiveStatus.error);
+      expect(await sut.getStatus(archive), SymbolArchiveStatus.error);
     });
 
     test('store and retrieve success', () async {
-      await sut.setStatus(version, archive, SymbolArchiveStatus.success);
-      expect(
-          await sut.getStatus(version, archive), SymbolArchiveStatus.success);
+      await sut.setStatus(archive, SymbolArchiveStatus.success);
+      expect(await sut.getStatus(archive), SymbolArchiveStatus.success);
     });
 
     test('store, overwrite and retrieve', () async {
-      await sut.setStatus(version, archive, SymbolArchiveStatus.error);
-      expect(await sut.getStatus(version, archive), SymbolArchiveStatus.error);
-      await sut.setStatus(version, archive, SymbolArchiveStatus.success);
-      expect(
-          await sut.getStatus(version, archive), SymbolArchiveStatus.success);
-    });
-
-    test('various flutter versions are independent', () async {
-      await sut.setStatus(
-          FlutterVersion('1.2.3'), archive, SymbolArchiveStatus.success);
-      await sut.setStatus(
-          FlutterVersion('5.6.7'), archive, SymbolArchiveStatus.error);
-      expect(await sut.getStatus(FlutterVersion('1.2.3'), archive),
-          SymbolArchiveStatus.success);
-      expect(await sut.getStatus(FlutterVersion('5.6.7'), archive),
-          SymbolArchiveStatus.error);
+      await sut.setStatus(archive, SymbolArchiveStatus.error);
+      expect(await sut.getStatus(archive), SymbolArchiveStatus.error);
+      await sut.setStatus(archive, SymbolArchiveStatus.success);
+      expect(await sut.getStatus(archive), SymbolArchiveStatus.success);
     });
   });
 }