Commit graph

2120 commits

Author SHA1 Message Date
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
Olivier Goffart
a70e51f690 Fix t1.pl since the argument of owncloudcmd have changed 2013-10-29 13:47:08 +01:00
Olivier Goffart
f707dc1a8b remove propagate function from csync_owncloud 2013-10-29 13:47:08 +01:00
Olivier Goffart
ae2b2c8cf8 Remove the other modules than owncloud
Only owncloud is supported now
2013-10-29 13:23:28 +01:00
Olivier Goffart
176daa7d96 Remove the propagate step.
Since the writing of the database has been removed, the propagate
step might as well be removed as it is performed by mirall.
2013-10-29 13:17:44 +01:00
Olivier Goffart
a11ecad41a Mark false conflict as UPDATED so we save their entry in the database 2013-10-29 12:14:51 +01:00
Klaas Freitag
b305c60e11 Make the logging a bit easier to read and more useful. 2013-10-28 14:35:31 +01:00
Klaas Freitag
f196fb582a Check for empty file Id before querying. 2013-10-28 14:34:30 +01:00
Klaas Freitag
554e35b8e5 Disabled tests to make them succeed again. Needs rework. 2013-10-25 14:43:04 +02:00
Klaas Freitag
84b07b3798 First attempt to implement server side move. 2013-10-25 13:25:07 +02:00
Klaas Freitag
352f513109 Read the file Id from the HTTP reply on PUTs. 2013-10-25 13:17:37 +02:00
Klaas Freitag
578a41f766 In case the file id is not in the db, do not get data from db.
If the file_id is not yet in the database it is not ok to read the file
tree data from the db.
2013-10-25 13:16:34 +02:00
Klaas Freitag
8b4b89ecad Copy the file id. 2013-10-25 13:15:25 +02:00
Klaas Freitag
7e9490545b Add a function to query the journal by the file_id. 2013-10-25 13:14:25 +02:00
Klaas Freitag
b0509fe368 Add the file ID to the TREEWALK struct. 2013-10-25 13:13:39 +02:00
Klaas Freitag
4440acdb1d Add fileId data support to csync.
That stores a life time lasting unique Id for every file which
is maintained by the server. It is used on the client to detect
server side moves.
2013-10-25 13:12:59 +02:00
Klaas Freitag
5a26221a6b Make test cases compile, still to fix. 2013-10-23 17:51:56 +02:00
Klaas Freitag
a52fd99a95 Removed database writing code.
All this is now done in the Qt based propagator class.
2013-10-23 17:51:16 +02:00
Klaas Freitag
0bba93e8b5 Rename vio function get_file_id to get_etag.
Since we introduce a file id now that has another semantics than the etag
the name would be very misleading.
2013-10-23 15:02:13 +02:00
Klaas Freitag
e01bc20898 Remove not so useful DAV_STRTOL define. 2013-10-23 14:50:41 +02:00
Klaas Freitag
e7b94e437e Merge remote-tracking branch 'freitag/dav' into ocsync 2013-10-23 14:37:12 +02:00
Klaas Freitag
74c6426075 Fix call to atoll, just pass the buffer 2013-10-22 17:58:18 +02:00
Klaas Freitag
e16560249c Use atoll to convert inode from db query results. 2013-10-22 17:49:49 +02:00
Klaas Freitag
0f6ca35e95 Updated changelog for 0.90.4. 2013-10-18 15:11:09 +02:00
Klaas Freitag
a1699bbbce Set version to 0.90.4 2013-10-18 14:57:11 +02:00
Klaas Freitag
0e61036fa5 Build with HBF debug all time. 2013-10-17 16:40:04 +02:00
Olivier Goffart
566a6f761b Make debug info in reconcile a bit more informative 2013-10-17 13:09:04 +02:00
Olivier Goffart
e69ecd3a80 hbf: add a callback when the chunk upload is finished
Also add an user_data to other callbacks
2013-10-16 16:46:50 +02:00
Klaas Freitag
738d868d38 Bump version to 0.90.3 2013-10-16 09:29:24 +02:00
Olivier Goffart
f9ce534687 Merge branch 'dav' into ocsync
Conflicts:
	src/csync.c
2013-10-15 16:55:22 +02:00
Olivier Goffart
6601395a6e Do not overwrite the neon error string with the HTTP error
When the errno is ERRNO_ERROR_STRING it means the error string is a
valid string with the error, and it should not be overwritten with
the HTTP reason_phrase

Fixes https://github.com/owncloud/mirall/issues/1088
2013-10-15 14:02:17 +02:00
Olivier Goffart
2479cda8ea Merge remote-tracking branch 'freitag/dav' into dav 2013-10-15 14:00:40 +02:00
Klaas Freitag
fc10400fd5 Also count deleted and renamed files to overall count 2013-10-14 11:42:57 +02:00
Klaas Freitag
3421f1871f Disable inode check for all platforms. (core #4953) 2013-10-14 11:42:43 +02:00
Klaas Freitag
958d712199 Also count deleted and renamed files to overall count 2013-10-14 11:15:44 +02:00
Klaas Freitag
df3020ee91 Remove resetting of the internal csync error state.
Resetting this in trivial helper functions leads to the fact that
error conditions happening in functions calling these helpers get
lost which should not happen.
2013-10-11 10:27:04 +02:00