Asset cache reworked

lib/components/canvas/canvas_image_dialog.dart

@@ -70,7 +70,7 @@ class _CanvasImageDialogState extends State<CanvasImageDialog> {
           switch (widget.image) {
             case PdfEditorImage image:
               if (!image.loadedIn) await image.loadIn();
-              bytes = image.pdfBytes!;
+              bytes = await image.assetCacheAll.getBytes(image.assetId);
             case SvgEditorImage image:
               bytes = switch (image.svgLoader) {
                 (SvgStringLoader loader) =>
@@ -80,15 +80,7 @@ class _CanvasImageDialogState extends State<CanvasImageDialog> {
                     image.svgLoader, 'svgLoader', 'Unknown SVG loader type'),
               };
             case PngEditorImage image:
-              if (image.imageProvider is MemoryImage) {
-                bytes = (image.imageProvider as MemoryImage).bytes;
-              } else if (image.imageProvider is FileImage) {
-                bytes =
-                    await (image.imageProvider as FileImage).file.readAsBytes();
-              } else {
-                throw ArgumentError.value(image.imageProvider, 'imageProvider',
-                    'Unknown image provider type');
-              }
+              bytes = await image.assetCacheAll.getBytes(image.assetId);
           }
           if (!context.mounted) return;
           FileManager.exportFile(imageFileName, bytes,

lib/components/canvas/image/editor_image.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:math';
@@ -33,7 +32,7 @@ sealed class EditorImage extends ChangeNotifier {
   /// This is used when "downloading" the image to the user's photo gallery.
   final String extension;
 
-  final AssetCache assetCache;
+  final AssetCacheAll assetCacheAll;
 
   bool _isThumbnail = false;
   bool get isThumbnail => _isThumbnail;
@@ -88,7 +87,7 @@ sealed class EditorImage extends ChangeNotifier {
   @protected
   EditorImage({
     required this.id,
-    required this.assetCache,
+    required this.assetCacheAll,
     required this.extension,
     required this.pageIndex,
     required this.pageSize,
@@ -112,7 +111,7 @@ sealed class EditorImage extends ChangeNotifier {
     required List<Uint8List>? inlineAssets,
     bool isThumbnail = false,
     required String sbnPath,
-    required AssetCache assetCache,
+    required AssetCacheAll assetCacheAll,
   }) {
     String? extension = json['e'];
     if (extension == '.svg') {
@@ -121,30 +120,30 @@ sealed class EditorImage extends ChangeNotifier {
         inlineAssets: inlineAssets,
         isThumbnail: isThumbnail,
         sbnPath: sbnPath,
-        assetCache: assetCache,
+        assetCacheAll: assetCacheAll,
       );
     } else if (extension == '.pdf') {
       return PdfEditorImage.fromJson(
         json,
         inlineAssets: inlineAssets,
         isThumbnail: isThumbnail,
         sbnPath: sbnPath,
-        assetCache: assetCache,
+        assetCacheAll: assetCacheAll,
       );
     } else {
       return PngEditorImage.fromJson(
         json,
         inlineAssets: inlineAssets,
         isThumbnail: isThumbnail,
         sbnPath: sbnPath,
-        assetCache: assetCache,
+        assetCacheAll: assetCacheAll,
       );
     }
   }
 
   @mustBeOverridden
   @mustCallSuper
-  Map<String, dynamic> toJson(OrderedAssetCache assets) => {
+  Map<String, dynamic> toJson() => {
         'id': id,
         'e': extension,
         'i': pageIndex,

lib/components/canvas/image/pdf_editor_image.dart

@@ -1,21 +1,23 @@
 part of 'editor_image.dart';
 
 class PdfEditorImage extends EditorImage {
-  Uint8List? pdfBytes;
+  /// index of asset assigned to this pdf file
+  int assetId;
+
   final int pdfPage;
 
   /// If the pdf needs to be loaded from disk, this is the File
   /// that the pdf will be loaded from.
   final File? pdfFile;
 
-  final _pdfDocument = ValueNotifier<PdfDocument?>(null);
+//  final _pdfDocument = ValueNotifier<PdfDocument?>(null);
 
   static final log = Logger('PdfEditorImage');
 
   PdfEditorImage({
     required super.id,
-    required super.assetCache,
-    required this.pdfBytes,
+    required super.assetCacheAll,
+    required this.assetId,
     required this.pdfFile,
     required this.pdfPage,
     required super.pageIndex,
@@ -32,8 +34,8 @@ class PdfEditorImage extends EditorImage {
     super.isThumbnail,
   })  : assert(
             !naturalSize.isEmpty, 'naturalSize must be set for PdfEditorImage'),
-        assert(pdfBytes != null || pdfFile != null,
-            'pdfFile must be set if pdfBytes is null'),
+        assert(pdfFile != null,
+            'pdfFile must be set'),
         super(
           extension: '.pdf',
           srcRect: Rect.zero,
@@ -44,34 +46,58 @@ class PdfEditorImage extends EditorImage {
     required List<Uint8List>? inlineAssets,
     bool isThumbnail = false,
     required String sbnPath,
-    required AssetCache assetCache,
+    required AssetCacheAll assetCacheAll,
   }) {
     String? extension = json['e'] as String?;
     assert(extension == null || extension == '.pdf');
 
-    final assetIndex = json['a'] as int?;
+    final assetIndexJson = json['a'] as int?;
+
     final Uint8List? pdfBytes;
+    int? assetIndex;
     File? pdfFile;
-    if (assetIndex != null) {
+    if (assetIndexJson != null) {
       if (inlineAssets == null) {
         pdfFile =
-            FileManager.getFile('$sbnPath${Editor.extension}.$assetIndex');
-        pdfBytes = assetCache.get(pdfFile);
+            FileManager.getFile('$sbnPath${Editor.extension}.$assetIndexJson');
+        assetIndex = assetCacheAll.addSync(
+            pdfFile,'.pdf',assetIndexJson,
+            json.containsKey('ainf') ? json['ainf'] : null,
+            json.containsKey('aph') ? json['aph'].toInt() : null,
+            json.containsKey('afs') ? json['afs'] : null,
+            json.containsKey('ah') ? json['ah'].toInt() : null,
+        );
       } else {
-        pdfBytes = inlineAssets[assetIndex];
+        pdfBytes = inlineAssets[assetIndexJson];
+        final tempFile=assetCacheAll.createRuntimeFile('.pdf',pdfBytes); // store to file
+        assetIndex = assetCacheAll.addSync(
+          tempFile,'.pdf',assetIndexJson,
+          json.containsKey('ainf') ? json['ainf'] : null,
+          json.containsKey('aph') ? json['aph'].toInt() : null,
+          json.containsKey('afs') ? json['afs'] : null,
+          json.containsKey('ah') ? json['ah'].toInt() : null,
+        );
       }
     } else {
       if (kDebugMode) {
         throw Exception('PdfEditorImage.fromJson: pdf bytes not found');
       }
-      pdfBytes = Uint8List(0);
+      assetIndex=-1;
+    }
+
+    assert(assetIndex >=0,
+    'Either pdfBytes or pdfFile must be non-null');
+
+    // add to asset cache
+    if (assetIndex<0){
+      throw Exception('EditorImage.fromJson: pdf image not in assets');
     }
 
     return PdfEditorImage(
       id: json['id'] ??
           -1, // -1 will be replaced by EditorCoreInfo._handleEmptyImageIds()
-      assetCache: assetCache,
-      pdfBytes: pdfBytes,
+      assetCacheAll: assetCacheAll,
+      assetId: assetIndex,
       pdfFile: pdfFile,
       pdfPage: json['pdfi'],
       pageIndex: json['i'] ?? 0,
@@ -99,18 +125,22 @@ class PdfEditorImage extends EditorImage {
   }
 
   @override
-  Map<String, dynamic> toJson(OrderedAssetCache assets) {
-    final json = super.toJson(
-      assets,
-    );
+  Map<String, dynamic> toJson() {
+    final json = super.toJson();
 
     // remove non-pdf fields
     json.remove('t'); // thumbnail bytes
     assert(!json.containsKey('a'));
     assert(!json.containsKey('b'));
 
-    json['a'] = assets.add(pdfFile ?? pdfBytes!);
+    json['a'] = assetCacheAll.getAssetIdOnSave(assetId); // assets can be reordered during saving
     json['pdfi'] = pdfPage;
+    json['aph'] = assetCacheAll.getAssetPreviewHash(assetId); // assets prewiewHash
+    json['afs'] = assetCacheAll.getAssetFileSize(assetId); // assets can be reordered during saving
+    if (assetCacheAll.getAssetFileInfo(assetId) != '')
+      json['ainf'] = assetCacheAll.getAssetFileInfo(assetId); // asset file info
+    if (assetCacheAll.getAssetHash(assetId) != null)
+      json['ah'] = assetCacheAll.getAssetHash(assetId); // assets can be reordered during saving
 
     return json;
   }
@@ -127,9 +157,10 @@ class PdfEditorImage extends EditorImage {
       dstRect = dstRect.topLeft & dstSize;
     }
 
-    _pdfDocument.value ??= pdfFile != null
-        ? await PdfDocument.openFile(pdfFile!.path)
-        : await PdfDocument.openData(pdfBytes!);
+//    _pdfDocument.value ??= await assetCacheAll.getPdfDocument(assetId);
+//    _pdfDocument.value ??= pdfFile != null
+//        ? await PdfDocument.openFile(pdfFile!.path)
+//        : await PdfDocument.openData(pdfBytes!);
   }
 
   @override
@@ -140,19 +171,6 @@ class PdfEditorImage extends EditorImage {
 
   @override
   Future<void> precache(BuildContext context) async {
-    if (_pdfDocument.value != null) return;
-
-    final completer = Completer<void>();
-
-    void onDocumentSet() {
-      if (_pdfDocument.value == null) return;
-      if (completer.isCompleted) return;
-      completer.complete();
-      _pdfDocument.removeListener(onDocumentSet);
-    }
-
-    _pdfDocument.addListener(onDocumentSet);
-    return completer.future;
   }
 
   @override
@@ -162,8 +180,9 @@ class PdfEditorImage extends EditorImage {
     required bool isBackground,
     required bool invert,
   }) {
+    final pdfNotifier = assetCacheAll.getPdfNotifier(assetId);  // value of pdfDocument
     return ValueListenableBuilder(
-      valueListenable: _pdfDocument,
+      valueListenable: pdfNotifier,
       builder: (context, pdfDocument, child) {
         if (pdfDocument == null) {
           return SizedBox.fromSize(size: srcRect.size);
@@ -183,8 +202,8 @@ class PdfEditorImage extends EditorImage {
   @override
   PdfEditorImage copy() => PdfEditorImage(
         id: id,
-        assetCache: assetCache,
-        pdfBytes: pdfBytes,
+        assetCacheAll: assetCacheAll,
+        assetId: assetId,
         pdfPage: pdfPage,
         pdfFile: pdfFile,
         pageIndex: pageIndex,