Fix rTorrent path evaluation for items without a subdirectory#548
Merged
Conversation
Contributor
Author
|
@sourcery-ai review |
Code Review by Qodo
1.
|
Contributor
Author
|
@greptileai review |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideAdds explicit directory handling for rTorrent torrents and updates path construction to correctly handle single-file torrents without subdirectories. Class diagram for updated rTorrent torrent handlingclassDiagram
class RTorrentTorrent {
string~nullable~ BasePath
string~nullable~ Directory
}
class RTorrentClient {
- string[] TorrentFields
+ List~RTorrentTorrent~ ParseTorrentList(XElement value)
+ RTorrentTorrent CreateTorrentFromValues(object[] values)
}
class RTorrentServiceDC {
+ Task ChangeCategoryForNoHardLinksAsync(List~ITorrentItemWrapper~ torrentItems)
}
RTorrentClient --> RTorrentTorrent : creates
RTorrentServiceDC ..> RTorrentClient : uses
RTorrentServiceDC ..> RTorrentTorrent : reads Info.Directory and Info.BasePath
Flow diagram for rTorrent path evaluation logicflowchart TD
A["Start processing file in ChangeCategoryForNoHardLinksAsync"] --> B["Read torrent.Info.Directory"]
B --> C{Directory is null?}
C -- "No" --> D["BaseDir = torrent.Info.Directory"]
C -- "Yes" --> E["BaseDir = torrent.Info.BasePath"]
D --> F["Combine BaseDir with file.Path using Path.Combine"]
E --> F
F --> G["Normalize separators by splitting on / and \\ and joining with system separator"]
G --> H["Apply PathHelper.RemapPath using DownloadDirectorySource and DownloadDirectoryTarget"]
H --> I["Resulting filePath used for further processing"]
I --> J["End"]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Hey - I've found 1 issue, and left some high level feedback:
- The path construction in
ChangeCategoryForNoHardLinksAsync(usingPath.Combine(...).Split(['\\', '/'])) is a bit brittle; consider extracting this normalization logic into a dedicated helper that consistently handles mixed separators and trailing slashes across the codebase. - Now that
BasePathmay point to a file andDirectoryalways points to a directory, consider renaming or adding small helper properties/methods onRTorrentTorrent(e.g.,GetDataDirectory()) to make the distinction clearer and reduce the risk of future misuse of these fields.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- The path construction in `ChangeCategoryForNoHardLinksAsync` (using `Path.Combine(...).Split(['\\', '/'])`) is a bit brittle; consider extracting this normalization logic into a dedicated helper that consistently handles mixed separators and trailing slashes across the codebase.
- Now that `BasePath` may point to a file and `Directory` always points to a directory, consider renaming or adding small helper properties/methods on `RTorrentTorrent` (e.g., `GetDataDirectory()`) to make the distinction clearer and reduce the risk of future misuse of these fields.
## Individual Comments
### Comment 1
<location path="code/backend/Cleanuparr.Infrastructure/Features/DownloadClient/RTorrent/RTorrentClient.cs" line_range="331" />
<code_context>
private static RTorrentTorrent? CreateTorrentFromValues(object?[] values)
{
- if (values.Length < 12) return null;
+ if (values.Length < 13) return null;
return new RTorrentTorrent
</code_context>
<issue_to_address>
**issue (bug_risk):** Consider allowing shorter responses and treating the new `Directory` field as optional to avoid dropping torrents.
With `values.Length >= 13`, any rTorrent instance that omits `d.directory` (or returns fewer fields) will cause that torrent to be skipped entirely. Since `Directory` is additive and non-critical, keep the `values.Length < 12` guard and only set `Directory` when `values.Length > 12`, so missing `d.directory` yields a null `Directory` instead of dropping the torrent.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by Sourcery
Ensure correct path resolution for rTorrent torrents, especially single-file torrents without subdirectories, by distinguishing between base file path and containing directory.
Bug Fixes:
Enhancements: