Fix Tor fetcher to handle file names without version numbers. #123
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR modifies the regex patterns for Tor bundle filename matching to make the version number optional in the filename, allowing matching of files that don't contain explicit version information in their names. When the version is not present in the filename, the code falls back to using the version from the directory/version list URL.
Key Changes
- Updated four regex patterns (Windows x86/x64, Linux x86/x64) to make the version capture group optional using
(?:-(?<Version>[\d\.]+))? - Modified
FetcherHelpers.csto fall back toversionInfo.Versionwhen the regex Version group is empty
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/TorSharp/Tools/Tor/TorFetcher.cs | Updated regex patterns to make version capture groups optional for all four platform/architecture combinations |
| src/TorSharp/Tools/FetcherHelpers.cs | Added fallback logic to use versionInfo.Version when filename doesn't contain an explicit version |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
It seems the latest distribution (15.0) does not include the version numbers for those bundles any longer:
Unfortunately I can't use
TorFilePatternResolverthis time because there needs to be aVersiongroup match in order for the version to be accepted.Despite the comment, in this case I think it's a good idea to fallback to the version in the list URL if there was a legitimate match. The regular expressions also changed to handle both in case the version numbers come back again.