maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

engine: avoid sync mode comparisons against mode strings 

Instead of duplicating the sync mode strings, better compare
against the enum values. Better because it helps to catch
typos.
This commit is contained in:
Patrick Ohly 2012-08-31 12:21:11 +02:00
parent 5214e0052a
commit cbbe245693
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/syncevo/LocalTransportAgent.cpp
View File

@ -748,7 +748,8 @@ class LocalTransportAgentChild : public TransportAgent, private LoggerBase
const std::string &sourceName = entry.first;
const std::string &targetName = entry.second.first;
std::string sync = entry.second.second;
if (sync != "disabled") {
SyncMode mode = StringToSyncMode(sync);
if (mode != SYNC_NONE) {
SyncSourceNodes targetNodes = m_client->getSyncSourceNodes(targetName);
SyncSourceConfig targetSource(targetName, targetNodes);
string fullTargetName = clientContext + "/" + targetName;
@ -772,16 +773,16 @@ class LocalTransportAgentChild : public TransportAgent, private LoggerBase
serverConfig.first.c_str()));
}
// invert data direction
if (sync == "refresh-from-local") {
sync = "refresh-from-remote";
} else if (sync == "refresh-from-remote") {
sync = "refresh-from-local";
} else if (sync == "one-way-from-local") {
sync = "one-way-from-remote";
} else if (sync == "one-way-from-remote") {
sync = "one-way-from-local";
if (mode == SYNC_REFRESH_FROM_LOCAL) {
mode = SYNC_REFRESH_FROM_REMOTE;
} else if (mode == SYNC_REFRESH_FROM_REMOTE) {
mode = SYNC_REFRESH_FROM_LOCAL;
} else if (mode == SYNC_ONE_WAY_FROM_LOCAL) {
mode = SYNC_ONE_WAY_FROM_REMOTE;
} else if (mode == SYNC_ONE_WAY_FROM_REMOTE) {
mode = SYNC_ONE_WAY_FROM_LOCAL;
}
targetSource.setSync(sync, true);
targetSource.setSync(PrettyPrintSyncMode(mode, true), true);
targetSource.setURI(sourceName, true);
}
}

21
src/syncevo/SyncContext.cpp
View File

@ -1640,7 +1640,7 @@ void SyncContext::displaySourceProgress(sysync::TProgressEventEnum type,
peerIsClient ? "peer is client" : "peer is server");
SimpleSyncMode mode = SIMPLE_SYNC_NONE;
std::string sync = source.getSync();
SyncMode sync = StringToSyncMode(source.getSync());
switch (extra1) {
case 0:
switch (extra3) {
@ -1648,8 +1648,8 @@ void SyncContext::displaySourceProgress(sysync::TProgressEventEnum type,
mode = SIMPLE_SYNC_TWO_WAY;
if (m_serverMode &&
m_serverAlerted &&
(sync == "one-way-from-server" ||
sync == "one-way-from-local")) {
(sync == SYNC_ONE_WAY_FROM_SERVER ||
sync == SYNC_ONE_WAY_FROM_LOCAL) {
// As in the slow/refresh-from-server case below,
// pretending to do a two-way incremental sync
// is a correct way of executing the requested
@ -1674,8 +1674,8 @@ void SyncContext::displaySourceProgress(sysync::TProgressEventEnum type,
mode = SIMPLE_SYNC_SLOW;
if (m_serverMode &&
m_serverAlerted &&
(sync == "refresh-from-server" ||
sync == "refresh-from-local")) {
(sync == SYNC_REFRESH_FROM_SERVER ||
sync == SYNC_REFRESH_FROM_LOCAL) {
// We run as server and told the client to refresh
// its data. A slow sync is how some clients (the
// Synthesis engine included) execute that sync mode;
@ -2035,7 +2035,8 @@ void SyncContext::initSources(SourceList &sourceList)
boost::shared_ptr<PersistentSyncSourceConfig> sc(getSyncSourceConfig(name));
SyncSourceNodes source = getSyncSourceNodes (name);
std::string sync = sc->getSync();
if (sync != "disabled") {
SyncMode mode = StringToSyncMode(sync);
if (mode != SYNC_NONE) {
SourceType sourceType = SyncSource::getSourceType(source);
if (sourceType.m_backend == "virtual") {
//This is a virtual sync source, check and enable the referenced
@ -2497,18 +2498,18 @@ void SyncContext::getConfigXML(string &xml, string &configname)
datastores << " <resumeitemsupport>on</resumeitemsupport>\n";
}
string mode = source->getSync();
SyncMode mode = StringToSyncMode(source->getSync());
if (source->getForceSlowSync()) {
// we *want* a slow sync, but couldn't tell the client -> force it server-side
datastores << " <alertscript> FORCESLOWSYNC(); </alertscript>\n";
} else if (mode != "slow" &&
} else if (mode != SYNC_SLOW &&
// slow-sync detection not implemented when running as server,
// not even when initiating the sync (direct sync with phone)
!m_serverMode &&
// is implemented as "delete local data" + "slow sync",
// so a slow sync is acceptable in this case
mode != "refresh-from-server" &&
mode != "refresh-from-remote" &&
mode != SYNC_REFRESH_FROM_SERVER &&
mode != SYNC_REFRESH_FROM_REMOTE &&
// The forceSlow should be disabled if the sync session is
// initiated by a remote peer (eg. Server Alerted Sync)
!m_remoteInitiated &&