Skip to content
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

Jump to bottom

ui/termstatus: Quote funny filenames #4192

Merged
merged 1 commit into from Apr 14, 2023
Merged

ui/termstatus: Quote funny filenames #4192

merged 1 commit into from Apr 14, 2023

Conversation

greatroar
Copy link
Contributor

@greatroar greatroar commented Feb 5, 2023 •
edited

Fixes #2260, #4191.

Checklist

  • I have read the contribution guidelines.
  • I have enabled maintainer edits.
  • I have added tests for all code changes.
  • I have added documentation for relevant changes (in the manual).
  • There's a new file in changelog/unreleased/ that describes the changes for our users (see template).
  • I have run gofmt on the code in all commits.
  • All commit messages are formatted in the same style as the other commits in the repo.
  • I'm done! This pull request is ready for review.

@MichaelEischer
Copy link
Member

MichaelEischer commented Feb 6, 2023 •
edited

Would that also solve #2260? [Edit]We probably should also sanitize the file status output.[/Edit]

@greatroar
Copy link
Contributor Author

@MichaelEischer Updated to fix that issue too.

MichaelEischer
MichaelEischer requested changes Feb 10, 2023
View reviewed changes
Copy link
Member

@MichaelEischer MichaelEischer left a comment

Choose a reason for hiding this comment

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

Could you add a very short changelog entry?

internal/ui/backup/text.go Outdated Show resolved Hide resolved
internal/ui/backup/text_test.go Outdated Show resolved Hide resolved
internal/ui/backup/text.go Outdated Show resolved Hide resolved
@greatroar
Copy link
Contributor Author

Added the changelog entry.

@greatroar greatroar changed the title ui/backup: Quote funny filenames ui/termstatus: Quote funny filenames Feb 12, 2023
@MichaelEischer
Copy link
Member

I'm sorry to have another question, but isn't the change to internal/ui/backup/text.go quote the item passed to func (b *TextProgress) CompleteItem(messageType, item string, previous, current *restic.Node, s archiver.ItemStats, d time.Duration) still necessary to solve #4191? Terminal.SetStatus only covers the status bar, but not the other terminal output.

@MichaelEischer
Copy link
Member

@greatroar Ping?

@greatroar
Copy link
Contributor Author

Yes, you're right. Fixed now. Sorry for the delay.

@greatroar greatroar mentioned this pull request Apr 14, 2023
Merged
8 tasks
MichaelEischer
MichaelEischer approved these changes Apr 14, 2023
View reviewed changes
Copy link
Member

@MichaelEischer MichaelEischer left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@MichaelEischer MichaelEischer merged commit fd3ed9e into restic:master Apr 14, 2023
11 checks passed
@MichaelEischer MichaelEischer mentioned this pull request Apr 23, 2023
Closed
@MichaelEischer MichaelEischer mentioned this pull request May 1, 2023
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichaelEischer MichaelEischer MichaelEischer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

restic should sanitize filenames in output
2 participants
@greatroar @MichaelEischer