Skip to content
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

fix: support productRef when removing files #353

Merged
merged 1 commit into from
Jun 26, 2024
Merged

fix: support productRef when removing files #353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions pbxproj/pbxextensions/ProjectFiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def remove_file_by_id(self, file_id, target_name=None):
for build_file_id in filter(lambda x: x in self.objects, build_phase.files):
build_file = self.objects[build_file_id]

if build_file.fileRef == file_ref.get_id():
if hasattr(build_file, 'fileRef') and build_file.fileRef == file_ref.get_id():
# remove the build file from the phase
build_phase.remove_build_file(build_file)

Expand All @@ -339,7 +339,11 @@ def remove_file_by_id(self, file_id, target_name=None):
target.remove_build_phase(build_phase)

# remove it iff it's removed from all targets or no build file reference it
if len([1 for x in self.objects.get_objects_in_section('PBXBuildFile') if x.fileRef == file_ref.get_id()]) != 0:
if len([
True
for x in self.objects.get_objects_in_section('PBXBuildFile')
if hasattr(x, 'fileRef') == file_ref.get_id()
]) != 0:
Comment on lines +342 to +346
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if len([
True
for x in self.objects.get_objects_in_section('PBXBuildFile')
if hasattr(x, 'fileRef') == file_ref.get_id()
]) != 0:
if len([1 for x in self.objects.get_objects_in_section('PBXBuildFile') if hasattr(x, 'fileRef') && x.fileRef == file_ref.get_id()]) != 0:

return True

# remove the file from any groups if there is no reference from any target
Expand Down
Loading