Commit graph

4862 commits

Author SHA1 Message Date
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
2fefc428a8 Write file Id to journal table.
Since this requires a change of existing sync journals, database migration
code was added.
2013-10-25 13:31:00 +02:00
Klaas Freitag
17220f2604 Query file Id from server if unknown. 2013-10-25 13:31:00 +02:00
Klaas Freitag
7a68961b25 Add handling for the file_id data to the sync items. 2013-10-25 13:31:00 +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
Daniel Molkentin
aa2baa45fb Cleanups, ownership for ssl error handler 2013-10-24 12:55:26 +02:00
Daniel Molkentin
eda5feb82c Bring back proper ssl handling 2013-10-24 00:29:08 +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
Daniel Molkentin
d2b445c80c Basic port, misses wizard 2013-10-23 14:48:53 +02:00
Klaas Freitag
e7b94e437e Merge remote-tracking branch 'freitag/dav' into ocsync 2013-10-23 14:37:12 +02:00
hefee
b4621e22e6 Merge pull request #1114 from owncloud/freebsd-inotify
Need inotify on FreeBSD for libsync
2013-10-23 02:36:12 -07:00
hefee
38679f79b5 Need inotify on FreeBSD for libsync 2013-10-23 01:24:27 +02:00
hefee
a927caf2b0 Fixing Utility::platform for all platforms 2013-10-23 00:59:29 +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
Daniel Molkentin
29c846a764 WIP: Dissolve owncloudinfo class 2013-10-21 21:42:52 +02:00
Jenkins for ownCloud
804c9fbd6f [tx-robot] updated from transifex 2013-10-21 12:01:30 -04:00
Jenkins for ownCloud
2edebdef08 [tx-robot] updated from transifex 2013-10-20 06:49:52 -04: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
Daniel Molkentin
a91ba0fd48 WIP: Move network tasks from ownCloudInfo into Job classes. 2013-10-18 12:24:29 +02:00
Daniel Molkentin
a25d55a265 Add QtJson to 3rdparty, use it in ownCloudInfo 2013-10-18 02:00:19 +02:00
Jenkins for ownCloud
c99f75b247 [tx-robot] updated from transifex 2013-10-17 12:48:20 -04: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
0efbfb10aa Fix MOVE of directory.
Remove the right entry from the database (i.e: the original file name)
Fetch the etags of the sub entries
2013-10-17 13:06:39 +02:00
Olivier Goffart
cb8006b89f Fix comments of the propagation step.
Also, don't mark item as removed if the instruction is not REMOVE
2013-10-17 12:09:44 +02:00
Klaas Freitag
660469cbf5 Do not propagate a move of the Shared folder. 2013-10-17 10:48:31 +02:00
Daniel Molkentin
a06e551469 Merge pull request #1103 from Absolight/freebsd-port
Patches for FreeBSD
2013-10-16 08:52:46 -07:00
Olivier Goffart
746b86a1dd Save the progress db once a chunk has been upload
Allow to resume when we cancel the sync
2013-10-16 16:47:24 +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
Mathieu Arnold
1c594b6a8d FreeBSD doesn't have statvfs64, like MacOS X. 2013-10-16 15:57:59 +02:00
Mathieu Arnold
2b652422b9 Don't call make directly, it can have another name. 2013-10-16 15:57:05 +02:00
Olivier Goffart
313832de8d Put the progress database within the journal 2013-10-16 12:01:14 +02:00
Klaas Freitag
738d868d38 Bump version to 0.90.3 2013-10-16 09:29:24 +02:00
Jenkins for ownCloud
250f281189 [tx-robot] updated from transifex 2013-10-15 23:26:29 -04:00
Olivier Goffart
2c63f7a24d Merge branch '1.4'
Conflicts:
	VERSION.cmake
	src/mirall/application.cpp
	src/mirall/application.h
	src/mirall/csyncthread.cpp
	src/mirall/folder.cpp
	src/mirall/folder.h
	src/mirall/folderman.cpp
2013-10-15 17:00:53 +02:00
Olivier Goffart
f9ce534687 Merge branch 'dav' into ocsync
Conflicts:
	src/csync.c
2013-10-15 16:55:22 +02:00
Olivier Goffart
10fba886dc Do not elide the progress text
It's size is computed so the text fit, there is no need to alide it.

Fixes #1094
2013-10-15 14:58:34 +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