Skip to content

Commit 3f88650

Browse files
committed
Fix remove assets problem if they are newly added
1 parent 7a9ebab commit 3f88650

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

.github/workflows/dart.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- uses: subosito/flutter-action@v2.21.0
4141
with:
4242
channel: stable
43-
flutter-version: 3.35.3
43+
flutter-version: 3.35.4
4444
- name: Install dependencies
4545
run: dart pub get
4646
- name: Verify formatting

packages/lw_file_system_api/lib/src/data.dart

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,16 @@ abstract class ArchiveData<T> {
101101
),
102102
);
103103
T removeAsset(String name) => removeAssets([name]);
104-
T removeAssets(Iterable<String> names) =>
105-
updateState(state.copyWith(removed: {...state.removed, ...names}));
104+
T removeAssets(Iterable<String> names) => updateState(
105+
state.copyWith(
106+
added: Map.from(state.added)
107+
..removeWhere((key, value) => names.contains(key)),
108+
removed: {
109+
...state.removed,
110+
...names.where((name) => !state.added.containsKey(name)),
111+
},
112+
),
113+
);
106114

107115
Iterable<String> getAssets(String path, [bool removeExtension = false]) =>
108116
{...archive.files.map((e) => e.name), ...state.added.keys}

packages/lw_sysapi/example/pubspec.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ packages:
8585
dependency: transitive
8686
description:
8787
name: file_selector
88-
sha256: "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828"
88+
sha256: "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0"
8989
url: "https://pub.dev"
9090
source: hosted
91-
version: "1.0.3"
91+
version: "1.0.4"
9292
file_selector_android:
9393
dependency: transitive
9494
description:
@@ -196,10 +196,10 @@ packages:
196196
dependency: transitive
197197
description:
198198
name: leak_tracker
199-
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
199+
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
200200
url: "https://pub.dev"
201201
source: hosted
202-
version: "11.0.1"
202+
version: "11.0.2"
203203
leak_tracker_flutter_testing:
204204
dependency: transitive
205205
description:
@@ -339,10 +339,10 @@ packages:
339339
dependency: transitive
340340
description:
341341
name: share_plus
342-
sha256: d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1
342+
sha256: "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6"
343343
url: "https://pub.dev"
344344
source: hosted
345-
version: "11.1.0"
345+
version: "12.0.0"
346346
share_plus_platform_interface:
347347
dependency: transitive
348348
description:

0 commit comments

Comments
 (0)