mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity
2205 commits 471 branches 254 tags 467 MiB
Commit graph

2205 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Goffart
415b51b2b5 Some more checks in t1.pl 
Notably that the conflict file actually exists.  (There was not even a
conflict before because the filename of the touch was wrong)
 2013-11-14 18:03:50 +01:00
Olivier Goffart
4eb19000a4 Differentiate the RENAME and EVAL_RENAME 
EVAL_RENAME is set at the update phase and means that this is the destination of
a file that has been renamed.
RENAME is set for the file that need to be renamed.

Before, we knew the difference because of which remote the instruction was
but now we need to make the distinction explicit
 2013-11-14 17:08:42 +01:00
Klaas Freitag
bef7c3c48e Fixes to t3.pl, added some assertions. 2013-11-14 17:06:53 +01:00
Klaas Freitag
e40370f67a Use printInfo method in t3.pl 2013-11-14 16:10:41 +01:00
Olivier Goffart
11a131fa90 csync_statedb_query: Allow null fields in the database 
The fileid defaults to null for old database.
Since commit 4b8f2a287f,  we query
 the file id to get the etag.
c_strlist_add cannot append null entries, so it would just discard
the md5 instead
 2013-11-14 14:41:36 +01:00
Olivier Goffart
4d146e87d1 Remove INVALID_FILE_ID and consider empty file id as invalid 2013-11-14 13:43:26 +01:00
Olivier Goffart
b518adc203 Don't read from the db if the file id has changed. 
File id may change when upgrading to owncloud 6 or when upgrading to mirall 1.5

This also changes the location where we check if we need to read from
the DB.   Instead of doing it from csync_ftw,  we do it from
_csync_detect_update. In that function we know the etag and the file id.
Which mean we change the flag before the recursive call to csync_ftw instead
of in the begin of the function.  Therefore, we need to restore the flag
after calling the function to the previously saved state.
 2013-11-14 13:43:26 +01:00
Klaas Freitag
6b0b7d1b90 make t1.pl work again. 2013-11-14 13:07:55 +01:00
Klaas Freitag
4b8f2a287f Retrieve file_id together with etag from db if read from db. 2013-11-14 11:32:03 +01:00
Klaas Freitag
3cc2593f62 Handle invalid file_id correctly. 2013-11-14 11:31:30 +01:00
Klaas Freitag
c3e154b2e6 Do not overwrite with an invalid file_id. 2013-11-14 11:30:51 +01:00
Klaas Freitag
e9920bd760 Consider an empty fileid as invalid. 2013-11-13 14:57:34 +01:00
Olivier Goffart
908888a44e Rename 'md5' to 'etag' 
'md5' always has been the etag. The name md5 for it is misleading.
It is still called "md5" in the database to keep compatibility
 2013-11-13 14:29:31 +01:00
Olivier Goffart
3a1b868348 Directory with different etags should still be moved. 2013-11-13 14:04:51 +01:00
Klaas Freitag
a65c5b6f38 Install Headers of libhttpbf 2013-11-13 09:47:39 +01:00
Klaas Freitag
3714bb02f7 Put files with special char names to tarball and removed them. 
Jenkins on rotor.o.o is for some reason not able currently to
work with these file names.
 2013-11-11 20:44:31 +01:00
Klaas Freitag
9323658b01 Remove ne_sock_init and ne_sock_exit from owncloud module. 
This change, together with a change in mirall calling the two functions
in folderman, should fix https://github.com/owncloud/mirall/issues/1115

This needs to be verified and maybe reverted!
 2013-11-11 17:45:19 +01:00
Klaas Freitag
7f10b09a96 Set moved files which are changed to instruction EVAL. 2013-11-11 16:44:21 +01:00
Klaas Freitag
2875d08c16 Record the rename path also for remote renaming. 2013-11-08 11:17:43 +01:00
Klaas Freitag
4ebed84d33 New test: Move a dir remotely, but remove the local one. 2013-11-08 10:18:30 +01:00
Klaas Freitag
586cfa2aac Detect a NEW in the other tree, generate conflict condition. 2013-11-08 10:09:43 +01:00
Klaas Freitag
40e2e5891f Added more tests and info printing. 2013-11-07 16:57:51 +01:00
Klaas Freitag
07e8681181 Added printInfo convenience method. 2013-11-07 16:57:06 +01:00
Klaas Freitag
a6c4a9ac74 Test added: move a directory with a changed file in it. 2013-11-06 16:15:31 +01:00
Klaas Freitag
cac7595afd make createLocalFile to work with absolute path. 2013-11-06 16:14:21 +01:00
Klaas Freitag
97f5bd840e Add a function to calculate the MD5 sum of a file. 2013-11-06 16:13:39 +01:00
Klaas Freitag
cd823524b6 Enable dummy backend again to satisfy tests. 2013-11-06 14:12:31 +01:00
Klaas Freitag
84fa340085 Honor NDEBUG define in test. 2013-11-06 13:42:25 +01:00
Klaas Freitag
d080f7f7a7 Remove stray cat handling. 2013-11-06 13:28:38 +01:00
Klaas Freitag
ee69176a6b Revert "Add straycat handling functions." 
This reverts commit 171669c3a4.
This needs to be implemented in a different way.
 2013-11-06 13:21:45 +01:00
Klaas Freitag
fc33b5a8ab Fix treewalk test, clean test condition. 2013-11-06 13:13:44 +01:00
Klaas Freitag
bae3d2fc1b Fixed assertLocalAndRemoteDir arguments. 2013-11-06 11:31:51 +01:00
Klaas Freitag
eb33879906 Fix some requirement mentions in the INSTALL file. 2013-11-06 11:29:57 +01:00
Klaas Freitag
63069e4739 New test script for remote renames. 2013-11-06 11:29:57 +01:00
Klaas Freitag
862fffae39 Add more test data. 2013-11-06 11:29:57 +01:00
Klaas Freitag
60c56644ef Changes for more convenient test environment. 2013-11-06 11:29:57 +01:00
Klaas Freitag
95cc4c310b Read all data incl. file_id in get_stat_by_inode. 2013-11-06 11:29:56 +01:00
Klaas Freitag
171669c3a4 Add straycat handling functions. 2013-11-06 11:29:56 +01:00
Klaas Freitag
3fb7429f60 Cleanup renaming and record straycats to remove them from journal. 2013-11-06 11:29:56 +01:00
Klaas Freitag
de3963ac75 Set file_id correctly for renamed files. 2013-11-06 11:29:56 +01:00
Klaas Freitag
7b99d02875 Change order of the local assert of directories. 2013-11-04 14:55:17 +01:00
Olivier Goffart
1a6a6758d3 We need to restore the read_from_db flag AFTER closedir 
Else, we might dispatch to the wrong close call (the one from owncloud
instead of the one from the db,  resulting in a memory leak
 2013-10-31 11:38:00 +01:00
Olivier Goffart
f5391def6b Don't cleanup in owncloud's vio_module_shutdown 
All the cleanup is done in owncloud_commit which should
necessarily be called.

Should fix https://github.com/owncloud/mirall/issues/713
The problem was that csync_destroy was called on another csync
instance in another thread, resulting in a crash

Yes, there is still a problem with the proxy settings.
 2013-10-31 11:38:00 +01:00
Olivier Goffart
0a99aa5fc7 Don't forget to close the database. 
The code was removed when the code to write the database was removed.
But we still need to close the database
 2013-10-31 11:14:21 +01:00
Olivier Goffart
c9cfa16929 Fix memory leak by properly cleaning memory in csync_commit 
Restore two lines that were losts in the big merge from csync master
(b5ed352aa3)
 2013-10-31 10:05:15 +01:00
Olivier Goffart
8c4ecb4fba Only use etag to know if we should use the db or not 
Null file id might just mean the server don't support file id.
So use the database even if fileid is null
 2013-10-31 10:02:20 +01:00
Klaas Freitag
0b5f1e6dd2 Make tests compile without propagate code. 2013-10-30 17:35:25 +01:00
Klaas Freitag
17d5e67d96 Handle remote renames better. 2013-10-30 17:34:40 +01:00
Klaas Freitag
4412ec38e4 Properly check if the file type has changed. 2013-10-30 17:34:40 +01:00
Klaas Freitag
70b6a5a8b1 Adjust header name to latest server implementation. 2013-10-30 17:34:40 +01:00