SiteSync: Providers ignore that site is disabled

openpype/modules/sync_server/providers/dropbox.py

@@ -17,13 +17,19 @@ def __init__(self, project_name, site_name, tree=None, presets=None):
  self.active = False
  self.site_name = site_name
  self.presets = presets
+ self.dbx = None
 
  if not self.presets:
  log.info(
  "Sync Server: There are no presets for {}.".format(site_name)
  )
  return
 
+ if not self.presets["enabled"]:
+ log.debug("Sync Server: Site {} not enabled for {}.".
+ format(site_name, project_name))
+ return
+
  token = self.presets.get("token", "")
  if not token:
  msg = "Sync Server: No access token for dropbox provider"
@@ -44,16 +50,13 @@ def __init__(self, project_name, site_name, tree=None, presets=None):
  log.info(msg)
  return
 
- self.dbx = None
-
- if self.presets["enabled"]:
- try:
- self.dbx = self._get_service(
- token, acting_as_member, team_folder_name
- )
- except Exception as e:
- log.info("Could not establish dropbox object: {}".format(e))
- return
+ try:
+ self.dbx = self._get_service(
+ token, acting_as_member, team_folder_name
+ )
+ except Exception as e:
+ log.info("Could not establish dropbox object: {}".format(e))
+ return
 
  super(AbstractProvider, self).__init__()
 

openpype/modules/sync_server/providers/gdrive.py

@@ -73,6 +73,11 @@ def __init__(self, project_name, site_name, tree=None, presets=None):
  format(site_name))
  return
 
+ if not self.presets["enabled"]:
+ log.debug("Sync Server: Site {} not enabled for {}.".
+ format(site_name, project_name))
+ return
+
  current_platform = platform.system().lower()
  cred_path = self.presets.get("credentials_url", {}). \
  get(current_platform) or ''
@@ -97,11 +102,10 @@ def __init__(self, project_name, site_name, tree=None, presets=None):
  return
 
  self.service = None
- if self.presets["enabled"]:
- self.service = self._get_gd_service(cred_path)
+ self.service = self._get_gd_service(cred_path)
 
-  self._tree = tree
-  self.active = True
+ self._tree = tree
+ self.active = True
 
  def is_active(self):
  """