Dominique Fuchs
0e6a9fd0c1
Don't need a second if for non-Windows, using Qt macro for platform check
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 7750d2198d
2019-12-05 20:05:06 +01:00
Dominique Fuchs
ed7c489722
Fixed typo preventing successful path rename on Win and modified ASSERT for Window path styles
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit f993e7c555
2019-12-05 20:04:25 +01:00
Camila San
0a373ea708
Checks if exclude file is empty before creating the regular expressions.
...
The default file created by the application it is not empty.
Signed-off-by: Camila San <hello@camila.codes>
2019-10-17 21:03:42 +02:00
asapelkin
374375ce3f
little loops optimization
...
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
2019-10-17 20:55:56 +02:00
Dominique Fuchs
a0e794a7f1
Numoerous safe conversions implemented. Added additional Utility::convertSizeToDWORD for windows builds.
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit d6af025a46
2019-10-17 19:34:16 +02:00
Dominique Fuchs
0761342840
Corrected namespace when calling convertSizetoUint
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 82fa10c227
2019-10-17 19:34:16 +02:00
Dominique Fuchs
4da9123b67
Renamed conversion function to make intention more clear. Also defaulted to 'controlled truncation' to not stupidly crash. TBD/TODO: Better handling for such things.
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 46e0a05078
2019-10-17 19:34:16 +02:00
Samir Benmendil
5e3c2d2a96
Fix fullPath matching
...
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
7a9b13a563
Manual exclude are anchored to _localPath by default
...
This makes a lot of sense, since there should be no file to be synced
outside of _localPath.
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
e27645cb00
Extract loadExcludeFile and use it when discovering new exclude files
...
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
34fcb13e78
Never ignore .sync-exclude, even if excludeHidden
...
That is unless any of the parent folders is hidden.
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Samir Benmendil
14279104ae
Read .sync_exclude.lst in each subdirectory
...
Signed-off-by: Samir Benmendil <me@rmz.io>
2019-08-15 03:00:26 +01:00
Roeland Jago Douma
b7d0e5672a
Merge branch 'master' into upstream/pr/6616
2018-10-31 13:51:34 +01:00
Roeland Jago Douma
eb31e9205c
Merge branch 'master' into upstream/issues/6696-6610
2018-10-24 16:50:39 +02:00
Roeland Jago Douma
6b7328bb87
Merge branch 'master' into upstream/pr/6632
2018-10-23 22:48:34 +02:00
Roeland Jago Douma
9d9f96a685
Merge branch 'master' into upstream/pr/6615
2018-10-19 15:43:50 +02:00
kevin147147
e214234001
Rename README to README.md
...
Preview :)
2018-10-08 21:01:08 +02:00
kevin147147
54e58b51ab
Rename INSTALL to INSTALL.md
...
Preview :)
2018-10-08 20:57:34 +02:00
Markus Goetz
4f83bba829
Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY
...
Too many applications incorrectly use this attribute.
For #6696 #6610
2018-09-10 20:20:40 +02:00
Christian Kamm
3ec4fc6145
Update: Report on readdir() errors #6610
2018-09-10 14:33:36 +02:00
Olivier Goffart
d202942a2c
Reconcile: When detecting a local move, keep the local mtime
...
https://github.com/owncloud/client/issues/6629#issuecomment-402450691
2018-09-09 21:38:10 +02:00
Christian Kamm
283c4b13a1
Log: Adjust update/reconcile log verbosity
...
Not having these enabled by default is causing significant extra back
and forth with reporters since they must manually use --logdebug for the
log to be useful.
2018-09-09 21:34:41 +02:00
Roeland Jago Douma
a0c458d937
Fix output add E2E again
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-05 09:02:41 +02:00
Olivier Goffart
3e508329b5
csync_update: add the checksum in the discovery log
...
Issue #6414
2018-06-05 07:52:29 +02:00
Roeland Jago Douma
c1171d700e
Merge pull request #322 from nextcloud/upstream/pr/6404
...
Excludes: Expand doc, Desktop.ini only in root folder
2018-06-04 17:13:23 +02:00
Olivier Goffart
5f30177bfc
CSync: Remove unused error codes
...
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
2018-06-04 15:41:38 +02:00
Olivier Goffart
15e93c8a31
CSync: reconcile never returns an error
2018-06-04 15:41:38 +02:00
Olivier Goffart
be29fc2f69
csync: remove CSYNC_PARAM_ERROR
...
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
2018-06-04 15:41:38 +02:00
Olivier Goffart
0443f8dd4d
csync: Simplify csync_walk_local_tree/csync_walk_remote_tree
...
Small refactoring
2018-06-04 15:41:38 +02:00
Roeland Jago Douma
1262cbf4ef
Merge pull request #314 from nextcloud/upstream/pr/6373
...
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
2018-06-02 20:20:19 +02:00
Christian Kamm
5f7fd7c551
Excludes: Expand doc, Desktop.ini only in root folder
...
The Desktop.ini exclude was added for 2.4 because we add such a file to
the synced folder on Windows. It doesn't need to cover subdirectories.
2018-05-16 20:29:12 +02:00
Christian Kamm
75194d1821
SyncEngine: Make "local discovery?" question available
...
Also fix the minor bug that was mentioned and add tests.
2018-05-16 16:46:40 +02:00
Christian Kamm
8077748c9d
slotFolderDiscovered: Fix 'local' always being false
...
It was unused, so no harm done.
2018-05-16 16:44:36 +02:00
Olivier Goffart
b0f539fc1f
cmake: Remove references of now unused WITH_TESTING
...
Issue #6318
2018-05-16 13:00:17 +02:00
Daniel Nicoletti
16aa54ed64
Do not create new db entries when the remote tree does not have proper values
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d93f7269b8
Properly mark encrypted files for removal
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d3b6aacf3f
Fix merging remote and local trees when e2e files are involved
...
When populating the tree from the filesystem we need to fill
the e2eMangledName from DB and we when trying to find another
match on the oposite tree we need to take in account that names
don't match and search with the mangled name information
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
99117078f3
Remove table for e2e and add an e2eMangledName column ( #169 )
...
If the code was not complex enough syncing two tables
already started to give UNIQUE constrains errors on
simple sync operations, this also adds initial support
remote delete of an encrypted file
2018-02-12 12:50:51 +01:00
Tomaz Canabrava
d24a1e542e
Merge branch 'master' into clientSideEncryptionV3
2018-01-29 14:06:12 +01:00
Tomaz Canabrava
f4a50e88f5
[CSE] Ignore renames for downloaded files.
...
- TODO: Fix the incorrect "filename has been removed" popup.
The file is not removed, just the popup shows.
2018-01-28 23:59:53 +01:00
Tomaz Canabrava
d38e5e1529
[CSE] Bypass rename if it's e2e
...
The client tracks the files in server and locally, but the
names of the files differ in the server, but we do *not*
wanna rename the files to the server one, we wanna
keep it as is if it's an encrypted file.
2018-01-28 23:48:51 +01:00
Christian Kamm
c1b5412c16
Exclude regex: Use named captures
...
My benchmarks show no performance difference.
2018-01-18 10:24:24 +01:00
Christian Kamm
4337e8532e
Exclude matching: Speedup the full-path traversal case
...
Previously we'd use the full regex when the bname triggered a full-path
matching to take place. Now we have a simplified full-traversal regex
for this case that can be significantly faster to apply.
Triggered by #5017 but doesn't actually solve it.
2018-01-17 15:05:50 +01:00
Dominik Schmidt
cbf470f17b
Fix csync installation on windows
2018-01-13 13:58:17 +01:00
Olivier Goffart
437d45981e
Remove unused c_strlist
2018-01-13 13:58:17 +01:00
Olivier Goffart
3ae327ea8e
Modernize out CMakeLists.txt
...
Mainly uses target_include_directories instead of include_directories
so libraries public include directory get automatically added when adding
the target in target_link_library
2018-01-13 13:58:17 +01:00
Olivier Goffart
5d0aa5f039
Remove unused c_path
2018-01-13 13:58:17 +01:00
Olivier Goffart
41798cef18
Csync: remove some unused build system stuff
2018-01-13 13:58:17 +01:00
Olivier Goffart
1c11778693
Remove the unusued csync_file_locked_or_open test in csync_reconcile
...
It is unused. Also remove the corresponding error code
2018-01-13 13:58:17 +01:00
Olivier Goffart
3ddd4b6f16
Get rid of csync_log
...
We use Qt's debugging code everywhere
2018-01-13 13:58:17 +01:00
