Skip to content

ls: Fix --ncdu output with path filters and fix disk size#4911

Merged
MichaelEischer merged 4 commits intorestic:masterfrom
MichaelEischer:fix-filtered-ls-ncdu
Jul 10, 2024
Merged

ls: Fix --ncdu output with path filters and fix disk size#4911
MichaelEischer merged 4 commits intorestic:masterfrom
MichaelEischer:fix-filtered-ls-ncdu

Conversation

@MichaelEischer
Copy link
Copy Markdown
Member

@MichaelEischer MichaelEischer commented Jul 7, 2024

What does this PR change? What problem does it solve?

Fix the ncdu error from #4910 . The ncdu output was missing the intermediate directories that lead up to the specified paths. In addition, skipped subfolders were not rendered correctly.

ncdu rounds a disk size of below 255bytes down to zero. To prevent this from happening round up the disk size to the next full sector.

Was the change previously discussed in an issue or on the forum?

Fixes #4910.

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.

Ncdu expects a size in disk blocks. Round up to the next full block.
Otherwise, small files with size below 255bytes would be rounded down to
0B by ncdu.
Copy link
Copy Markdown
Member Author

@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.

@MichaelEischer MichaelEischer merged commit 5e1d0ff into restic:master Jul 10, 2024
@MichaelEischer MichaelEischer deleted the fix-filtered-ls-ncdu branch July 10, 2024 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ls --ncdu is broken when filtering by path

1 participant