Merge pull request #405 from nextcloud/sync-hidden-files

Sync hidden files by default.
This commit is contained in:
Camila Ayres 2018-09-02 12:23:29 +02:00 committed by GitHub
commit 07013783ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions

View File

@ -319,7 +319,7 @@ int main(int argc, char **argv)
options.trustSSL = false;
options.useNetrc = false;
options.interactive = true;
options.ignoreHiddenFiles = true;
options.ignoreHiddenFiles = false; // Default is to sync hidden files
options.nonShib = false;
options.restartTimes = 3;
options.uplimit = 0;

View File

@ -680,7 +680,7 @@ void AccountSettings::slotFolderWizardAccepted()
/* take the value from the definition of already existing folders. All folders have
* the same setting so far.
* The default is to not sync hidden files
* The default is to sync hidden files
*/
definition.ignoreHiddenFiles = folderMan->ignoreHiddenFiles();

View File

@ -49,7 +49,7 @@ class FolderDefinition
public:
FolderDefinition()
: paused(false)
, ignoreHiddenFiles(true)
, ignoreHiddenFiles(false)
{
}

View File

@ -1372,8 +1372,10 @@ QString FolderMan::findGoodPathForNewSyncFolder(const QString &basePath, const Q
bool FolderMan::ignoreHiddenFiles() const
{
if (_folderMap.empty()) {
return true;
// Currently no folders in the manager -> return default
return false;
}
// Since the hiddenFiles settings is the same for all folders, just return the settings of the first folder
return _folderMap.begin().value()->ignoreHiddenFiles();
}