From 172dc31cdf3c70d0613a187514e8a5f5dad7488d Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 3 Mar 2021 14:14:13 +0100 Subject: [PATCH 1/3] removed usage of avalon mongo from settings --- pype/tools/settings/settings/widgets/categories.py | 5 ----- pype/tools/settings/settings/widgets/widgets.py | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pype/tools/settings/settings/widgets/categories.py b/pype/tools/settings/settings/widgets/categories.py index 40bd687faf..41184ae502 100644 --- a/pype/tools/settings/settings/widgets/categories.py +++ b/pype/tools/settings/settings/widgets/categories.py @@ -404,11 +404,6 @@ class ProjectWidget(SettingsCategoryWidget): if self is saved_tab_widget: return - system_settings = get_system_settings() - mongo_url = system_settings["modules"]["avalon"]["AVALON_MONGO"] - if not mongo_url: - mongo_url = os.environ["PYPE_MONGO"] - # If mongo url is not the same as was then refresh projects if mongo_url != os.environ["AVALON_MONGO"]: self.project_list_widget.refresh() diff --git a/pype/tools/settings/settings/widgets/widgets.py b/pype/tools/settings/settings/widgets/widgets.py index 656aaaa652..ccd437ece3 100644 --- a/pype/tools/settings/settings/widgets/widgets.py +++ b/pype/tools/settings/settings/widgets/widgets.py @@ -643,10 +643,7 @@ class ProjectListWidget(QtWidgets.QWidget): items = [self.default] - system_settings = get_system_settings() - mongo_url = system_settings["modules"]["avalon"]["AVALON_MONGO"] - if not mongo_url: - mongo_url = os.environ["PYPE_MONGO"] + mongo_url = os.environ["PYPE_MONGO"] # Force uninstall of whole avalon connection if url does not match # to current environment and set it as environment From c71ca0fdd4fcba033303279c912d600741184fcd Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 3 Mar 2021 14:31:58 +0100 Subject: [PATCH 2/3] do not query subset documents if subset filters are empty --- pype/plugins/publish/collect_anatomy_instance_data.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pype/plugins/publish/collect_anatomy_instance_data.py b/pype/plugins/publish/collect_anatomy_instance_data.py index 99fbe8a52e..4fd657167c 100644 --- a/pype/plugins/publish/collect_anatomy_instance_data.py +++ b/pype/plugins/publish/collect_anatomy_instance_data.py @@ -149,10 +149,12 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin): "name": subset_name }) - subset_docs = list(io.find({ - "type": "subset", - "$or": subset_filters - })) + subset_docs = [] + if subset_filters: + subset_docs = list(io.find({ + "type": "subset", + "$or": subset_filters + })) subset_ids = [ subset_doc["_id"] From d486887eb8a41bb0da2326c9d403ebcfc3f8758b Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 3 Mar 2021 15:18:11 +0100 Subject: [PATCH 3/3] removed whole check of mongo url change --- pype/tools/settings/settings/widgets/categories.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pype/tools/settings/settings/widgets/categories.py b/pype/tools/settings/settings/widgets/categories.py index 41184ae502..07f7291e91 100644 --- a/pype/tools/settings/settings/widgets/categories.py +++ b/pype/tools/settings/settings/widgets/categories.py @@ -404,10 +404,6 @@ class ProjectWidget(SettingsCategoryWidget): if self is saved_tab_widget: return - # If mongo url is not the same as was then refresh projects - if mongo_url != os.environ["AVALON_MONGO"]: - self.project_list_widget.refresh() - def _create_root_entity(self): self.entity = ProjectSettings(change_state=False) self.entity.on_change_callbacks.append(self._on_entity_change)