Skip to content

Altered Naming Convention for Duplicates #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ammelll wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Altered Naming Convention for Duplicates #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ee8a6b
naming convention changes
Ammelll Mar 13, 2024
d0255d9
Merge branch 'main' into main
Ammelll Apr 27, 2024
566b4b4
Merge branch 'main' into main
mjansen4857 Sep 11, 2024
962e7a3
Formatted changes
Ammelll Nov 28, 2024
c8ac868
Merge branch 'main' into main
Ammelll Nov 28, 2024
554542c
Merge branch 'main' into main
Ammelll Dec 13, 2024
a519473
Merge branch 'mjansen4857:main' into main
Ammelll Feb 8, 2025
383cc24
Updating to recent commit
Ammelll Feb 8, 2025
fbfcb82
Fixed duplicate tests not being passed
Ammelll Feb 8, 2025
0468ede
formatting
Ammelll Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 46 additions & 7 deletions lib/pages/project/project_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,11 +919,26 @@ class _ProjectPageState extends State<ProjectPage> {
for (PathPlannerPath path in _paths) {
pathNames.add(path.name);
}
String pathName = 'Copy of ${_paths[i].name}';
while (pathNames.contains(pathName)) {
pathName = 'Copy of $pathName';
String pathName = _paths[i].name;
RegExp exp = RegExp(r'\(\d+\)');
String source = pathName.substring(pathName.length - 3);
String originalPathName = pathName;
while (pathNames.contains(pathName) ||
pathName == '$originalPathName (0)') {
source = pathName.substring(pathName.length - 3);
if (exp.hasMatch(source)) {

@mjansen4857 mjansen4857 Dec 18, 2024 •
edited
Loading

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming tests are failing because you're matching the regex against the substring with the (x) removed. I think this should be changed to match against the entire path name and then only do the substring if it has a match. Same thing for the autos.

EDIT: nvm I read this wrong, i thought the substring removed the (x) but it only contains that

@mjansen4857 mjansen4857 Dec 18, 2024

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When fixing this, could you also add on to the duplication tests to duplicate them a third time. i.e. check for Example Path (3) just to be extra sure the increment works.

RegExpMatch? match = exp.firstMatch(source);
int index = int.parse(match![0]!.substring(1, 2));
while (pathNames.contains(pathName) ||
pathName.substring(pathName.length - 3) == '(0)') {
index++;
pathName =
'${pathName.substring(0, pathName.length - 3)}($index)';
}
} else {
pathName = '$pathName (0)';
}
}

setState(() {
_paths.add(_paths[i].duplicate(pathName));
_sortPaths(_pathSortValue);
Expand Down Expand Up @@ -1466,11 +1481,35 @@ class _ProjectPageState extends State<ProjectPage> {
for (PathPlannerAuto auto in _autos) {
autoNames.add(auto.name);
}
String autoName = 'Copy of ${_autos[i].name}';
String autoName = _autos[i].name;
RegExp exp = RegExp(r'\(\d+\)');
String source = autoName.substring(autoName.length - 3);
String originalAutoName = autoName;
while (autoNames.contains(autoName) ||
autoName == '$originalAutoName (0)') {
source = autoName.substring(autoName.length - 3);
if (exp.hasMatch(source)) {
RegExpMatch? match = exp.firstMatch(source);
int index = int.parse(match![0]!.substring(1, 2));
while (autoNames.contains(autoName) ||
autoName.substring(autoName.length - 3) == '(0)') {
index++;
autoName =
'${autoName.substring(0, autoName.length - 3)}($index)';
}
} else {
autoName = '$autoName (0)';
}
}
while (autoNames.contains(autoName)) {
autoName = 'Copy of $autoName';
if (exp.hasMatch(source)) {
RegExpMatch? match = exp.firstMatch(source);
int index = int.parse(match![0]!.substring(1, 2)) + 1;
autoName = '${autoName.substring(0, autoName.length - 3)}($index)';
} else {
autoName = '$autoName (1)';
}
}

setState(() {
_autos.add(_autos[i].duplicate(autoName));
_sortAutos(_autoSortValue);
Expand Down
44 changes: 22 additions & 22 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
url: "https://pub.dev"
source: hosted
version: "76.0.0"
version: "72.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.3"
version: "0.3.2"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
url: "https://pub.dev"
source: hosted
version: "6.11.0"
version: "6.7.0"
archive:
dependency: transitive
description:
Expand Down Expand Up @@ -178,10 +178,10 @@ packages:
dependency: "direct main"
description:
name: collection
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.19.0"
version: "1.18.0"
console:
dependency: transitive
description:
Expand Down Expand Up @@ -561,18 +561,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev"
source: hosted
version: "10.0.7"
version: "10.0.5"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev"
source: hosted
version: "3.0.8"
version: "3.0.5"
leak_tracker_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -625,10 +625,10 @@ packages:
dependency: transitive
description:
name: macros
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
url: "https://pub.dev"
source: hosted
version: "0.1.3-main.0"
version: "0.1.2-main.4"
markdown:
dependency: transitive
description:
Expand Down Expand Up @@ -1001,7 +1001,7 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
version: "0.0.99"
source_gen:
dependency: transitive
description:
Expand All @@ -1022,10 +1022,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
Expand All @@ -1046,10 +1046,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.2.0"
term_glyph:
dependency: transitive
description:
Expand All @@ -1062,10 +1062,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev"
source: hosted
version: "0.7.3"
version: "0.7.2"
timing:
dependency: transitive
description:
Expand Down Expand Up @@ -1190,10 +1190,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev"
source: hosted
version: "14.3.0"
version: "14.2.5"
watcher:
dependency: "direct main"
description:
Expand Down
21 changes: 15 additions & 6 deletions test/pages/project/project_page_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,16 +475,27 @@ void main() {
await widgetTester.tap(find.text('Duplicate'));
await widgetTester.pumpAndSettle();

expect(find.widgetWithText(ProjectItemCard, 'Copy of Example Path'),
expect(find.widgetWithText(ProjectItemCard, 'Example Path (1)'),
findsOneWidget);

await widgetTester.tap(menuButton);
await widgetTester.pumpAndSettle();

await widgetTester.tap(find.text('Duplicate'));
await widgetTester.pumpAndSettle();
for (var element in widgetTester.allWidgets) {
print("TEXT ELEMENT " + element.toStringDeep());
}
expect(find.widgetWithText(ProjectItemCard, 'Example Path (2)'),
findsOneWidget);

expect(find.widgetWithText(ProjectItemCard, 'Copy of Copy of Example Path'),
await widgetTester.tap(menuButton);
await widgetTester.pumpAndSettle();

await widgetTester.tap(find.text('Duplicate'));
await widgetTester.pumpAndSettle();

expect(find.widgetWithText(ProjectItemCard, 'Example Path (3)'),
findsOneWidget);
});

Expand Down Expand Up @@ -538,17 +549,15 @@ void main() {
await widgetTester.tap(find.text('Duplicate'));
await widgetTester.pumpAndSettle();

expect(
find.widgetWithText(ProjectItemCard, 'Copy of auto1'), findsOneWidget);
expect(find.widgetWithText(ProjectItemCard, 'auto1 (1)'), findsOneWidget);

await widgetTester.tap(menuButton);
await widgetTester.pumpAndSettle();

await widgetTester.tap(find.text('Duplicate'));
await widgetTester.pumpAndSettle();

expect(find.widgetWithText(ProjectItemCard, 'Copy of Copy of auto1'),
findsOneWidget);
expect(find.widgetWithText(ProjectItemCard, 'auto1 (2)'), findsOneWidget);
});

testWidgets('delete path', (widgetTester) async {
Expand Down