IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

Browse Source
This commit is contained in:
Tatiana Lopaeva 2022-02-10 13:16:52 +03:00
commit 214df42f57
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/ASC.Data.Backup.Core/Service/BackupWorker.cs
View File

@ -262,16 +262,9 @@ namespace ASC.Data.Backup.Services
BackupProgressEnum = progressItem.BackupProgressItemEnum.Convert() BackupProgressEnum = progressItem.BackupProgressItemEnum.Convert()
}; };
if (progressItem is BackupProgressItem backupProgressItem && backupProgressItem.Link != null) if ((progressItem.BackupProgressItemEnum == BackupProgressItemEnum.Backup || progressItem.BackupProgressItemEnum == BackupProgressItemEnum.Transfer) && progressItem.Link != null)
{ {
progress.Link = backupProgressItem.Link; progress.Link = progressItem.Link;
}
else
{
if (progressItem is TransferProgressItem transferProgressItem && transferProgressItem.Link != null)
{
progress.Link = transferProgressItem.Link;
}
} }
return progress; return progress;
@ -312,17 +305,31 @@ namespace ASC.Data.Backup.Services
public abstract class BaseBackupProgressItem : DistributedTaskProgress public abstract class BaseBackupProgressItem : DistributedTaskProgress
{ {
private int? tenantId; private int? _tenantId;
public int TenantId public int TenantId
{ {
get get
{ {
return tenantId ?? GetProperty<int>(nameof(tenantId)); return _tenantId ?? GetProperty<int>(nameof(_tenantId));
} }
set set
{ {
tenantId = value; _tenantId = value;
SetProperty(nameof(tenantId), value); SetProperty(nameof(_tenantId), value);
}
}
private string _link;
public string Link
{
get
{
return _link ?? GetProperty<string>(nameof(_link));
}
set
{
_link = value;
SetProperty(nameof(_link), value);
} }
} }
@ -358,7 +365,6 @@ namespace ASC.Data.Backup.Services
private string StorageBasePath { get; set; } private string StorageBasePath { get; set; }
public bool BackupMail { get; set; } public bool BackupMail { get; set; }
public Dictionary<string, string> StorageParams { get; set; } public Dictionary<string, string> StorageParams { get; set; }
public string Link { get; private set; }
public string TempFolder { get; set; } public string TempFolder { get; set; }
private string CurrentRegion { get; set; } private string CurrentRegion { get; set; }
private Dictionary<string, string> ConfigPaths { get; set; } private Dictionary<string, string> ConfigPaths { get; set; }
@ -664,8 +670,6 @@ namespace ASC.Data.Backup.Services
public string TargetRegion { get; set; } public string TargetRegion { get; set; }
public bool TransferMail { get; set; } public bool TransferMail { get; set; }
public bool Notify { get; set; } public bool Notify { get; set; }
public string Link { get; set; }
public string TempFolder { get; set; } public string TempFolder { get; set; }
public Dictionary<string, string> ConfigPaths { get; set; } public Dictionary<string, string> ConfigPaths { get; set; }
public string CurrentRegion { get; set; } public string CurrentRegion { get; set; }