mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-02 00:44:52 +01:00
Revert "SyncServer - handle if globally enabled, but no projects"
This reverts commit a294665ec6.
This commit is contained in:
parent
a294665ec6
commit
d92d70a4df
1 changed files with 2 additions and 18 deletions
|
|
@ -401,17 +401,6 @@ class SyncServerModule(PypeModule, ITrayModule):
|
||||||
|
|
||||||
return remote_site
|
return remote_site
|
||||||
|
|
||||||
def get_enabled_projects(self):
|
|
||||||
"""Returns list of projects which have SyncServer enabled."""
|
|
||||||
enabled_projects = []
|
|
||||||
for project in self.connection.projects():
|
|
||||||
project_name = project["name"]
|
|
||||||
project_settings = self.get_sync_project_setting(project_name)
|
|
||||||
if project_settings:
|
|
||||||
enabled_projects.append(project_name)
|
|
||||||
|
|
||||||
return enabled_projects
|
|
||||||
|
|
||||||
""" End of Public API """
|
""" End of Public API """
|
||||||
|
|
||||||
def get_local_file_path(self, collection, site_name, file_path):
|
def get_local_file_path(self, collection, site_name, file_path):
|
||||||
|
|
@ -424,7 +413,7 @@ class SyncServerModule(PypeModule, ITrayModule):
|
||||||
return local_file_path
|
return local_file_path
|
||||||
|
|
||||||
def _get_remote_sites_from_settings(self, sync_settings):
|
def _get_remote_sites_from_settings(self, sync_settings):
|
||||||
if not self.enabled or not sync_settings.get('enabled'):
|
if not self.enabled or not sync_settings['enabled']:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
remote_sites = [self.DEFAULT_SITE, self.LOCAL_SITE]
|
remote_sites = [self.DEFAULT_SITE, self.LOCAL_SITE]
|
||||||
|
|
@ -435,7 +424,7 @@ class SyncServerModule(PypeModule, ITrayModule):
|
||||||
|
|
||||||
def _get_enabled_sites_from_settings(self, sync_settings):
|
def _get_enabled_sites_from_settings(self, sync_settings):
|
||||||
sites = [self.DEFAULT_SITE]
|
sites = [self.DEFAULT_SITE]
|
||||||
if self.enabled and sync_settings.get('enabled'):
|
if self.enabled and sync_settings['enabled']:
|
||||||
sites.append(self.LOCAL_SITE)
|
sites.append(self.LOCAL_SITE)
|
||||||
|
|
||||||
return sites
|
return sites
|
||||||
|
|
@ -456,11 +445,6 @@ class SyncServerModule(PypeModule, ITrayModule):
|
||||||
if not self.enabled:
|
if not self.enabled:
|
||||||
return
|
return
|
||||||
|
|
||||||
enabled_projects = self.get_enabled_projects()
|
|
||||||
if not enabled_projects:
|
|
||||||
self.enabled = False
|
|
||||||
return
|
|
||||||
|
|
||||||
self.lock = threading.Lock()
|
self.lock = threading.Lock()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue