SyncServer GUI - Hound

This commit is contained in:
Petr Kalis 2021-02-12 17:06:28 +01:00
parent d55060d7dd
commit 8fe2544d1f
4 changed files with 17 additions and 21 deletions

View file

@ -439,7 +439,7 @@ class GDriveHandler(AbstractProvider):
while response is None:
if server.is_representation_paused(representation['_id'],
check_parents=True,
project_name=collection):
project_name=collection):
raise ValueError("Paused during process, please redo.")
if status:
status_val = float(status.progress())

View file

@ -56,4 +56,4 @@ class LocalDriveHandler(AbstractProvider):
for name in dir_names:
lst.append(os.path.join(dir_path, name))
return lst
return lst

View file

@ -255,8 +255,9 @@ class SyncServer(PypeModule, ITrayModule):
"""
condition = representation_id in self._paused_representations
if check_parents and project_name:
condition = condition or self.is_project_paused(project_name) \
or self.is_paused()
condition = condition or \
self.is_project_paused(project_name) or \
self.is_paused()
return condition
def pause_project(self, project_name):
@ -641,7 +642,7 @@ class SyncServer(PypeModule, ITrayModule):
if tries < int(config_preset["retry_cnt"]):
return SyncStatus.DO_UPLOAD
else:
_, local_rec = self._get_site_rec(sites,local_site) or {}
_, local_rec = self._get_site_rec(sites, local_site) or {}
if not local_rec or not local_rec.get("created_dt"):
tries = self._get_tries_count_from_rec(local_rec)
# file will be skipped if unsuccessfully tried over
@ -997,7 +998,6 @@ class SyncServer(PypeModule, ITrayModule):
self._update_site(collection, query, update, arr_filter)
def _pause_unpause_site(self, collection, query,
representation, site_name, pause):
"""
@ -1230,9 +1230,8 @@ class SyncServer(PypeModule, ITrayModule):
(string) - absolute path on local system
"""
local_active_site = self.get_local_site(collection)
root_config = \
self.get_synced_preset(collection) \
["sites"][local_active_site]["root"]
sites = self.get_synced_preset(collection)["sites"]
root_config = sites[local_active_site]["root"]
if not root_config.get("root"):
root_config = {"root": root_config}
@ -1243,7 +1242,7 @@ class SyncServer(PypeModule, ITrayModule):
try:
anatomy = self.get_anatomy(collection)
path = anatomy.fill_root(path)
except:
except KeyError:
msg = "Error in resolving local root from anatomy"
self.log.error(msg)
raise ValueError(msg)

View file

@ -628,8 +628,7 @@ class SyncRepresentationModel(QtCore.QAbstractTableModel):
self.query = self.get_default_query()
self.default_query = list(self.get_default_query())
log.debug("!!! init query: {}".format(json.dumps(self.query,
indent=4)))
representations = self.dbcon.aggregate(self.query)
self.refresh(representations)
@ -745,7 +744,6 @@ class SyncRepresentationModel(QtCore.QAbstractTableModel):
for repre in result.get("paginatedResults"):
context = repre.get("context").pop()
data = repre.get("data").pop()
files = repre.get("files", [])
if isinstance(files, dict): # aggregate returns dictionary
files = [files]
@ -1550,11 +1548,10 @@ class SyncRepresentationDetailModel(QtCore.QAbstractTableModel):
remote_provider = _translate_provider_for_icon(self.sync_server,
self._project,
remote_site)
for repre in result.get("paginatedResults"):
# log.info("!!! repre:: {}".format(repre))
files = repre.get("files", [])
data = repre.get("data")
if isinstance(files, dict): # aggregate returns dictionary
files = [files]
@ -1840,11 +1837,10 @@ class SyncRepresentationDetailModel(QtCore.QAbstractTableModel):
'then': 3 # Paused
},
{
'case': {'$and': [
{'$or': ['$failed_remote',
'$failed_local']},
{'$eq': ['$tries', 3]}
]},
'case': {
'$and': [{'$or': ['$failed_remote',
'$failed_local']},
{'$eq': ['$tries', 3]}]},
'then': 1 # Failed (3 tries)
},
{
@ -2012,11 +2008,12 @@ class SizeDelegate(QtWidgets.QStyledItemDelegate):
def _convert_progress(value):
try:
progress = float(value)
except (ValueError, TypeError) as _:
except (ValueError, TypeError):
progress = 0.0
return progress
def _translate_provider_for_icon(sync_server, project, site):
"""
Get provider for 'site'