Skip to content

Renaming error in case of file duplication #136

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
indexlang wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

Renaming error in case of file duplication #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...EasyAbp.FileManagement.EntityFrameworkCore/EasyAbp/FileManagement/Files/FileRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ public virtual async Task<string> GetFileNameWithNextSerialNumberAsync(string fi
var nextNumber =
fileNames
.Select(x =>
x.Substring(part1.Length, x.LastIndexOf(part2, StringComparison.Ordinal) - part1.Length))
x.LastIndexOf(part2, StringComparison.Ordinal) > 0 ? x.Substring(part1.Length, x.LastIndexOf(part2, StringComparison.Ordinal) - part1.Length) : "")
Copy link
Member

@gdlcf88 gdlcf88 Aug 8, 2024

Choose a reason for hiding this comment

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

How about

                    .Where(x => x.EndsWith(part2, StringComparison.Ordinal))

Copy link
Author

@indexlang indexlang Aug 8, 2024

Choose a reason for hiding this comment

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

It's Ok，but why add new line？

Copy link
Member

@gdlcf88 gdlcf88 Aug 8, 2024

Choose a reason for hiding this comment

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

No need to select and parse unused items ("").

Copy link
Author

@indexlang indexlang Aug 8, 2024

Choose a reason for hiding this comment

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

If client upload a file end with ")",also need parse str,so I think both are fine,you decide.

Copy link
Member

@gdlcf88 gdlcf88 Aug 8, 2024

Choose a reason for hiding this comment

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

I prefer to keep the .Select() line unchanged and add

                    .Where(x => x.EndsWith(part2, StringComparison.Ordinal))

for minimal impact.

.Select(x => int.TryParse(x, out var number) ? number : 0).Where(x => x > 0).OrderBy(x => x)
.TakeWhile((x, i) => x == i + 1).LastOrDefault() + 1;

return $"{part1}{nextNumber}{part2}";
}
}
}
}