-
Notifications
You must be signed in to change notification settings - Fork 1
Refactor: Deduplicate normalize_file_path and to_epoch_ms in export script (closes #46) #51
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.
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
fb5d9e4
removed duplicated function from `export.py`, added test for normaliz…
bradjin8 a3688c0
fix: align windows-drive case expectation in URI test
bradjin8 011f6e8
fix: use lowercase only for driver letter
bradjin8 88b7b10
fix: review comments
bradjin8 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| """Tests for utils.path_helpers.normalize_file_path. | ||
|
|
||
| Covers the shared implementation that was previously duplicated in | ||
| scripts/export.py (closes #46). All call-sites in both the web app and the | ||
| CLI export script now use this single copy. | ||
|
|
||
| Edge-case matrix: | ||
| - file:/// and file:// URI schemes | ||
| - Percent-encoded characters: spaces (%20), colons (%3A), hashes (%23) | ||
| - Windows-style drive paths (backslash and forward-slash) on all platforms | ||
| - Drive-letter lowercasing on win32 | ||
| - Plain POSIX paths pass through unchanged | ||
| - Empty / None-like input | ||
| """ | ||
|
|
||
| import sys | ||
| import unittest | ||
|
|
||
| from utils.path_helpers import normalize_file_path | ||
|
|
||
|
|
||
| class TestNormalizeFilePathUriStripping(unittest.TestCase): | ||
| def test_file_triple_slash_stripped(self) -> None: | ||
| out = normalize_file_path("file:///home/user/project") | ||
| self.assertFalse(out.startswith("file:")) | ||
| self.assertIn("home", out) | ||
|
|
||
| def test_file_double_slash_stripped(self) -> None: | ||
| out = normalize_file_path("file://server/share/file.txt") | ||
| self.assertFalse(out.startswith("file:")) | ||
| self.assertIn("share", out) | ||
|
|
||
| def test_empty_string(self) -> None: | ||
| self.assertEqual(normalize_file_path(""), "") | ||
|
|
||
|
|
||
| class TestNormalizeFilePathPercentEncoding(unittest.TestCase): | ||
| def test_space_decoded(self) -> None: | ||
| out = normalize_file_path("file:///C:/My%20Documents/file.txt") | ||
| self.assertNotIn("%20", out) | ||
| self.assertIn("My Documents" if sys.platform != "win32" else "my documents", out) | ||
|
|
||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| def test_hash_decoded(self) -> None: | ||
| out = normalize_file_path("file:///C:/repo/src%23internal/mod.py") | ||
| self.assertNotIn("%23", out) | ||
| self.assertIn("#", out) | ||
|
|
||
| def test_percent_encoded_colon_in_uri_prefix(self) -> None: | ||
| """URI-style /d%3A/... path: %3A is decoded to ':'. | ||
|
|
||
|
bradjin8 marked this conversation as resolved.
|
||
| On win32 the backslash branch is entered (leading slash removed | ||
| and path lowercased). On other platforms the leading slash prevents | ||
| the Windows-drive branch, so the path is returned as decoded only. | ||
| """ | ||
| out = normalize_file_path("/d%3A/_Work/project") | ||
| self.assertNotIn("%3A", out) | ||
| if sys.platform == "win32": | ||
| self.assertEqual(out, r"d:\_work\project") | ||
| else: | ||
| self.assertEqual(out, "/d:/_Work/project") | ||
|
|
||
|
|
||
| class TestNormalizeFilePathWindowsDrives(unittest.TestCase): | ||
| """Paths with Windows-style drive letters are normalised on all platforms. | ||
|
|
||
| On win32 the win32 branch handles them natively. On Linux/macOS the | ||
| ``^[a-zA-Z]:[/\\]`` regex branch converts forward-slashes to backslashes | ||
| and lowercases the path so cross-platform reads of Cursor's Windows | ||
| workspaceStorage produce consistent keys. | ||
| """ | ||
|
|
||
| def test_backslash_drive_path_lowercased(self) -> None: | ||
| out = normalize_file_path(r"D:\Work\Boost") | ||
| self.assertEqual(out, r"d:\work\boost") | ||
|
|
||
| def test_forward_slash_drive_path_converted(self) -> None: | ||
| out = normalize_file_path("D:/Work/Boost") | ||
| self.assertEqual(out, r"d:\work\boost") | ||
|
|
||
| def test_file_uri_with_windows_drive(self) -> None: | ||
| out = normalize_file_path("file:///C:/Users/Dev/project") | ||
| self.assertIn("users", out) | ||
| self.assertIn("dev", out) | ||
| self.assertTrue(out.startswith("c:") or out.startswith("C:")) | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
|
|
||
| def test_mixed_case_drive_lowercased(self) -> None: | ||
| out = normalize_file_path(r"E:\Mixed\Case\Path") | ||
| self.assertTrue(out.startswith("e:")) | ||
| self.assertEqual(out, r"e:\mixed\case\path") | ||
|
|
||
|
|
||
| class TestNormalizeFilePathPosixPassthrough(unittest.TestCase): | ||
| def test_plain_posix_path_unchanged_on_non_windows(self) -> None: | ||
| if sys.platform == "win32": | ||
|
bradjin8 marked this conversation as resolved.
|
||
| self.skipTest("POSIX path semantics differ on win32") | ||
| out = normalize_file_path("/home/user/project") | ||
| self.assertEqual(out, "/home/user/project") | ||
|
|
||
| def test_path_without_scheme_unchanged(self) -> None: | ||
| if sys.platform == "win32": | ||
| self.skipTest("plain relative path behaviour differs on win32") | ||
| out = normalize_file_path("relative/path/file.py") | ||
| self.assertEqual(out, "relative/path/file.py") | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() | ||
|
bradjin8 marked this conversation as resolved.
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.