Merge pull request #1523 from pypeclub/bugfix/sync_server_local_site_issues

This commit is contained in:
Milan Kolar 2021-05-19 09:56:09 +02:00 committed by GitHub
commit e68991acfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions

View file

@ -170,7 +170,10 @@ class LocalDriveHandler(AbstractProvider):
site=site,
progress=status_val
)
target_file_size = os.path.getsize(target_path)
try:
target_file_size = os.path.getsize(target_path)
except FileNotFoundError:
pass
time.sleep(0.5)
def _normalize_site_name(self, site_name):

View file

@ -501,6 +501,8 @@ class SyncServerModule(PypeModule, ITrayModule):
items = self.get_configurable_items_for_site(project_name,
site_name,
scope)
# Local Settings need 'local' instead of real value
site_name = site_name.replace(get_local_site_id(), 'local')
editable[site_name] = items
return editable
@ -591,8 +593,6 @@ class SyncServerModule(PypeModule, ITrayModule):
else:
item["value"] = val
editable.append(item)
return editable
@ -877,7 +877,7 @@ class SyncServerModule(PypeModule, ITrayModule):
}
all_sites = {self.DEFAULT_SITE: studio_config}
if sync_enabled:
all_sites['local'] = {'provider': 'local_drive'}
all_sites[get_local_site_id()] = {'provider': 'local_drive'}
return all_sites
def get_provider_for_site(self, project_name=None, site=None):