Skip to content

Fix virtualcodebase creation bug #58

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

Merged
JonoYang merged 2 commits into from
Aug 25, 2023
Merged

Fix virtualcodebase creation bug #58

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e64acf
Properly append root path segment #57
JonoYang Aug 24, 2023
7c417a8
Update _get_parent_directory #57
JonoYang Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update _get_parent_directory #57 
  * If an existing resource is equa lto Codebase.CACHED_RESOURCE, then create that Resource

Signed-off-by: Jono Yang <[email protected]>
  • Loading branch information
@JonoYang
JonoYang committed Aug 25, 2023
commit 7c417a8981ec11dbb400ac0693c9958618993d6b
2 changes: 1 addition & 1 deletion src/commoncode/resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2036,7 +2036,7 @@ def _get_parent_directory(self, path_segments):
for segment in path_segments:
path = posixpath_join(current.path, segment)
existing = resources_by_path.get(path)
if not existing:
if not existing or existing == Codebase.CACHED_RESOURCE:
existing = self._get_or_create_resource(
name=segment,
# build the path based on parent
Expand Down
14 changes: 2 additions & 12 deletions tests/test_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,18 +1455,8 @@ def test_VirtualCodebase_can_be_created_with_repeated_root_directory(self):
paths = [
'to',
'to/to',
'to/to/com.liferay.portal.tika-1.0.22.jar',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/com',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/com/liferay',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/com/liferay/portal',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/com/liferay/portal/tika',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/com/liferay/portal/tika/internal',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/com/liferay/portal/tika/internal/activator',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/com/liferay/portal/tika/internal/activator/TikaBundleActivator.class',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/META-INF',
'to/to/com.liferay.portal.tika-1.0.22.jar-extract/com.liferay.portal.tika-1.0.22/META-INF/MANIFEST.MF',
'to/to/to',
'to/to/to/to',
]
resources = [{'path': path} for path in paths]
vc = VirtualCodebase(location={'files': resources})
Expand Down