diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:01:29 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:01:29 +0200 |
| commit | 9a2a524f1e311853d08050be2dcdddc09ac7759a (patch) | |
| tree | d8e4a24169fce88c2d89931d58514889a0bcb0ea /structures.cpp | |
| parent | 2.3 (diff) | |
| download | FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.tar.gz FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.tar.bz2 FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.zip | |
3.0
Diffstat (limited to 'structures.cpp')
| -rw-r--r-- | structures.cpp | 105 |
1 files changed, 69 insertions, 36 deletions
diff --git a/structures.cpp b/structures.cpp index 57bea755..31c66650 100644 --- a/structures.cpp +++ b/structures.cpp @@ -7,6 +7,28 @@ using FreeFileSync::SyncConfiguration; using FreeFileSync::MainConfiguration; +Zstring FreeFileSync::defaultIncludeFilter() +{ + static Zstring include(DefaultStr("*")); //include all files/folders + return include; +} + + +Zstring FreeFileSync::defaultExcludeFilter() +{ +#ifdef FFS_WIN + static Zstring exclude(wxT("\ +\\System Volume Information\\\n\ +\\RECYCLER\\\n\ +\\RECYCLED\\\n\ +\\$Recycle.Bin\\")); //exclude Recycle Bin +#elif defined FFS_LINUX + static Zstring exclude; //exclude nothing +#endif + return exclude; +} + + bool FreeFileSync::recycleBinExistsWrap() { return recycleBinExists(); @@ -30,28 +52,31 @@ wxString FreeFileSync::getVariantName(CompareVariant var) SyncConfiguration::Variant SyncConfiguration::getVariant() const { - if ( exLeftSideOnly == SYNC_DIR_CFG_RIGHT && - exRightSideOnly == SYNC_DIR_CFG_RIGHT && - leftNewer == SYNC_DIR_CFG_RIGHT && - rightNewer == SYNC_DIR_CFG_RIGHT && - different == SYNC_DIR_CFG_RIGHT && - conflict == SYNC_DIR_CFG_NONE) + if (automatic == true) + return AUTOMATIC; //automatic mode + + if ( exLeftSideOnly == SYNC_DIR_RIGHT && + exRightSideOnly == SYNC_DIR_RIGHT && + leftNewer == SYNC_DIR_RIGHT && + rightNewer == SYNC_DIR_RIGHT && + different == SYNC_DIR_RIGHT && + conflict == SYNC_DIR_RIGHT) return MIRROR; //one way -> - else if (exLeftSideOnly == SYNC_DIR_CFG_RIGHT && - exRightSideOnly == SYNC_DIR_CFG_NONE && - leftNewer == SYNC_DIR_CFG_RIGHT && - rightNewer == SYNC_DIR_CFG_NONE && - different == SYNC_DIR_CFG_NONE && - conflict == SYNC_DIR_CFG_NONE) + else if (exLeftSideOnly == SYNC_DIR_RIGHT && + exRightSideOnly == SYNC_DIR_NONE && + leftNewer == SYNC_DIR_RIGHT && + rightNewer == SYNC_DIR_NONE && + different == SYNC_DIR_NONE && + conflict == SYNC_DIR_NONE) return UPDATE; //Update -> - else if (exLeftSideOnly == SYNC_DIR_CFG_RIGHT && - exRightSideOnly == SYNC_DIR_CFG_LEFT && - leftNewer == SYNC_DIR_CFG_RIGHT && - rightNewer == SYNC_DIR_CFG_LEFT && - different == SYNC_DIR_CFG_NONE && - conflict == SYNC_DIR_CFG_NONE) + else if (exLeftSideOnly == SYNC_DIR_RIGHT && + exRightSideOnly == SYNC_DIR_LEFT && + leftNewer == SYNC_DIR_RIGHT && + rightNewer == SYNC_DIR_LEFT && + different == SYNC_DIR_NONE && + conflict == SYNC_DIR_NONE) return TWOWAY; //two way <-> else return CUSTOM; //other @@ -62,29 +87,35 @@ void SyncConfiguration::setVariant(const Variant var) { switch (var) { + case AUTOMATIC: + automatic = true; + break; case MIRROR: - exLeftSideOnly = SYNC_DIR_CFG_RIGHT; - exRightSideOnly = SYNC_DIR_CFG_RIGHT; - leftNewer = SYNC_DIR_CFG_RIGHT; - rightNewer = SYNC_DIR_CFG_RIGHT; - different = SYNC_DIR_CFG_RIGHT; - conflict = SYNC_DIR_CFG_NONE; + automatic = false; + exLeftSideOnly = SYNC_DIR_RIGHT; + exRightSideOnly = SYNC_DIR_RIGHT; + leftNewer = SYNC_DIR_RIGHT; + rightNewer = SYNC_DIR_RIGHT; + different = SYNC_DIR_RIGHT; + conflict = SYNC_DIR_RIGHT; break; case UPDATE: - exLeftSideOnly = SYNC_DIR_CFG_RIGHT; - exRightSideOnly = SYNC_DIR_CFG_NONE; - leftNewer = SYNC_DIR_CFG_RIGHT; - rightNewer = SYNC_DIR_CFG_NONE; - different = SYNC_DIR_CFG_NONE; - conflict = SYNC_DIR_CFG_NONE; + automatic = false; + exLeftSideOnly = SYNC_DIR_RIGHT; + exRightSideOnly = SYNC_DIR_NONE; + leftNewer = SYNC_DIR_RIGHT; + rightNewer = SYNC_DIR_NONE; + different = SYNC_DIR_NONE; + conflict = SYNC_DIR_NONE; break; case TWOWAY: - exLeftSideOnly = SYNC_DIR_CFG_RIGHT; - exRightSideOnly = SYNC_DIR_CFG_LEFT; - leftNewer = SYNC_DIR_CFG_RIGHT; - rightNewer = SYNC_DIR_CFG_LEFT; - different = SYNC_DIR_CFG_NONE; - conflict = SYNC_DIR_CFG_NONE; + automatic = false; + exLeftSideOnly = SYNC_DIR_RIGHT; + exRightSideOnly = SYNC_DIR_LEFT; + leftNewer = SYNC_DIR_RIGHT; + rightNewer = SYNC_DIR_LEFT; + different = SYNC_DIR_NONE; + conflict = SYNC_DIR_NONE; break; case CUSTOM: assert(false); @@ -104,6 +135,8 @@ wxString MainConfiguration::getSyncVariantName() //seems to be all in sync... switch (mainVariant) { + case SyncConfiguration::AUTOMATIC: + return _("<Automatic>"); case SyncConfiguration::MIRROR: return _("Mirror ->>"); case SyncConfiguration::UPDATE: |