Refactor - changed logic to loop through alt sites

openpype/plugins/publish/integrate_new.py

@@ -8,6 +8,7 @@
 import six
 import re
 import shutil
+from collections import deque
 
 from bson.objectid import ObjectId
 from pymongo import DeleteOne, InsertOne
@@ -1199,21 +1200,23 @@ def _get_alt_site_pairs(self, conf_sites):
 
  # transitive relationship, eg site is alternative to another which is
  # alternative to nex site
- loop = True
- while loop:
- loop = False
- for site_name, alt_sites in alt_site_pairs.items():
- for alt_site in alt_sites:
-  # safety against wrong config
-  # {"SFTP": {"alternative_site": "SFTP"}
-  if alt_site == site_name:
-  continue
+ for site_name, alt_sites in alt_site_pairs.items():
+  sites_queue = deque(alt_sites)
+ while sites_queue:
+  alt_site = sites_queue.popleft()
+
+ # safety against wrong config
+ # {"SFTP": {"alternative_site": "SFTP"}
+ if alt_site == site_name or alt_site not in alt_site_pairs:
+ continue
 
- for alt_alt_site in alt_site_pairs.get(alt_site, []):
- if ( alt_alt_site != site_name
- and alt_alt_site not in alt_sites):
- alt_site_pairs[site_name].append(alt_alt_site)
- loop = True
+ for alt_alt_site in alt_site_pairs[alt_site]:
+ if (
+ alt_alt_site != site_name
+ and alt_alt_site not in alt_sites
+ ):
+ alt_sites.append(alt_alt_site)
+ sites_queue.append(alt_alt_site)
 
  return alt_site_pairs