Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

General: More fail safe delete old versions #2936

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,8 @@ def delete_only_repre_files(self, dir_paths, file_paths, delete=True):
os.remove(file_path)
self.log.debug("Removed file: {}".format(file_path))

remainders.remove(file_path_base)
if file_path_base in remainders:
remainders.remove(file_path_base)
continue

seq_path_base = os.path.split(seq_path)[1]
Expand Down
7 changes: 6 additions & 1 deletion openpype/plugins/load/delete_old_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ def delete_only_repre_files(self, dir_paths, file_paths, delete=True):
os.remove(file_path)
self.log.debug("Removed file: {}".format(file_path))

remainders.remove(file_path_base)
if file_path_base in remainders:
remainders.remove(file_path_base)
continue

seq_path_base = os.path.split(seq_path)[1]
Expand Down Expand Up @@ -333,6 +334,8 @@ def sort_func(ent):
def main(self, data, remove_publish_folder):
# Size of files.
size = 0
if not data:
return size

if remove_publish_folder:
size = self.delete_whole_dir_paths(data["dir_paths"].values())
Expand Down Expand Up @@ -418,6 +421,8 @@ def load(self, contexts, name=None, namespace=None, options=None):
)

data = self.get_data(context, versions_to_keep)
if not data:
continue

size += self.main(data, remove_publish_folder)
print("Progressing {}/{}".format(count + 1, len(contexts)))
Expand Down