frodovdr/kopano-ol-extension
1
0
Fork 0
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

[KOE-24] Switched to using folder ids for sync keys, as they are stable between sessions.

Browse Source
This commit is contained in:
Patrick Simpson 2017-06-07 10:36:01 +02:00
parent dd837caba5
commit 747de0d6c1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SyncState/FeatureSyncState.cs
View File

@ -221,7 +221,12 @@ namespace Acacia.Features.SyncState
public bool IsSyncing { get { return Sync != null && Sync.todo > 0; } } public bool IsSyncing { get { return Sync != null && Sync.todo > 0; } }
[SoapField(5)] [SoapField(5)]
public string id; // TODO: backend folder id public string id;
public string Key
{
get { return id; }
}
} }
public struct Data2 public struct Data2
@ -328,20 +333,19 @@ namespace Acacia.Features.SyncState
// Add to the syncing content // Add to the syncing content
IsSyncing = true; IsSyncing = true;
_syncContent[content.synckey] = content; _syncContent[content.Key] = content;
syncingNow.Add(content.synckey); syncingNow.Add(content.Key);
debug.AppendLine(string.Format("\tFolder: {0} \tSync: {1} \tStatus: {2} / {3}", debug.AppendLine(string.Format("\tFolder: {0} \tSync: {1} \tStatus: {2} / {3}",
content.synckey, content.IsSyncing, content.Sync.done, content.Sync.total)); content.Key, content.IsSyncing, content.Sync.done, content.Sync.total));
} }
} }
debug.AppendLine(string.Format("Calculating totals: ({0})", IsSyncing));
// Clean up any done items // Clean up any done items
bool _syncingNow = false; bool _syncingNow = false;
foreach (DeviceDetails.ContentData content in _syncContent.Values) foreach (DeviceDetails.ContentData content in _syncContent.Values)
{ {
if (!syncingNow.Contains(content.synckey)) if (!syncingNow.Contains(content.Key))
{ {
content.Sync.MakeDone(); content.Sync.MakeDone();
} }
@ -351,6 +355,7 @@ namespace Acacia.Features.SyncState
} }
} }
IsSyncing = _syncingNow; IsSyncing = _syncingNow;
debug.AppendLine(string.Format("Calculating totals: ({0})", IsSyncing));
// Update totals // Update totals
Total = 0; Total = 0;
@ -360,7 +365,7 @@ namespace Acacia.Features.SyncState
Total += content.Sync.total; Total += content.Sync.total;
Done += content.Sync.done; Done += content.Sync.done;
debug.AppendLine(string.Format("\tFolder: {0} \tSync: {1} \tStatus: {2} / {3}", debug.AppendLine(string.Format("\tFolder: {0} \tSync: {1} \tStatus: {2} / {3}",
content.synckey, content.IsSyncing, content.Sync.done, content.Sync.total)); content.Key, content.IsSyncing, content.Sync.done, content.Sync.total));
} }
debug.AppendLine(string.Format("Total: {0} / {1} ({2}%)", Done, Total, CalculatePercentage(Done, Total))); debug.AppendLine(string.Format("Total: {0} / {1} ({2}%)", Done, Total, CalculatePercentage(Done, Total)));
Logger.Instance.Trace(_feature, "Syncing account {0}:\n{1}", _account, debug); Logger.Instance.Trace(_feature, "Syncing account {0}:\n{1}", _account, debug);