Fix asset importing

LinwoodDev · Dec 13, 2024 · 38878a7 · 38878a7
1 parent 7d6192c
commit 38878a7
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 59 deletions.
diff --git a/api/lib/src/models/data.dart b/api/lib/src/models/data.dart
@@ -62,8 +62,8 @@ final class NoteData extends ArchiveData<NoteData> {
   (NoteData, String) importAsset(
       String path, Uint8List data, String fileExtension) {
     final hash = sha512256.convert(data);
-    final name = base64Encode(hash.bytes);
-    final newPath = '$path/${findUniqueName(path, fileExtension, name)}';
+    final name = hash.toString();
+    final newPath = '$path/$name.$fileExtension';
     return (setAsset(newPath, data), newPath);
   }
 

diff --git a/api/pubspec.lock b/api/pubspec.lock
@@ -587,10 +587,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   type_plus:
     dependency: transitive
     description:

diff --git a/app/lib/handlers/import.dart b/app/lib/handlers/import.dart
@@ -41,9 +41,6 @@ class ImportHandler extends Handler<ImportTool> {
     context.refresh();
   }
 
-  @override
-  bool canChange(PointerDownEvent event, EventContext context) => false;
-
   @override
   Future<void> onPointerUp(PointerUpEvent event, EventContext context) async {
     final state = context.getState();
@@ -58,12 +55,9 @@ class ImportHandler extends Handler<ImportTool> {
       state.assetService,
       state.page,
     ))
-        .map((e) => e.transform(position: _offset, relative: true)?.element)
+        .map((e) => e.transform(position: _offset, relative: true)?.element.copyWith(id: createUniqueId()))
         .nonNulls
         .toList()));
-    context
-        .getCurrentIndexCubit()
-        .resetTemporaryHandler(context.getDocumentBloc());
     context.refresh();
     context.bake();
   }

diff --git a/docs/package.json b/docs/package.json
@@ -26,6 +26,6 @@
   },
   "packageManager": "[email protected]",
   "devDependencies": {
-    "sass": "^1.82.0"
+    "sass": "^1.83.0"
   }
 }
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/metadata/en-US/changelogs/124.txt b/metadata/en-US/changelogs/124.txt
@@ -12,6 +12,9 @@
 * Fix ruler not working correctly in pen tool
 * Fix ruler position is wrong when moving on the canvas
 * Fix zoom dependent not working correctly with the label tool ([#765](https://github.com/LinwoodDev/Butterfly/issues/765))
+* Fix temporary import handler does not get removed after clicking
+* Fix asset hash not correctly working with filenames
+* Fix duplicated asset importing
 * Upgrade to flutter 3.27
 
 Read more here: https://linwood.dev/butterfly/2.2.3-rc.1