unify this to single function

fixes #143

Author: TheLastGimbus

lib/folder_classify.dart

@@ -6,36 +6,6 @@ import 'dart:io';
 import 'package:gpth/utils.dart';
 import 'package:path/path.dart' as p;
 
-/// if json indicates that photo was put in archive folder
-/// returns null if couldn't determine it (f.e. it's an album json)
-bool? jsonIsArchived(String jsonString) {
-  try {
-    final json = jsonDecode(jsonString);
-    if (json['photoTakenTime'] != null) {
-      return json['archived'] == true;
-    } else {
-      return null;
-    }
-  } catch (e) {
-    return null;
-  }
-}
-
-/// if json indicates that photo was trashed
-/// returns null if couldn't determine it (f.e. it's an album json)
-bool? jsonIsTrashed(String jsonString) {
-  try {
-    final json = jsonDecode(jsonString);
-    if (json['photoTakenTime'] != null) {
-      return json['trashed'] == true;
-    } else {
-      return null;
-    }
-  } catch (e) {
-    return null;
-  }
-}
-
 bool isYearFolder(Directory dir) =>
     p.basename(dir.path).startsWith('Photos from ');
 
@@ -45,42 +15,50 @@ Future<bool> isAlbumFolder(Directory dir) =>
 // Those two are so complicated because their names are 🥳localized🥳
 // Those silly lists are an attempt to sometimes make it faster 👍
 
-const _archiveNames = [
-  'Archive', // EN
-  'Archiwum', // PL
-];
-
-Future<bool> isArchiveFolder(Directory dir) async {
-  if (_archiveNames.contains(p.basename(dir.path))) return true;
+/// Goes through all .json files in given folder, and searches whether
+/// all of them have [key] key == true
+///
+/// You can also pass [helpNames] list - if folder is straight out named
+/// one of them, it returns true right away
+///
+/// This is only used to detect if folder is Archive/Trash
+Future<bool> _isXFolder(Directory dir, String key,
+    [List<String>? helpNames]) async {
+  assert(key == 'archived' || key == 'trashed');
+  if (helpNames?.contains(p.basename(dir.path)) ?? false) return true;
   var one = false; // there is at least one element (every() is true with empty)
   final logic = await dir
       .list()
       .whereType<File>()
       .where((e) => e.path.endsWith('.json'))
       .every((e) {
     one = true;
-    final a = jsonIsArchived(e.readAsStringSync());
-    return a != null && a;
+    try {
+      final json = jsonDecode(e.readAsStringSync());
+      if (json['photoTakenTime'] != null) {
+        return json[key] == true;
+      } else {
+        return false;
+      }
+    } catch (_) {
+      return false;
+    }
   });
   return one && logic;
 }
 
+const _archiveNames = [
+  'Archive', // EN
+  'Archiwum', // PL
+];
+
+Future<bool> isArchiveFolder(Directory dir) =>
+    _isXFolder(dir, 'archived', _archiveNames);
+
 const _trashNames = [
   'Trash', // EN
   'Kosz', // PL
 ];
 
-Future<bool> isTrashFolder(Directory dir) async {
-  if (_trashNames.contains(p.basename(dir.path))) return true;
-  var one = false; // there is at least one element (every() is true with empty)
-  final logic = await dir
-      .list()
-      .whereType<File>()
-      .where((e) => e.path.endsWith('.json'))
-      .every((e) {
-    one = true;
-    final t = jsonIsTrashed(e.readAsStringSync());
-    return t != null && t;
-  });
-  return one && logic;
-}
+Future<bool> isTrashFolder(Directory dir) =>
+    _isXFolder(dir, 'trashed', _trashNames);

test/gpth_test.dart

@@ -140,31 +140,19 @@ AQACEQMRAD8AIcgXf//Z""";
     test('test getDiskFree()', () async {
       expect(await getDiskFree('.'), isNotNull);
     });
-    test('test isArchived() and isTrashed() on jsons', () {
-      final normalJson = '''{ "title": "example.jpg",
-        "photoTakenTime": {"timestamp": "1663252650"},
-        "photoLastModifiedTime": {"timestamp": "1673339757"} 
-      }''';
-      final archivedJson = '''{ "title": "example.jpg",
-        "photoTakenTime": {"timestamp": "1663252650"},
-        "archived": true,
-        "photoLastModifiedTime": {"timestamp": "1673339757"} 
-      }''';
-      final trashedJson = '''{ "title": "example.jpg",
-        "photoTakenTime": {"timestamp": "1663252650"},
-        "trashed": true,
-        "photoLastModifiedTime": {"timestamp": "1673339757"} 
-      }''';
-      final albumJson =
-          '{"title": "Green", "description": "","access": "protected"}';
-      expect(jsonIsArchived(normalJson), false);
-      expect(jsonIsTrashed(normalJson), false);
-      expect(jsonIsArchived(archivedJson), true);
-      expect(jsonIsTrashed(archivedJson), false);
-      expect(jsonIsArchived(trashedJson), false);
-      expect(jsonIsTrashed(trashedJson), true);
-      expect(jsonIsArchived(albumJson), null);
-      expect(jsonIsTrashed(albumJson), null);
+  });
+  group('folder_classify test', () {
+    test('is archive/trash (fast name only)', () async {
+      expect(await isArchiveFolder(Directory('Takeout/Photos/Archive/')), true);
+      expect(await isArchiveFolder(Directory.current), false);
+      expect(
+        // you must do it because Dart 🤷
+        // https://github.com/flutter/flutter/issues/71183#issuecomment-882213036
+        () async => await isArchiveFolder(Directory('Photos/lol-album')),
+        throwsA(isA<FileSystemException>()),
+      );
+      expect(await isTrashFolder(Directory('Takeout/Photos/Trash')), true);
+      expect(await isTrashFolder(Directory.current), false);
     });
   });