split metadata service

android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt

@@ -61,7 +61,8 @@ class MainActivity : FlutterActivity() {
         MethodChannel(messenger, GeocodingHandler.CHANNEL).setMethodCallHandler(GeocodingHandler(this))
         MethodChannel(messenger, GlobalSearchHandler.CHANNEL).setMethodCallHandler(GlobalSearchHandler(this))
         MethodChannel(messenger, MediaStoreHandler.CHANNEL).setMethodCallHandler(MediaStoreHandler(this))
-        MethodChannel(messenger, MetadataHandler.CHANNEL).setMethodCallHandler(MetadataHandler(this))
+        MethodChannel(messenger, MetadataEditHandler.CHANNEL).setMethodCallHandler(MetadataEditHandler(this))
+        MethodChannel(messenger, MetadataFetchHandler.CHANNEL).setMethodCallHandler(MetadataFetchHandler(this))
         MethodChannel(messenger, StorageHandler.CHANNEL).setMethodCallHandler(StorageHandler(this))
         MethodChannel(messenger, TimeHandler.CHANNEL).setMethodCallHandler(TimeHandler())
         MethodChannel(messenger, WindowHandler.CHANNEL).setMethodCallHandler(WindowHandler(this))

android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/ImageFileHandler.kt

@@ -10,7 +10,6 @@ import deckers.thibault.aves.channel.calls.fetchers.RegionFetcher
 import deckers.thibault.aves.channel.calls.fetchers.SvgRegionFetcher
 import deckers.thibault.aves.channel.calls.fetchers.ThumbnailFetcher
 import deckers.thibault.aves.channel.calls.fetchers.TiffRegionFetcher
-import deckers.thibault.aves.model.ExifOrientationOp
 import deckers.thibault.aves.model.FieldMap
 import deckers.thibault.aves.model.provider.ImageProvider.ImageOpCallback
 import deckers.thibault.aves.model.provider.ImageProviderFactory.getProvider
@@ -36,9 +35,6 @@ class ImageFileHandler(private val activity: Activity) : MethodCallHandler {
             "getRegion" -> GlobalScope.launch(Dispatchers.IO) { safeSuspend(call, result, ::getRegion) }
             "captureFrame" -> GlobalScope.launch(Dispatchers.IO) { safeSuspend(call, result, ::captureFrame) }
             "rename" -> GlobalScope.launch(Dispatchers.IO) { safeSuspend(call, result, ::rename) }
-            "rotate" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::rotate) }
-            "flip" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::flip) }
-            "editDate" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::editDate) }
             "clearSizedThumbnailDiskCache" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::clearSizedThumbnailDiskCache) }
             else -> result.notImplemented()
         }
@@ -194,78 +190,6 @@ class ImageFileHandler(private val activity: Activity) : MethodCallHandler {
         })
     }
 
-    private fun rotate(call: MethodCall, result: MethodChannel.Result) {
-        val clockwise = call.argument<Boolean>("clockwise")
-        if (clockwise == null) {
-            result.error("rotate-args", "failed because of missing arguments", null)
-            return
-        }
-
-        val op = if (clockwise) ExifOrientationOp.ROTATE_CW else ExifOrientationOp.ROTATE_CCW
-        editOrientation(call, result, op)
-    }
-
-    private fun flip(call: MethodCall, result: MethodChannel.Result) {
-        editOrientation(call, result, ExifOrientationOp.FLIP)
-    }
-
-    private fun editOrientation(call: MethodCall, result: MethodChannel.Result, op: ExifOrientationOp) {
-        val entryMap = call.argument<FieldMap>("entry")
-        if (entryMap == null) {
-            result.error("editOrientation-args", "failed because of missing arguments", null)
-            return
-        }
-
-        val uri = (entryMap["uri"] as String?)?.let { Uri.parse(it) }
-        val path = entryMap["path"] as String?
-        val mimeType = entryMap["mimeType"] as String?
-        if (uri == null || path == null || mimeType == null) {
-            result.error("editOrientation-args", "failed because entry fields are missing", null)
-            return
-        }
-
-        val provider = getProvider(uri)
-        if (provider == null) {
-            result.error("editOrientation-provider", "failed to find provider for uri=$uri", null)
-            return
-        }
-
-        provider.editOrientation(activity, path, uri, mimeType, op, object : ImageOpCallback {
-            override fun onSuccess(fields: FieldMap) = result.success(fields)
-            override fun onFailure(throwable: Throwable) = result.error("editOrientation-failure", "failed to change orientation", throwable.message)
-        })
-    }
-
-    private fun editDate(call: MethodCall, result: MethodChannel.Result) {
-        val dateMillis = call.argument<Number>("dateMillis")?.toLong()
-        val shiftMinutes = call.argument<Number>("shiftMinutes")?.toLong()
-        val fields = call.argument<List<String>>("fields")
-        val entryMap = call.argument<FieldMap>("entry")
-        if (entryMap == null || fields == null) {
-            result.error("editDate-args", "failed because of missing arguments", null)
-            return
-        }
-
-        val uri = (entryMap["uri"] as String?)?.let { Uri.parse(it) }
-        val path = entryMap["path"] as String?
-        val mimeType = entryMap["mimeType"] as String?
-        if (uri == null || path == null || mimeType == null) {
-            result.error("editDate-args", "failed because entry fields are missing", null)
-            return
-        }
-
-        val provider = getProvider(uri)
-        if (provider == null) {
-            result.error("editDate-provider", "failed to find provider for uri=$uri", null)
-            return
-        }
-
-        provider.editDate(activity, path, uri, mimeType, dateMillis, shiftMinutes, fields, object : ImageOpCallback {
-            override fun onSuccess(fields: FieldMap) = result.success(fields)
-            override fun onFailure(throwable: Throwable) = result.error("editDate-failure", "failed to edit date", throwable.message)
-        })
-    }
-
     private fun clearSizedThumbnailDiskCache(@Suppress("UNUSED_PARAMETER") call: MethodCall, result: MethodChannel.Result) {
         Glide.get(activity).clearDiskCache()
         result.success(null)

android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataEditHandler.kt

@@ -0,0 +1,102 @@
+package deckers.thibault.aves.channel.calls
+
+import android.app.Activity
+import android.net.Uri
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
+import deckers.thibault.aves.model.ExifOrientationOp
+import deckers.thibault.aves.model.FieldMap
+import deckers.thibault.aves.model.provider.ImageProvider.ImageOpCallback
+import deckers.thibault.aves.model.provider.ImageProviderFactory.getProvider
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
+class MetadataEditHandler(private val activity: Activity) : MethodCallHandler {
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        when (call.method) {
+            "rotate" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::rotate) }
+            "flip" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::flip) }
+            "editDate" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::editDate) }
+            else -> result.notImplemented()
+        }
+    }
+
+    private fun rotate(call: MethodCall, result: MethodChannel.Result) {
+        val clockwise = call.argument<Boolean>("clockwise")
+        if (clockwise == null) {
+            result.error("rotate-args", "failed because of missing arguments", null)
+            return
+        }
+
+        val op = if (clockwise) ExifOrientationOp.ROTATE_CW else ExifOrientationOp.ROTATE_CCW
+        editOrientation(call, result, op)
+    }
+
+    private fun flip(call: MethodCall, result: MethodChannel.Result) {
+        editOrientation(call, result, ExifOrientationOp.FLIP)
+    }
+
+    private fun editOrientation(call: MethodCall, result: MethodChannel.Result, op: ExifOrientationOp) {
+        val entryMap = call.argument<FieldMap>("entry")
+        if (entryMap == null) {
+            result.error("editOrientation-args", "failed because of missing arguments", null)
+            return
+        }
+
+        val uri = (entryMap["uri"] as String?)?.let { Uri.parse(it) }
+        val path = entryMap["path"] as String?
+        val mimeType = entryMap["mimeType"] as String?
+        if (uri == null || path == null || mimeType == null) {
+            result.error("editOrientation-args", "failed because entry fields are missing", null)
+            return
+        }
+
+        val provider = getProvider(uri)
+        if (provider == null) {
+            result.error("editOrientation-provider", "failed to find provider for uri=$uri", null)
+            return
+        }
+
+        provider.editOrientation(activity, path, uri, mimeType, op, object : ImageOpCallback {
+            override fun onSuccess(fields: FieldMap) = result.success(fields)
+            override fun onFailure(throwable: Throwable) = result.error("editOrientation-failure", "failed to change orientation", throwable.message)
+        })
+    }
+
+    private fun editDate(call: MethodCall, result: MethodChannel.Result) {
+        val dateMillis = call.argument<Number>("dateMillis")?.toLong()
+        val shiftMinutes = call.argument<Number>("shiftMinutes")?.toLong()
+        val fields = call.argument<List<String>>("fields")
+        val entryMap = call.argument<FieldMap>("entry")
+        if (entryMap == null || fields == null) {
+            result.error("editDate-args", "failed because of missing arguments", null)
+            return
+        }
+
+        val uri = (entryMap["uri"] as String?)?.let { Uri.parse(it) }
+        val path = entryMap["path"] as String?
+        val mimeType = entryMap["mimeType"] as String?
+        if (uri == null || path == null || mimeType == null) {
+            result.error("editDate-args", "failed because entry fields are missing", null)
+            return
+        }
+
+        val provider = getProvider(uri)
+        if (provider == null) {
+            result.error("editDate-provider", "failed to find provider for uri=$uri", null)
+            return
+        }
+
+        provider.editDate(activity, path, uri, mimeType, dateMillis, shiftMinutes, fields, object : ImageOpCallback {
+            override fun onSuccess(fields: FieldMap) = result.success(fields)
+            override fun onFailure(throwable: Throwable) = result.error("editDate-failure", "failed to edit date", throwable.message)
+        })
+    }
+
+    companion object {
+        const val CHANNEL = "deckers.thibault/aves/metadata_edit"
+    }
+}

android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt

@@ -70,7 +70,7 @@ import java.text.ParseException
 import java.util.*
 import kotlin.math.roundToLong
 
-class MetadataHandler(private val context: Context) : MethodCallHandler {
+class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when (call.method) {
             "getAllMetadata" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getAllMetadata) }
@@ -755,8 +755,8 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag<MetadataHandler>()
+        private val LOG_TAG = LogUtils.createTag<MetadataFetchHandler>()
-        const val CHANNEL = "deckers.thibault/aves/metadata"
+        const val CHANNEL = "deckers.thibault/aves/metadata_fetch"
 
         private val allMetadataRedundantDirNames = setOf(
             "MP4",

lib/image_providers/region_provider.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:math';
 import 'dart:ui' as ui show Codec;
 
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';

lib/image_providers/thumbnail_provider.dart

@@ -1,6 +1,6 @@
 import 'dart:ui' as ui show Codec;
 
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';

lib/image_providers/uri_image_provider.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:ui' as ui show Codec;
 
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';

lib/main.dart

@@ -1,6 +1,6 @@
 import 'dart:isolate';
 
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/aves_app.dart';
 import 'package:flutter/material.dart';
 

lib/model/covers.dart

@@ -1,7 +1,7 @@
 import 'package:aves/model/entry.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';

lib/model/entry.dart

@@ -10,10 +10,10 @@ import 'package:aves/model/multipage.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/video/metadata.dart';
 import 'package:aves/ref/mime_types.dart';
+import 'package:aves/services/common/service_policy.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/services/geocoding_service.dart';
-import 'package:aves/services/service_policy.dart';
+import 'package:aves/services/metadata/svg_metadata_service.dart';
-import 'package:aves/services/services.dart';
-import 'package:aves/services/svg_metadata_service.dart';
 import 'package:aves/theme/format.dart';
 import 'package:aves/utils/change_notifier.dart';
 import 'package:collection/collection.dart';
@@ -436,7 +436,7 @@ class AvesEntry {
         final fields = await VideoMetadataFormatter.getLoadingMetadata(this);
         await _applyNewFields(fields, persist: persist);
       }
-      catalogMetadata = await metadataService.getCatalogMetadata(this, background: background);
+      catalogMetadata = await metadataFetchService.getCatalogMetadata(this, background: background);
 
       if (isVideo && (catalogMetadata?.dateMillis ?? 0) == 0) {
         catalogMetadata = await VideoMetadataFormatter.getCatalogMetadata(this);
@@ -581,7 +581,7 @@ class AvesEntry {
   }
 
   Future<bool> rotate({required bool clockwise, required bool persist}) async {
-    final newFields = await imageFileService.rotate(this, clockwise: clockwise);
+    final newFields = await metadataEditService.rotate(this, clockwise: clockwise);
     if (newFields.isEmpty) return false;
 
     final oldDateModifiedSecs = dateModifiedSecs;
@@ -593,7 +593,7 @@ class AvesEntry {
   }
 
   Future<bool> flip({required bool persist}) async {
-    final newFields = await imageFileService.flip(this);
+    final newFields = await metadataEditService.flip(this);
     if (newFields.isEmpty) return false;
 
     final oldDateModifiedSecs = dateModifiedSecs;
@@ -605,7 +605,7 @@ class AvesEntry {
   }
 
   Future<bool> editDate(DateModifier modifier, {required bool persist}) async {
-    final newFields = await imageFileService.editDate(this, modifier);
+    final newFields = await metadataEditService.editDate(this, modifier);
     if (newFields.isEmpty) return false;
 
     await _applyNewFields(newFields, persist: persist);
@@ -696,7 +696,7 @@ class AvesEntry {
             .toList(),
       );
     } else {
-      return await metadataService.getMultiPageInfo(this);
+      return await metadataFetchService.getMultiPageInfo(this);
     }
   }
 

lib/model/favourites.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/widgets.dart';

lib/model/filters/album.dart

@@ -1,6 +1,6 @@
 import 'package:aves/image_providers/app_icon_image_provider.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/common/identity/aves_icons.dart';

lib/model/metadata_db.dart

@@ -7,7 +7,7 @@ import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/metadata/address.dart';
 import 'package:aves/model/metadata/catalog.dart';
 import 'package:aves/model/metadata_db_upgrade.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:sqflite/sqflite.dart';

lib/model/multipage.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/entry.dart';
 import 'package:aves/ref/mime_types.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 

lib/model/settings/screen_on.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:flutter/widgets.dart';
 

lib/model/settings/settings.dart

@@ -12,7 +12,7 @@ import 'package:aves/model/settings/map_style.dart';
 import 'package:aves/model/settings/screen_on.dart';
 import 'package:aves/model/source/enums.dart';
 import 'package:aves/services/device_service.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';

lib/model/source/album.dart

@@ -2,7 +2,7 @@ import 'package:aves/model/entry.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:collection/collection.dart';

lib/model/source/collection_source.dart

@@ -12,8 +12,8 @@ import 'package:aves/model/source/album.dart';
 import 'package:aves/model/source/enums.dart';
 import 'package:aves/model/source/location.dart';
 import 'package:aves/model/source/tag.dart';
-import 'package:aves/services/image_op_events.dart';
+import 'package:aves/services/common/image_op_events.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/foundation.dart';

lib/model/source/location.dart

@@ -6,7 +6,7 @@ import 'package:aves/model/filters/location.dart';
 import 'package:aves/model/metadata/address.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:tuple/tuple.dart';

lib/model/source/media_store_source.dart

@@ -7,7 +7,7 @@ import 'package:aves/model/favourites.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';

lib/model/source/tag.dart

@@ -3,7 +3,7 @@ import 'package:aves/model/filters/tag.dart';
 import 'package:aves/model/metadata/catalog.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 

lib/model/video/metadata.dart

@@ -10,7 +10,7 @@ import 'package:aves/model/video/profiles/h264.dart';
 import 'package:aves/model/video/profiles/hevc.dart';
 import 'package:aves/ref/languages.dart';
 import 'package:aves/ref/mp4.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/format.dart';
 import 'package:aves/utils/file_utils.dart';
 import 'package:aves/utils/math_utils.dart';

lib/services/android_app_service.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/math_utils.dart';
 import 'package:collection/collection.dart';

lib/services/android_debug_service.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/entry.dart';
 import 'package:aves/ref/mime_types.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/services.dart';
 
 class AndroidDebugService {

lib/services/app_shortcut_service.dart

@@ -2,7 +2,7 @@ import 'dart:typed_data';
 
 import 'package:aves/model/entry.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 

lib/services/common/services.dart

@@ -3,7 +3,8 @@ import 'package:aves/model/metadata_db.dart';
 import 'package:aves/services/embedded_data_service.dart';
 import 'package:aves/services/image_file_service.dart';
 import 'package:aves/services/media_store_service.dart';
-import 'package:aves/services/metadata_service.dart';
+import 'package:aves/services/metadata/metadata_edit_service.dart';
+import 'package:aves/services/metadata/metadata_fetch_service.dart';
 import 'package:aves/services/report_service.dart';
 import 'package:aves/services/storage_service.dart';
 import 'package:aves/services/time_service.dart';
@@ -20,7 +21,8 @@ final MetadataDb metadataDb = getIt<MetadataDb>();
 final EmbeddedDataService embeddedDataService = getIt<EmbeddedDataService>();
 final ImageFileService imageFileService = getIt<ImageFileService>();
 final MediaStoreService mediaStoreService = getIt<MediaStoreService>();
-final MetadataService metadataService = getIt<MetadataService>();
+final MetadataEditService metadataEditService = getIt<MetadataEditService>();
+final MetadataFetchService metadataFetchService = getIt<MetadataFetchService>();
 final ReportService reportService = getIt<ReportService>();
 final StorageService storageService = getIt<StorageService>();
 final TimeService timeService = getIt<TimeService>();
@@ -34,7 +36,8 @@ void initPlatformServices() {
   getIt.registerLazySingleton<EmbeddedDataService>(() => PlatformEmbeddedDataService());
   getIt.registerLazySingleton<ImageFileService>(() => PlatformImageFileService());
   getIt.registerLazySingleton<MediaStoreService>(() => PlatformMediaStoreService());
-  getIt.registerLazySingleton<MetadataService>(() => PlatformMetadataService());
+  getIt.registerLazySingleton<MetadataEditService>(() => PlatformMetadataEditService());
+  getIt.registerLazySingleton<MetadataFetchService>(() => PlatformMetadataFetchService());
   getIt.registerLazySingleton<ReportService>(() => CrashlyticsReportService());
   getIt.registerLazySingleton<StorageService>(() => PlatformStorageService());
   getIt.registerLazySingleton<TimeService>(() => PlatformTimeService());

lib/services/device_service.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/services.dart';
 
 class DeviceService {

lib/services/embedded_data_service.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/services.dart';
 
 abstract class EmbeddedDataService {

lib/services/geocoding_service.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:latlong2/latlong.dart';

lib/services/global_search.dart

@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/format.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';

lib/services/image_file_service.dart

@@ -4,13 +4,11 @@ import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:aves/model/entry.dart';
-import 'package:aves/model/metadata/date_modifier.dart';
-import 'package:aves/model/metadata/enums.dart';
 import 'package:aves/ref/mime_types.dart';
-import 'package:aves/services/image_op_events.dart';
+import 'package:aves/services/common/image_op_events.dart';
-import 'package:aves/services/output_buffer.dart';
+import 'package:aves/services/common/output_buffer.dart';
-import 'package:aves/services/service_policy.dart';
+import 'package:aves/services/common/service_policy.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:streams_channel/streams_channel.dart';
@@ -92,12 +90,6 @@ abstract class ImageFileService {
   });
 
   Future<Map<String, dynamic>> rename(AvesEntry entry, String newName);
-
-  Future<Map<String, dynamic>> rotate(AvesEntry entry, {required bool clockwise});
-
-  Future<Map<String, dynamic>> flip(AvesEntry entry);
-
-  Future<Map<String, dynamic>> editDate(AvesEntry entry, DateModifier modifier);
 }
 
 class PlatformImageFileService implements ImageFileService {
@@ -383,62 +375,4 @@ class PlatformImageFileService implements ImageFileService {
     }
     return {};
   }
-
-  @override
-  Future<Map<String, dynamic>> rotate(AvesEntry entry, {required bool clockwise}) async {
-    try {
-      // returns map with: 'rotationDegrees' 'isFlipped'
-      final result = await platform.invokeMethod('rotate', <String, dynamic>{
-        'entry': _toPlatformEntryMap(entry),
-        'clockwise': clockwise,
-      });
-      if (result != null) return (result as Map).cast<String, dynamic>();
-    } on PlatformException catch (e, stack) {
-      await reportService.recordError(e, stack);
-    }
-    return {};
-  }
-
-  @override
-  Future<Map<String, dynamic>> flip(AvesEntry entry) async {
-    try {
-      // returns map with: 'rotationDegrees' 'isFlipped'
-      final result = await platform.invokeMethod('flip', <String, dynamic>{
-        'entry': _toPlatformEntryMap(entry),
-      });
-      if (result != null) return (result as Map).cast<String, dynamic>();
-    } on PlatformException catch (e, stack) {
-      await reportService.recordError(e, stack);
-    }
-    return {};
-  }
-
-  @override
-  Future<Map<String, dynamic>> editDate(AvesEntry entry, DateModifier modifier) async {
-    try {
-      final result = await platform.invokeMethod('editDate', <String, dynamic>{
-        'entry': _toPlatformEntryMap(entry),
-        'dateMillis': modifier.dateTime?.millisecondsSinceEpoch,
-        'shiftMinutes': modifier.shiftMinutes,
-        'fields': modifier.fields.map(_toExifInterfaceTag).toList(),
-      });
-      if (result != null) return (result as Map).cast<String, dynamic>();
-    } on PlatformException catch (e, stack) {
-      await reportService.recordError(e, stack);
-    }
-    return {};
-  }
-
-  String _toExifInterfaceTag(MetadataField field) {
-    switch (field) {
-      case MetadataField.exifDate:
-        return 'DateTime';
-      case MetadataField.exifDateOriginal:
-        return 'DateTimeOriginal';
-      case MetadataField.exifDateDigitized:
-        return 'DateTimeDigitized';
-      case MetadataField.exifGpsDate:
-        return 'GPSDateStamp';
-    }
-  }
 }

lib/services/media_store_service.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/services.dart';
 import 'package:streams_channel/streams_channel.dart';
 

lib/services/metadata/metadata_edit_service.dart

@@ -0,0 +1,92 @@
+import 'dart:async';
+
+import 'package:aves/model/entry.dart';
+import 'package:aves/model/metadata/date_modifier.dart';
+import 'package:aves/model/metadata/enums.dart';
+import 'package:aves/services/common/services.dart';
+import 'package:flutter/services.dart';
+
+abstract class MetadataEditService {
+  Future<Map<String, dynamic>> rotate(AvesEntry entry, {required bool clockwise});
+
+  Future<Map<String, dynamic>> flip(AvesEntry entry);
+
+  Future<Map<String, dynamic>> editDate(AvesEntry entry, DateModifier modifier);
+}
+
+class PlatformMetadataEditService implements MetadataEditService {
+  static const platform = MethodChannel('deckers.thibault/aves/metadata_edit');
+
+  static Map<String, dynamic> _toPlatformEntryMap(AvesEntry entry) {
+    return {
+      'uri': entry.uri,
+      'path': entry.path,
+      'pageId': entry.pageId,
+      'mimeType': entry.mimeType,
+      'width': entry.width,
+      'height': entry.height,
+      'rotationDegrees': entry.rotationDegrees,
+      'isFlipped': entry.isFlipped,
+      'dateModifiedSecs': entry.dateModifiedSecs,
+      'sizeBytes': entry.sizeBytes,
+    };
+  }
+
+  @override
+  Future<Map<String, dynamic>> rotate(AvesEntry entry, {required bool clockwise}) async {
+    try {
+      // returns map with: 'rotationDegrees' 'isFlipped'
+      final result = await platform.invokeMethod('rotate', <String, dynamic>{
+        'entry': _toPlatformEntryMap(entry),
+        'clockwise': clockwise,
+      });
+      if (result != null) return (result as Map).cast<String, dynamic>();
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return {};
+  }
+
+  @override
+  Future<Map<String, dynamic>> flip(AvesEntry entry) async {
+    try {
+      // returns map with: 'rotationDegrees' 'isFlipped'
+      final result = await platform.invokeMethod('flip', <String, dynamic>{
+        'entry': _toPlatformEntryMap(entry),
+      });
+      if (result != null) return (result as Map).cast<String, dynamic>();
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return {};
+  }
+
+  @override
+  Future<Map<String, dynamic>> editDate(AvesEntry entry, DateModifier modifier) async {
+    try {
+      final result = await platform.invokeMethod('editDate', <String, dynamic>{
+        'entry': _toPlatformEntryMap(entry),
+        'dateMillis': modifier.dateTime?.millisecondsSinceEpoch,
+        'shiftMinutes': modifier.shiftMinutes,
+        'fields': modifier.fields.map(_toExifInterfaceTag).toList(),
+      });
+      if (result != null) return (result as Map).cast<String, dynamic>();
+    } on PlatformException catch (e, stack) {
+      await reportService.recordError(e, stack);
+    }
+    return {};
+  }
+
+  String _toExifInterfaceTag(MetadataField field) {
+    switch (field) {
+      case MetadataField.exifDate:
+        return 'DateTime';
+      case MetadataField.exifDateOriginal:
+        return 'DateTimeOriginal';
+      case MetadataField.exifDateDigitized:
+        return 'DateTimeDigitized';
+      case MetadataField.exifGpsDate:
+        return 'GPSDateStamp';
+    }
+  }
+}

lib/services/metadata/metadata_fetch_service.dart

@@ -3,12 +3,12 @@ import 'package:aves/model/metadata/catalog.dart';
 import 'package:aves/model/metadata/overlay.dart';
 import 'package:aves/model/multipage.dart';
 import 'package:aves/model/panorama.dart';
-import 'package:aves/services/service_policy.dart';
+import 'package:aves/services/common/service_policy.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
-abstract class MetadataService {
+abstract class MetadataFetchService {
   // returns Map<Map<Key, Value>> (map of directories, each directory being a map of metadata label and value description)
   Future<Map> getAllMetadata(AvesEntry entry);
 
@@ -25,8 +25,8 @@ abstract class MetadataService {
   Future<String?> getContentResolverProp(AvesEntry entry, String prop);
 }
 
-class PlatformMetadataService implements MetadataService {
+class PlatformMetadataFetchService implements MetadataFetchService {
-  static const platform = MethodChannel('deckers.thibault/aves/metadata');
+  static const platform = MethodChannel('deckers.thibault/aves/metadata_fetch');
 
   @override
   Future<Map> getAllMetadata(AvesEntry entry) async {

lib/services/metadata/svg_metadata_service.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/string_utils.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';

lib/services/storage_service.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:aves/services/output_buffer.dart';
+import 'package:aves/services/common/output_buffer.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';

lib/services/time_service.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/services.dart';
 
 abstract class TimeService {

lib/services/viewer_service.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/services.dart';
 
 class ViewerService {

lib/services/window_service.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 

lib/utils/android_file_utils.dart

@@ -1,5 +1,5 @@
 import 'package:aves/services/android_app_service.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/change_notifier.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:collection/collection.dart';

lib/widgets/about/bug_report.dart

@@ -4,7 +4,7 @@ import 'dart:typed_data';
 
 import 'package:aves/flutter_version.dart';
 import 'package:aves/ref/mime_types.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/constants.dart';
 import 'package:aves/widgets/common/action_mixins/feedback.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';

lib/widgets/about/update.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/constants.dart';
 import 'package:aves/widgets/about/news_badge.dart';
 import 'package:aves/widgets/common/basic/link_chip.dart';

lib/widgets/aves_app.dart

@@ -4,7 +4,7 @@ import 'package:aves/app_mode.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/media_store_source.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/theme/themes.dart';

lib/widgets/collection/entry_set_action_delegate.dart

@@ -9,8 +9,8 @@ import 'package:aves/model/selection.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/services/android_app_service.dart';
-import 'package:aves/services/image_op_events.dart';
+import 'package:aves/services/common/image_op_events.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/collection/collection_page.dart';

lib/widgets/common/action_mixins/permission_aware.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/dialogs/aves_dialog.dart';

lib/widgets/common/action_mixins/size_aware.dart

@@ -3,7 +3,7 @@ import 'dart:math';
 
 import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/collection_utils.dart';
 import 'package:aves/utils/file_utils.dart';

lib/widgets/common/behaviour/route_tracker.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/material.dart';
 
 class CrashlyticsRouteTracker extends NavigatorObserver {

lib/widgets/common/map/buttons.dart

@@ -2,7 +2,7 @@ import 'package:aves/model/settings/enums.dart';
 import 'package:aves/model/settings/map_style.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/android_app_service.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';

lib/widgets/common/map/geo_map.dart

@@ -4,7 +4,7 @@ import 'package:aves/model/entry.dart';
 import 'package:aves/model/settings/enums.dart';
 import 'package:aves/model/settings/map_style.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/utils/constants.dart';
 import 'package:aves/utils/math_utils.dart';

lib/widgets/common/thumbnail/image.dart

@@ -7,7 +7,7 @@ import 'package:aves/model/entry_images.dart';
 import 'package:aves/model/settings/entry_background.dart';
 import 'package:aves/model/settings/enums.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/fx/checkered_decoration.dart';
 import 'package:aves/widgets/common/fx/transition_image.dart';
 import 'package:aves/widgets/common/providers/media_query_data_provider.dart';

lib/widgets/debug/cache.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/file_utils.dart';
 import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:flutter/material.dart';

lib/widgets/debug/database.dart

@@ -3,7 +3,7 @@ import 'package:aves/model/entry.dart';
 import 'package:aves/model/favourites.dart';
 import 'package:aves/model/metadata/address.dart';
 import 'package:aves/model/metadata/catalog.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/file_utils.dart';
 import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:flutter/material.dart';

lib/widgets/debug/overlay.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/service_policy.dart';
+import 'package:aves/services/common/service_policy.dart';
 import 'package:flutter/material.dart';
 
 class DebugTaskQueueOverlay extends StatelessWidget {

lib/widgets/debug/report.dart

@@ -1,5 +1,5 @@
 import 'package:aves/services/android_debug_service.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/viewer/info/common.dart';
 import 'package:firebase_core/firebase_core.dart';

lib/widgets/debug/storage.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/file_utils.dart';
 import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';

lib/widgets/dialogs/create_album_dialog.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';

lib/widgets/dialogs/rename_album_dialog.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/dialogs/aves_dialog.dart';
 import 'package:flutter/material.dart';

lib/widgets/dialogs/rename_entry_dialog.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/drawer/app_drawer.dart

@@ -5,7 +5,7 @@ import 'package:aves/model/source/album.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/location.dart';
 import 'package:aves/model/source/tag.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/android_file_utils.dart';

lib/widgets/filter_grids/common/action_delegates/album_set.dart

@@ -8,8 +8,8 @@ import 'package:aves/model/highlight.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
-import 'package:aves/services/image_op_events.dart';
+import 'package:aves/services/common/image_op_events.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';

lib/widgets/home_page.dart

@@ -9,7 +9,7 @@ import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/services/global_search.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/services/viewer_service.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/collection/collection_page.dart';

lib/widgets/settings/privacy/access_grants.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/empty.dart';

lib/widgets/settings/privacy/hidden_paths.dart

@@ -1,7 +1,7 @@
 import 'package:aves/model/filters/path.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/empty.dart';

lib/widgets/settings/settings_page.dart

@@ -4,7 +4,7 @@ import 'dart:typed_data';
 import 'package:aves/model/actions/settings_actions.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/ref/mime_types.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/action_mixins/feedback.dart';

lib/widgets/settings/viewer/viewer.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/settings/enums.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/color_utils.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';

lib/widgets/viewer/debug/db.dart

@@ -1,7 +1,7 @@
 import 'package:aves/model/entry.dart';
 import 'package:aves/model/metadata/address.dart';
 import 'package:aves/model/metadata/catalog.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/viewer/info/common.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';

lib/widgets/viewer/embedded/embedded_data_opener.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:aves/model/entry.dart';
 import 'package:aves/ref/mime_types.dart';
 import 'package:aves/services/android_app_service.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/action_mixins/feedback.dart';
 import 'package:aves/widgets/common/behaviour/routes.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';

lib/widgets/viewer/entry_action_delegate.dart

@@ -11,8 +11,8 @@ import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/ref/mime_types.dart';
 import 'package:aves/services/android_app_service.dart';
-import 'package:aves/services/image_op_events.dart';
+import 'package:aves/services/common/image_op_events.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/collection/collection_page.dart';
 import 'package:aves/widgets/common/action_mixins/feedback.dart';

lib/widgets/viewer/entry_viewer_stack.dart

@@ -6,7 +6,7 @@ import 'package:aves/model/highlight.dart';
 import 'package:aves/model/settings/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/utils/change_notifier.dart';
 import 'package:aves/widgets/collection/collection_page.dart';

lib/widgets/viewer/info/basic_section.dart

@@ -7,7 +7,7 @@ import 'package:aves/model/filters/mime.dart';
 import 'package:aves/model/filters/tag.dart';
 import 'package:aves/model/filters/type.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/format.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/file_utils.dart';
@@ -148,8 +148,8 @@ class _OwnerPropState extends State<OwnerProp> {
     super.initState();
     final isMediaContent = entry.uri.startsWith('content://media/external/');
     if (isMediaContent) {
-      _ownerPackageFuture = metadataService.hasContentResolverProp(ownerPackageNamePropKey).then((exists) {
+      _ownerPackageFuture = metadataFetchService.hasContentResolverProp(ownerPackageNamePropKey).then((exists) {
-        return exists ? metadataService.getContentResolverProp(entry, ownerPackageNamePropKey) : SynchronousFuture(null);
+        return exists ? metadataFetchService.getContentResolverProp(entry, ownerPackageNamePropKey) : SynchronousFuture(null);
       });
     } else {
       _ownerPackageFuture = SynchronousFuture(null);

lib/widgets/viewer/info/location_section.dart

@@ -3,7 +3,7 @@ import 'package:aves/model/filters/location.dart';
 import 'package:aves/model/settings/coordinate_format.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';

lib/widgets/viewer/info/metadata/metadata_dir_tile.dart

@@ -2,7 +2,7 @@ import 'dart:collection';
 
 import 'package:aves/model/entry.dart';
 import 'package:aves/ref/brand_colors.dart';
-import 'package:aves/services/svg_metadata_service.dart';
+import 'package:aves/services/metadata/svg_metadata_service.dart';
 import 'package:aves/utils/color_utils.dart';
 import 'package:aves/utils/constants.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';

lib/widgets/viewer/info/metadata/metadata_section.dart

@@ -5,8 +5,8 @@ import 'package:aves/model/entry.dart';
 import 'package:aves/model/video/keys.dart';
 import 'package:aves/model/video/metadata.dart';
 import 'package:aves/ref/mime_types.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
-import 'package:aves/services/svg_metadata_service.dart';
+import 'package:aves/services/metadata/svg_metadata_service.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/color_utils.dart';
@@ -130,7 +130,7 @@ class _MetadataSectionSliverState extends State<MetadataSectionSliver> {
   }
 
   Future<void> _getMetadata() async {
-    final rawMetadata = await (entry.isSvg ? SvgMetadataService.getAllMetadata(entry) : metadataService.getAllMetadata(entry));
+    final rawMetadata = await (entry.isSvg ? SvgMetadataService.getAllMetadata(entry) : metadataFetchService.getAllMetadata(entry));
     final directories = rawMetadata.entries.map((dirKV) {
       var directoryName = dirKV.key as String;
 

lib/widgets/viewer/info/metadata/metadata_thumbnail.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/viewer/overlay/bottom/common.dart

@@ -5,7 +5,7 @@ import 'package:aves/model/metadata/overlay.dart';
 import 'package:aves/model/multipage.dart';
 import 'package:aves/model/settings/coordinate_format.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/format.dart';
 import 'package:aves/theme/icons.dart';
@@ -72,7 +72,7 @@ class _ViewerBottomOverlayState extends State<ViewerBottomOverlay> {
 
   void _initDetailLoader() {
     final requestEntry = entry;
-    _detailLoader = requestEntry != null ? metadataService.getOverlayMetadata(requestEntry) : SynchronousFuture(null);
+    _detailLoader = requestEntry != null ? metadataFetchService.getOverlayMetadata(requestEntry) : SynchronousFuture(null);
   }
 
   @override

lib/widgets/viewer/overlay/bottom/panorama.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:aves/model/entry.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/viewer/overlay/common.dart';
 import 'package:aves/widgets/viewer/panorama_page.dart';
@@ -26,7 +26,7 @@ class PanoramaOverlay extends StatelessWidget {
           scale: scale,
           buttonLabel: context.l10n.viewerOpenPanoramaButtonLabel,
           onPressed: () async {
-            final info = await metadataService.getPanoramaInfo(entry);
+            final info = await metadataFetchService.getPanoramaInfo(entry);
             if (info != null) {
               unawaited(Navigator.push(
                 context,

lib/widgets/viewer/printer.dart

@@ -3,7 +3,7 @@ import 'dart:convert';
 
 import 'package:aves/model/entry.dart';
 import 'package:aves/model/entry_images.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/action_mixins/feedback.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:flutter/widgets.dart';

lib/widgets/viewer/video_action_delegate.dart

@@ -4,7 +4,7 @@ import 'package:aves/model/actions/video_actions.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/highlight.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/collection/collection_page.dart';

test/fake/media_store_service.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/entry.dart';
 import 'package:aves/ref/mime_types.dart';
-import 'package:aves/services/image_op_events.dart';
+import 'package:aves/services/common/image_op_events.dart';
 import 'package:aves/services/media_store_service.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';

test/fake/metadata_fetch_service.dart

@@ -1,10 +1,10 @@
 import 'package:aves/model/entry.dart';
 import 'package:aves/model/metadata/catalog.dart';
-import 'package:aves/services/metadata_service.dart';
+import 'package:aves/services/metadata/metadata_fetch_service.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-class FakeMetadataService extends Fake implements MetadataService {
+class FakeMetadataFetchService extends Fake implements MetadataFetchService {
   @override
   Future<CatalogMetadata?> getCatalogMetadata(AvesEntry entry, {bool background = false}) => SynchronousFuture(null);
 }

test/model/collection_source_test.dart

@@ -10,8 +10,8 @@ import 'package:aves/model/source/enums.dart';
 import 'package:aves/model/source/media_store_source.dart';
 import 'package:aves/services/image_file_service.dart';
 import 'package:aves/services/media_store_service.dart';
-import 'package:aves/services/metadata_service.dart';
+import 'package:aves/services/metadata/metadata_fetch_service.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/services/storage_service.dart';
 import 'package:aves/services/time_service.dart';
 import 'package:aves/services/window_service.dart';
@@ -24,7 +24,7 @@ import '../fake/availability.dart';
 import '../fake/image_file_service.dart';
 import '../fake/media_store_service.dart';
 import '../fake/metadata_db.dart';
-import '../fake/metadata_service.dart';
+import '../fake/metadata_fetch_service.dart';
 import '../fake/storage_service.dart';
 import '../fake/time_service.dart';
 import '../fake/window_service.dart';
@@ -42,7 +42,7 @@ void main() {
 
     getIt.registerLazySingleton<ImageFileService>(() => FakeImageFileService());
     getIt.registerLazySingleton<MediaStoreService>(() => FakeMediaStoreService());
-    getIt.registerLazySingleton<MetadataService>(() => FakeMetadataService());
+    getIt.registerLazySingleton<MetadataFetchService>(() => FakeMetadataFetchService());
     getIt.registerLazySingleton<StorageService>(() => FakeStorageService());
     getIt.registerLazySingleton<TimeService>(() => FakeTimeService());
     getIt.registerLazySingleton<WindowService>(() => FakeWindowService());

test/utils/android_file_utils.dart

@@ -1,4 +1,4 @@
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/services/storage_service.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:path/path.dart' as p;

test_driver/app.dart

@@ -3,7 +3,7 @@ import 'dart:ui';
 import 'package:aves/main.dart' as app;
 import 'package:aves/model/settings/enums.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/services/services.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/services/storage_service.dart';
 import 'package:aves/services/window_service.dart';
 import 'package:flutter/foundation.dart';