WindyMadman/seafile
1
0
Fork 0
mirror of https://github.com/haiwen/seafile.git synced 2025-01-08 11:57:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,348 Commits 105 Branches 0 Tags 17 MiB
master
Commit Graph

621 Commits

Author SHA1 Message Date
Jiaqiang Xu
c30de91731 [client] Support server properties. 
Server properties can be set by RPC set_server_property (server_url, key, value).

Currently only one server property is defined: "is_pro". You can set it to "true" or "false".
 2016-03-22 14:29:25 +08:00
Jiaqiang Xu
f88be89907 Clean up unused code. 2016-03-21 17:54:20 +08:00
Shuai Lin
abb5ac0b23 Improved updating proxy config when system proxy changes. 2016-03-18 12:36:05 +08:00
Shuai Lin
44f1e7d123 Added support of using system network proxy. 2016-03-18 11:54:00 +08:00
Jiaqiang Xu
b1b606e50b [client] Disable proxy in libcurl connections if proxy is not set. 2016-03-18 11:28:44 +08:00
Jiaqiang Xu
506c6cccc4 [win] Auto lock office file when it's opened. 2016-03-16 16:31:09 +08:00
Jiaqiang Xu
b6891b40a0 [client] Remove -Werror flag from makefile. 2016-03-08 10:36:45 +08:00
Jiaqiang Xu
d8bd9e24d0 [client] Fix compile warnings on Windows. 2016-03-02 11:48:12 +08:00
Jiaqiang Xu
c2f78e37fb Fix compile warnings. 2016-03-02 10:39:05 +08:00
Jiaqiang Xu
21b4dd9a26 [client] Make http transfer timeout to 120 seconds. 
In low bandwidth network 45 seconds is too small. It makes data
transfer fails more frequently.
 2016-03-01 17:52:45 +08:00
Jiaqiang Xu
d062bceb72 Always delete built-in ignored files when apply delete-dir operation in download. 2016-02-28 14:13:41 +08:00
Adrian Imboden
50a4dcd2da curl: avoid race conditions with crypto-functionality by using the CRYPTO_* functions from openssl 2016-02-26 09:48:06 +00:00
Jiaqiang Xu
f4a8c6ef00 [client] Fix a potential crash bug in download/upload. 2016-02-19 17:06:49 +08:00
Shuai Lin
89118fd28e [client] add breakpad support 2016-01-15 10:35:27 +08:00
Shuai Lin
06d05adba6 Merge pull request #1482 from haiwen/periodic-sync 
[client] Support periodic sync.
 2016-01-07 10:58:04 +08:00
Jiaqiang Xu
9e87b6d18d [client] Handle ccnet_job_manager_schedule_job() failure. 2016-01-04 17:57:26 +08:00
Jiaqiang Xu
a85ebe70cb [client] Fix a minor memory leak. 2015-12-29 17:17:33 +08:00
Jiaqiang Xu
779719f8d1 [client] Clean up repo stores when it's unsynced. 2015-12-29 17:03:53 +08:00
Jiaqiang Xu
f3f6fd4b12 [client] Record download fs objects progress for clone tasks. 2015-12-22 14:43:00 +08:00
Jiaqiang Xu
772648a05e [client] Support periodic sync. 
This feature is controlled by setting "sync-interval" property of
a repo. If the property is not set or <= 0, it's disabled; if it's > 0,
sync the repo every specified seconds.

If periodic sync is set for a repo, auto change detection is
disabled. And in every sync, the worktree is scanned, and latest
changes from the server is downloaded.
 2015-12-21 16:34:39 +08:00
Jiaqiang Xu
fdb25e8968 [client] Fix another redundant sync error message on startup. 2015-12-19 17:13:14 +08:00
Jiaqiang Xu
f3bbc83a9e [client] Fix redundant sync error message on startup. 2015-12-19 15:56:33 +08:00
Jiaqiang Xu
648f5b1d54 [client] Fix memory leak in load certificates. 2015-12-19 10:31:46 +08:00
Jiaqiang Xu
98eb107c41 [client] Delete path sync status when it's deleted/renamed in worktree. 2015-12-18 19:16:35 +08:00
Jiaqiang Xu
674a9acc65 [client] Fix a crash bug caused by loading certs. 2015-12-14 11:08:58 +08:00
Jiaqiang Xu
fb1a3ebf61 [client] Close directory handle after checking folder lock. 2015-11-24 17:00:44 +08:00
Jiaqiang Xu
41161fd293 [client] Temporarily disable sync error notification for index errors. 
Some recoverable index errors may be confusing.
 2015-11-24 13:46:18 +08:00
Jiaqiang Xu
8a6f038bdb [client] Don't delete changed or untracked files when delete dir on download. 2015-11-23 11:31:51 +08:00
Jiaqiang Xu
b3af295e21 [win] Set TCP send buffer size and TCP_NODELAY options. 2015-11-20 18:29:33 +08:00
Jiaqiang Xu
c679e89035 [client] Should initialize folder perms before loading repos on start. 2015-11-19 18:16:21 +08:00
Jiaqiang Xu
b8affcce1c [client] Fix a typo. 2015-11-19 17:59:06 +08:00
Jiaqiang Xu
f6e4d0d936 [client] Send sync error notifications. 
Notifications are sent in the following cases:
- A downloaded file is locked by other application on Windows;
- A locked file is updated locally, but the update cannot be uploaded to server since it's locked;
- A file path contains invalid characters on Windows, so it cannot be downloaded.
- Failed to index a file.
 2015-11-19 15:33:11 +08:00
Jiaqiang Xu
a114d00e4d [win] Don't checkout/rename invalid paths on download. 
If an invalid path is later renamed back to a valid path,
it will be checked out.
 2015-11-19 15:33:11 +08:00
Jiaqiang Xu
627f526767 [client] Don't conflict when a locked file is opened by Office. 2015-11-13 16:46:02 +08:00
Jiaqiang Xu
31553ed116 [client] Fix file locking bug for Office files. 2015-11-13 16:46:00 +08:00
Jiaqiang Xu
3d02adb19e Merge branch '4.4' 2015-10-27 13:30:51 +08:00
Jiaqiang Xu
569c7e440c [client] Fix sync problem for an update sequence. 
- Add a file
- Delete the file
- Add the same file again
 2015-10-22 16:02:53 +08:00
Shuai Lin
d571f3f6ab support -F,--central-config-dir flag in bin programs 2015-10-20 14:01:29 +08:00
Jiaqiang Xu
e6e14b6d9a [client] Fix upload progress display. 2015-10-16 11:02:05 +08:00
Jiaqiang Xu
a79fbe21b7 [client/win] Fix potential block locking problem in multi-threaded download. 2015-10-10 12:05:56 +08:00
Jiaqiang Xu
65932e712e [client] Don't use absolute path in conflict notification. 2015-09-18 14:02:02 +08:00
Jiaqiang Xu
c83db18a86 [client] Improve office temp file ignore handling. 2015-09-14 16:41:53 +08:00
Jiaqiang Xu
f87c33c9b9 [client] Fix ignore handling for deletion. 2015-09-14 16:41:51 +08:00
Jiaqiang Xu
a155d12137 Merge branch '4.3' 2015-09-14 16:40:26 +08:00
Shuai Lin
4c53aca927 Merge pull request #1359 from haiwen/client-side-keygen 
added rpc for client side keygen
 2015-09-12 11:40:39 +08:00
Jiaqiang Xu
df6acfb449 [client] Reduce upload/download threads to 3. 2015-09-10 19:23:32 +08:00
Jiaqiang Xu
bad4c61d96 [client] Popup notification when file conflicts. 
In order to detect conflict files, we also change the conflict suffix
to "(SFConflict username time-of-day)".
 2015-09-10 15:42:35 +08:00
Shuai Lin
6c95de784c fixed a typo in refresh_locked_path_status 2015-09-08 09:38:51 +08:00
Jiaqiang Xu
156b679927 [client] Allow removing and renaming a locked file. 2015-09-01 16:35:26 +08:00
Jiaqiang Xu
cfb91cc237 [client] Fix locked files status display. 2015-08-31 16:19:11 +08:00
Shuai Lin
4b93208516 added rpc for client side keygen 2015-08-29 20:56:09 +08:00
Jiaqiang Xu
a1ab06e671 Merge branch '4.3' 2015-08-26 14:42:44 +08:00
Jiaqiang Xu
60ecc00364 [client] On restart, use index to create commit. 2015-08-24 17:31:34 +08:00
Jiaqiang Xu
1ba8c2841f [client] Fix handling of removed folder on restart. 2015-08-24 14:24:25 +08:00
Jiaqiang Xu
20d99481b7 Fix bugs discovered by Coverity. 2015-08-19 11:11:45 +08:00
Jiaqiang Xu
1a3657c816 [client] Add one more message when fs tree is not changed in commit. 2015-08-18 17:39:07 +08:00
Jiaqiang Xu
1c58894562 [client] Improve index and change set consistency checking. 2015-08-18 13:45:24 +08:00
Jiaqiang Xu
b8572da5fc [client] Skip commiting if new root id == old root id. 2015-08-17 18:05:51 +08:00
Jiaqiang Xu
1a0315775a [client] Fix ignore bug. 2015-08-17 17:36:43 +08:00
Jiaqiang Xu
2e12da9a19 Merge pull request #1343 from haiwen/mac-load-system-ca 
[mac] use system ca bundle
 2015-08-13 10:39:45 +08:00
Jiaqiang Xu
467ec53d14 Merge branch '4.3' 2015-08-12 13:10:24 +08:00
Shuai Lin
422f869127 [mac] use system ca bundle 2015-08-12 13:02:36 +08:00
Jiaqiang Xu
4a7bb8b96d [client] Fix upload missing file bug and add sanity check for commit. 2015-08-11 10:40:35 +08:00
Jiaqiang Xu
5bc5cb03ca Fix a few sync problems. 
- Fail to download empty folder;
- Fail if file timestamp changed but content not changed.
- Sync file mode and timestamp changes.
 2015-08-08 15:17:07 +08:00
Jiaqiang Xu
cba73be991 Merge pull request #1328 from haiwen/rm-cdc 
don't use cdc when index block
 2015-07-31 11:32:43 +08:00
yejianguo
ff6e6a8510 don't use cdc when index block 2015-07-30 13:41:45 +08:00
Jiaqiang Xu
692c08c73b [client] Minor fixes. 
- Make seaf-cli download and sync work when relay port not set on server.
- Fix memory leak in change-set.c
 2015-07-28 20:01:01 +08:00
Jiaqiang Xu
efcd4b1339 Remove redundant log message. 2015-07-28 16:56:07 +08:00
Jiaqiang Xu
426d16f3be [client] Multi-threaded block transfer. 2015-07-28 16:54:04 +08:00
Shuai Lin
ee1838f029 [client] fixed a bug in refresh_locked_path_status 2015-07-25 14:52:39 +08:00
Jiaqiang Xu
0c0f2486f2 [client] Improve commit descriptions. 2015-07-23 13:54:24 +08:00
Jiaqiang Xu
eb80c3501b [client] Fix a few memory leaks. 2015-07-22 13:41:48 +08:00
Jiaqiang Xu
e779b1713a [client] Improve indexing performance for large repos. 2015-07-21 12:07:22 +08:00
Jiaqiang Xu
e8d8ded8df [client] Init file lock manager before repo manager. 2015-07-20 14:12:14 +08:00
Jiaqiang Xu
c401786000 [client] Release libcurl connection after a network error. 
This prevents libcurl from reusing dead connections after network
is disconnected and connected again.
 2015-07-09 17:33:03 +08:00
Jiaqiang Xu
f509d232c2 Merge branch '4.2' 2015-07-09 17:29:43 +08:00
Jiaqiang Xu
0ebe480cf4 [client] Dispaly "readonly" icon for readonly files. 2015-07-09 15:56:44 +08:00
Jiaqiang Xu
4c0fe32cf0 [win] Refresh icon overlay after lock status changed locally. 2015-07-08 13:31:37 +08:00
Jiaqiang Xu
4b7ba81be7 [client] Add mark_file_unlocked() RPC. 2015-07-08 12:06:51 +08:00
Jiaqiang Xu
c67a4341e4 [client] File lock support. 
Conflicts:
	daemon/repo-mgr.c
	daemon/sync-mgr.c
	daemon/sync-mgr.h
 2015-07-03 11:31:07 +08:00
Jiaqiang Xu
a3e5e73645 [client] Disable "Expect: 100 continue" header for POST. 2015-07-02 14:42:55 +08:00
Jiaqiang Xu
e5a7c4a6e8 [client] Remove redundant error log message. 2015-07-02 11:44:44 +08:00
Jiaqiang Xu
b940288081 Improve log messages. 
- Replace all g_warning() with seaf_warning()
- Print repo id when access to commit/fs/block fails
 2015-06-30 20:25:07 +08:00
Jiaqiang Xu
91928b9396 Fix a few bugs related to deleting repos on server. 
Server:
- Delete entries from Branch and RepoHead tables;
- Restore entries to Branch and RepoHead tables from repo trash.
- When client checks head commit, return DELTED if no entry in
  Repo table.
- When client checks upload/download permission, return DELETED
  if repo doesn't exist.

Client:
- Handle repo DELETED situation in upload/download thread.
 2015-06-27 15:59:17 +08:00
Jiaqiang Xu
54cb5eec31 [client] Fix a crash bug when objects are corrupted. 2015-06-24 11:50:11 +08:00
Jiaqiang Xu
5391b060b7 [client] Display "readonly" status for readonly synced folders. 2015-06-19 11:52:12 +08:00
Jiaqiang Xu
79c08df41c [client] Fix bugs of file status. 
- Only change worktree sync state to "sync" when it's really syncing.
- Update checked out file timestamp even on conflict.
 2015-06-18 15:27:31 +08:00
Jiaqiang Xu
e5cf8b2fc9 [client] Don't set "Excpect: 100-continue" header in PUT requests. 2015-06-17 14:12:54 +08:00
Jiaqiang Xu
0dbb035cf0 [client] Display repo worktree folder sync status better. 2015-06-07 11:05:53 +08:00
Jiaqiang Xu
2a81512c2e [client] Update transfer rates for each sync task. 2015-05-29 11:33:25 +08:00
Jiaqiang Xu
3a1602a3a6 [client] Use user accetped self-signed certificates in https connection. 2015-05-28 13:34:40 +08:00
Jiaqiang Xu
23f661c248 [client] Always enable http sync. 2015-05-25 13:23:03 +08:00
Jiaqiang Xu
8445f95c18 [win] Fix bugs in extracting system CA. 2015-05-20 14:00:29 +08:00
Jiaqiang Xu
0be2a68c65 [client] Folder/file sync status for Mac and Linux. 2015-05-19 16:47:44 +08:00
Jiaqiang Xu
fb35ae8ca3 [win] Extract system CA certs to use with openssl. 
This allows users to set custom CA to system repository
while we use openssl for https sync.
 2015-05-19 15:02:18 +08:00
Jiaqiang Xu
c50132945b [client] Fix overlay icon bug when folder becomes empty. 2015-05-15 11:33:54 +08:00
Jiaqiang Xu
96c6553b9c [client] Fix stat error handling of local files. 2015-05-15 11:27:53 +08:00
Jiaqiang Xu
a36fa3ebf8 [client] Use correct syncing url when Nginx/Apache is not configured. 
When the server doesn't configure Nginx/Apache but still use port 80,
the url used for http sync is incorrect.
 2015-05-08 17:38:07 +08:00
Jiaqiang Xu
d94400ae8d [win] Don't refresh all windows after each repo is scanned. 
Instead, refresh all windows 10 seconds after startup.
 2015-05-07 14:26:16 +08:00
Jiaqiang Xu
d791fe2c89 Handle sync status properly for read-only folders. 2015-05-07 10:49:26 +08:00
Jiaqiang Xu
f581dfa909 Fix bugs for sync status icon. 
- Handle checkout file error.
- Set status to "synced" after checkout a locked file.
- Refresh after sync status is changed.
 2015-05-07 10:49:26 +08:00
Jiaqiang Xu
189b1733c3 On startup, after scanning the worktree, refresh all open explorer windows. 2015-05-07 10:49:26 +08:00
Jiaqiang Xu
82a649630b [win] Add file/folder sync status for download. 2015-05-07 10:49:26 +08:00
Jiaqiang Xu
4d8e21bc43 [win] Add file/folder sync status for upload. 2015-05-07 10:49:26 +08:00
Jiaqiang Xu
089cbf1161 [client] Reset effective server host after server-url is changed. 2015-05-07 10:49:26 +08:00
Jiaqiang Xu
7a97fc055d [client] Use http-sync exclusively for repos version > 0. 
For repo version > 0, if requests to '/seafhttp/*' urls fail,
and https is not used, fall back to send requests to 8082 port directly.
 2015-05-07 10:49:26 +08:00
Jiaqiang Xu
54941aeabd Merge branch '4.1' 2015-04-11 10:30:18 +08:00
Jiaqiang Xu
9838f69417 [client] Fix conflict handling bug in clone. 
A conflict file cannot be produced.
 2015-04-02 18:55:48 +08:00
Jiaqiang Xu
37bf2a3a7f [client] Cancel sync task when unsync a library. 2015-04-01 16:25:08 +08:00
yejianguo
963f65bc90 add root field in Repo object 2015-04-01 15:14:41 +08:00
Jiaqiang Xu
69be58db50 [client] Set User-Agent header for http sync requests. 2015-04-01 15:05:17 +08:00
Jiaqiang Xu
bcf2347a00 [client] Check locked sub-folder before removing a folder. 2015-04-01 14:20:10 +08:00
Jiaqiang Xu
433cd1fddb [client] Ignore stat and read directory error when index files. 2015-04-01 14:20:10 +08:00
Jiaqiang Xu
5331c512e5 [client] remove request timeout for most http sync operations. 
Only block and commit transfer has timeout now. It's used to
detect network connection problems.
 2015-04-01 14:20:10 +08:00
Jiaqiang Xu
52dad8e765 Merge branch 'rpc-repo' 2015-03-27 16:51:55 +08:00
yejianguo
e7c187b0f4 modify info of returned SeafileRepo object 2015-03-24 14:52:29 +08:00
Jiaqiang Xu
1f8f67ee54 [client] Escape client_name parameter in http-sync. 2015-03-23 11:31:24 +08:00
Jiaqiang Xu
284847d5a3 Merge pull request #1112 from haiwen/logout 
support logout current account
 2015-03-13 15:35:44 +08:00
Jiaqiang Xu
406b8aaeca [client] Fix a typo error in http sync. 2015-03-11 17:51:52 +08:00
Shuai Lin
449e580929 [client] add rpc function seafile_set_repo_token 2015-03-10 08:45:13 +08:00
Shuai Lin
fdbd7f52a6 [client] support logout current account 2015-03-10 08:45:13 +08:00
Jiaqiang Xu
56c8ca2fba [fsck] Remove misleading message. 2015-03-07 17:11:20 +08:00
Jiaqiang Xu
a8266855e5 Record client id, IP and name in http sync. 2015-03-03 18:53:09 +08:00
Shuai Lin
cada2c1fcf Merge pull request #1080 from haiwen/fix-update-repo-server 
also update repos "server-url" property when change account url
 2015-02-15 18:32:24 +08:00
Shuai Lin
bdcebb4593 also update repos "server-url" property when change account url 
Ref #984
 2015-02-15 18:06:00 +08:00
Jiaqiang Xu
178d01b164 [client] Add username/password support for http proxy. 
Config options:
- proxy_username
- proxy_password
 2015-02-14 11:53:46 +08:00
Jiaqiang Xu
3c2d2eb4e4 [client] Handle 3xx redirect response in http sync. 2015-02-13 15:30:40 +08:00
Jiaqiang Xu
de3d819e37 [client] Proxy support for http sync. 
New config options in config.db:
- use_proxy: true or false
- proxy_type: http or socks
- proxy_addr: proxy server address
- proxy_port: proxy server port
 2015-02-13 15:30:40 +08:00
Jiaqiang Xu
bb4bc8d87e [win] Fix long path bug when a folder becomes empty. 2015-01-28 17:44:05 +08:00
Jiaqiang Xu
b1bad8747a [client] Enable http sync by default. 2015-01-28 15:17:16 +08:00
Jiaqiang Xu
0518901a3b Fix bugs after previous merge. 
* Upload large file set.
* Fix a double free bug on server.
 2015-01-28 13:30:29 +08:00
Jiaqiang Xu
90b7753923 Merge branch 'folder-perm' 
Conflicts:
	daemon/repo-mgr.c
 2015-01-27 17:18:34 +08:00
Jiaqiang Xu
e845e3f6c0 [win] Handle delete/rename events with 8.3 format paths. 2015-01-21 15:01:32 +08:00
Jiaqiang Xu
4893406bbd [win] Convert path returned from fs events to long path. 2015-01-19 17:20:44 +08:00
Jiaqiang Xu
97175222b2 [win] Use native API for I/O operations to support long path. 2015-01-19 11:36:24 +08:00
Jiaqiang Xu
36e40a56d3 [client] Fix memory leak in http sync. 2015-01-09 18:01:00 +08:00
Jiaqiang Xu
8e3855bca6 [client] Folder permission support. 2015-01-09 17:13:43 +08:00
Jiaqiang Xu
36f94b985f [client] Don't timeout block-tx-client if the connection was closed. 2015-01-08 13:36:38 +08:00
Jiaqiang Xu
879dc05a98 [client] Don't timeout connection in upload. 2015-01-06 14:02:16 +08:00
Jiaqiang Xu
e181c7eb89 [client] Fix timeout problem in http sync. 2014-12-25 14:06:22 +08:00
Jiaqiang Xu
21bfad2106 [client] Scan worktree changes when "sync now" is invoked. 2014-12-23 16:04:39 +08:00
Jiaqiang Xu
55a8a2043e [client] Add timeout when receive data. 2014-12-23 14:39:41 +08:00
Jiaqiang Xu
ff1d383093 [Mac] Fix bug in wt-monitor and commit. 2014-12-23 11:05:20 +08:00
Jiaqiang Xu
ea15945824 Ignore filenames with '/' in it. 2014-12-18 13:57:55 +08:00
Jiaqiang Xu
b675844628 Merge branch 'sync-nocheck' into 4.0 
Conflicts:
	daemon/repo-mgr.c
 2014-12-18 12:11:35 +08:00
Jiaqiang Xu
ec669e18f9 [Mac] Remove trailing '/' from folder path in fs events returned by system. 2014-12-15 12:14:16 +08:00
Jiaqiang Xu
938743156f [client] Fix a bug when adding file to empty dir. 2014-12-13 15:24:19 +08:00
Daniel Pan
13beb59f0c Remove flag kFSEventStreamCreateFlagFileEvents 2014-12-13 14:56:07 +08:00
Jiaqiang Xu
ffe1995e81 [client] Minor improvements to locked file handling. 
* Don't load locked file set on Linux/Mac.
* Use dedicated sync error message for locked file.
 2014-12-13 13:34:08 +08:00
Jiaqiang Xu
903e0866e1 [client] Fix bugs in index code. 
Test case:
Have file "test.txt", folder with files "test" and empty folder "test2".
Move folder "test" into folder "test2".
Result: On the server, the folder "test" is not removed.
 2014-12-13 13:34:08 +08:00
Jiaqiang Xu
854b1ef28c [client] More graceful handling of local locked files. 2014-12-13 13:34:08 +08:00
yejianguo
f70a8040cb not check file name when sync upload 2014-12-03 12:06:17 +08:00
Jiaqiang Xu
77482e0d6c [Mac] Fix path encoding problem in wt-monitor. 2014-12-02 18:44:12 +08:00
Jiaqiang Xu
221a23bbfa [client] Fix a but that relay_id not set after clone. 
This can lead to a crash problem when the server is not reachable.
 2014-12-01 13:37:36 +08:00
Jiaqiang Xu
59d98d42c1 [client] Fix a bug in creating commits. 
Test case:
Add a file larger than 100MB, after uploading the file,
the repo will continuouly get into committing state without anything to commit.
 2014-11-29 11:34:41 +08:00
Jiaqiang Xu
aaec336abe Fix bugs in http sync. 
* Server returns 444 instead of 404 when repo is deleted.
* Client handles empty response for check protocol version.
 2014-11-28 20:25:11 +08:00
Jiaqiang Xu
7de9c18881 Merge branch '3.1' into master 
Conflicts:
	configure.ac
	daemon/repo-mgr.c
	debian/changelog
	msi/Includes.wxi
 2014-11-24 19:31:27 +08:00
Jiaqiang Xu
57e26e16d0 Fix some memory bugs. 
* Initialize index structure when index file doesn't exist.
* Use g_hash_table_replace instead of _insert when key and value are the same.
 2014-11-24 17:42:41 +08:00
Jiaqiang Xu
a66ef2b49f [client] Fix some memory bugs in http sync. 2014-11-24 17:07:11 +08:00
Jiaqiang Xu
e2ec714150 [client] Use Windows native API to remove directory. 2014-11-15 10:28:47 +08:00
Jiaqiang Xu
a5d759004f [client] Fix delete folder bug. 2014-11-14 14:46:11 +08:00
Jiaqiang Xu
2c4a44c67d [client] Fix case rename bug and remove ignored hidden files when delete empty dir. 2014-11-13 14:09:59 +08:00
Jiaqiang Xu
991837ff9c [client] Should return in http_tx_manager_start(). 2014-11-10 13:54:03 +08:00
Jiaqiang Xu
299746d77c Merge branch 'http-sync' 
Conflicts:
	fileserver/Makefile.am
	server/Makefile.am
 2014-11-06 12:10:06 +08:00
Jiaqiang Xu
cc2a056706 Merge branch '3.1' 2014-11-06 12:07:38 +08:00
Jiaqiang Xu
adddeeba9a [client] GUI related changes for http sync. 2014-11-05 14:37:52 +08:00
Jiaqiang Xu
a316add4f3 Fix bugs in http sync protocol. 2014-11-03 18:15:01 +08:00
Jiaqiang Xu
a078be1981 Improve http sync server and remove fileserver. 2014-10-29 21:14:29 +08:00
Jiaqiang Xu
422b802545 [client] Http download. 2014-10-29 21:14:29 +08:00
Jiaqiang Xu
4d5bf52827 [client] Http upload. 2014-10-29 17:50:18 +08:00
Jiaqiang Xu
be2c492657 [client] Add http transfer manager and implement check head commit. 2014-10-29 17:50:18 +08:00
Jiaqiang Xu
f8c90bad12 [client] Fix some bugs in readonly repo support. 2014-10-28 15:57:21 +08:00
plt
204296f21d Initial support of readonly sync 
* Change clone/download interface to include more_info
* Support is_readonly property in clone manager and repo manager
* Do not listen to worktree changes for readonly repo

Todo

* Do not scan worktree for readonly repo in startup
* Change checkout behavire for readonly repo
 2014-10-28 14:43:47 +08:00
Daniel Pan
62fa8c0622 Merge pull request #903 from haiwen/mac-fix 
[mac] Add kFSEventStreamCreateFlagWatchRoot and handle it
 2014-10-28 10:50:56 +08:00
Daniel Pan
4565b14a75 [mac] Add kFSEventStreamCreateFlagWatchRoot and handle it 2014-10-28 10:48:06 +08:00
Daniel Pan
b61645b21e Remove unused share manager in daemon 2014-10-25 19:35:27 +08:00
Daniel Pan
c28f8cfd36 Fix a bug in wt-monitor-macos.c 2014-10-25 15:29:05 +08:00
plt
b6039b8871 Improve logging in wt-monitor-macos 2014-10-24 14:03:55 +08:00
ggkitsas
0aae00f0a9 correctly check RAND_bytes error code 2014-10-07 16:43:18 +03:00
Jiaqiang Xu
90bf3bb80f [client] Fix a bug in multi-part upload for large file sets. 2014-09-28 10:46:50 +08:00
Jiaqiang Xu
cfbcd85d13 [client] Fix a syncing bug after a big file is uploaded. 
If a file is added to worktree when a big file (>100MB) is uploading,
the new file will not be auto uploaded later. This is a bug in the logic
of multi-part file upload.
 2014-09-18 14:28:14 +08:00
plt
d6ae40ea41 Add config option for whether syncing temporary files of office 2014-09-17 16:06:42 +08:00
Jiaqiang Xu
7c83762c00 [client] Add log messages when producing conflict files. Rename the local version to conflict file. 2014-09-15 11:30:51 +08:00
Jiaqiang Xu
f586712769 Fix bug when remove all files in a repo. 2014-09-13 20:04:49 +08:00
Kirill Bychkov
529e9d45ee Don't hardcode -levent in linker flags. Use @LIBEVENT_LIBS@ instead 2014-09-11 14:55:20 +04:00
Jiaqiang Xu
ee962be3ac [win] Fix a memory buffer bug in worktree monitor. 2014-09-11 11:18:27 +08:00
Jiaqiang Xu
3353ece211 Merge branch '3.1' 2014-08-20 15:44:07 +08:00
lins05
84a11a12a3 [client] support edit account host address 2014-08-14 23:48:18 +08:00
Jiaqiang Xu
8e60cc2877 [client] Fix some resource leaks. 2014-08-13 19:47:47 +08:00
lins05
13220c080f [client] support not unsync a repo when not found on server 
Conflicts:
	daemon/sync-mgr.c
 2014-08-13 15:44:51 +08:00
Jiaqiang Xu
085c7f14ae [client] Fix bugs when cloning a large library. 2014-08-13 15:26:00 +08:00
Jiaqiang Xu
631fd43be9 [client] Don't send or get duplicated fs objects. 2014-08-13 15:26:00 +08:00
plt
99f0eeb1ce Improve tmp file ignore 
* Do not ignore lock files created by libreoffice
* Ignore temp files created by MSOffice like ~WRL0001.tmp
 2014-08-07 12:17:10 +08:00
Jiaqiang Xu
b0543a4d68 [mac] Convert worktree event paths to UTF-8 NFC. 2014-08-05 11:52:53 +08:00
Jiaqiang Xu
348687f614 Merge branch 'poet' 2014-08-05 10:37:49 +08:00
Jiaqiang Xu
759efd3545 [client] Fix sync noitification pop-up problem. 2014-08-04 14:01:35 +08:00
Chilledheart
03374109a2 remove hardcoded "*.tmp" and "*.TMP" from ignore_tables 2014-08-04 10:42:27 +08:00
Jiaqiang Xu
77003a7555 Remove bitfield code. 2014-07-30 17:47:35 +08:00
Jiaqiang Xu
aa01865519 Remove some code with copyright problems. 2014-07-30 16:37:32 +08:00
Jiaqiang Xu
e54cf73764 Clean up repo hash table code. 2014-07-30 16:36:35 +08:00
Jiaqiang Xu
9c041061cc Merge branch 'cleanup_avl' into 3.1 2014-07-30 14:51:38 +08:00
Jiaqiang Xu
883cc3b9ad [client] Fix rename problem on Windows and Mac. 
The case is that a file/dir's name changes in cases.
 2014-07-30 11:15:26 +08:00
Chilledheart
d05e313fee [client] make the compiler happy when compiling with -Wall flag 2014-07-28 17:08:26 +08:00
Wei Wang
addaf516d0 Check openssl in configure.ac and enable fuse option for mac 2014-07-26 15:20:36 +08:00
Jiaqiang Xu
655f046e1a Merge branch 'new-sync-osx' into 3.1 2014-07-25 17:18:58 +08:00
Jiaqiang Xu
48a6317b16 [win] Fix command handling bug in wt-monitor. 2014-07-25 16:11:19 +08:00
Jiaqiang Xu
1e5354ee84 [win] Fix command handling bug in wt-monitor. 2014-07-25 13:51:50 +08:00
Jiaqiang Xu
fc1b1dd647 [win] Fix a memory bug when unsyncing a library. 2014-07-25 13:16:46 +08:00
Chilledheart
24a679f5d5 [client] land new changes of new-sync for osx 2014-07-23 13:38:41 +08:00
Chilledheart
bdf3b9b979 [common] remove unused functions 
- seaf_repo_manager_get_repo_prefix
 - seaf_repo_manager_repo_exists_prefix
 2014-07-22 17:56:12 +08:00
Chilledheart
0076a63617 [common] cleanup avl and related code 2014-07-22 15:14:36 +08:00
Jiaqiang Xu
5f2802e4cf [win] Fix compilation error. 2014-07-21 17:01:27 +08:00
Jiaqiang Xu
4b1d4e6050 [client] Implement manual sync for new sync loop. 2014-07-21 15:08:18 +08:00
Jiaqiang Xu
5248c0603e [client] Fix bugs and improve debug message. 2014-07-21 15:08:18 +08:00
Jiaqiang Xu
d98736f079 [client] Preserver 'x' bit across Linux and Windows. 2014-07-21 15:08:18 +08:00
Jiaqiang Xu
75da8be1ef [client] fix minor sync timer bug. 2014-07-21 15:08:18 +08:00
Jiaqiang Xu
e70b8c4fbd [win] Skip syncing when a file needs to be updated is locked. 2014-07-21 15:08:18 +08:00
Jiaqiang Xu
1205a05d3a [client] Fix worktree event handling for large files. 2014-07-21 15:08:17 +08:00
Jiaqiang Xu
34b192c3f0 New sync loop implementation, download part. 2014-07-21 15:08:17 +08:00
Jiaqiang Xu
abda0be437 [client] Split huge data set to multiple batches for upload. 2014-07-21 15:08:17 +08:00
Jiaqiang Xu
100f13eb9b Implement new sync loop, upload part. 2014-07-21 15:08:17 +08:00
Jiaqiang Xu
e326eaefa1 [client] Fix a bug on worktree watching on Linux. 2014-07-21 15:08:17 +08:00
Jiaqiang Xu
567a592567 [client] Get worktree event detail on Windows. 2014-07-21 15:08:17 +08:00
Jiaqiang Xu
3ff5a3a2dd [client] Remove GC and clean up local blocks after repo is synced. 2014-07-21 15:08:17 +08:00
Jiaqiang Xu
0ab52c62e5 Create commits from worktree event queue. (Linux only now) 2014-07-21 15:08:17 +08:00
Chilledheart
f1b83a2314 Fix daemon mode in multiple programs under OSX 
- seaf-controller
  - seaf-daemon
  - fileserver
  - seaf-server
 2014-07-11 14:59:54 +08:00
lins05
63c211f09f Merge branch '3.0' 2014-05-12 17:02:08 +08:00
Jiaqiang Xu
8b04dc0dac [client] Fix a bug in merge. 
Reproduce sequence (only for version 0 repo):
1. Both client and server change the same file;
2. Client syncs and do a real merge and fails with conflict;
3. The 30-second auto syncing timer kicks in, sync state [initializing] -> [merging];
4. Merge returns "Already up to date".
5. Afterwards, every sync of this repo will stuck in "Already up to date".
 2014-05-12 16:20:09 +08:00
lins05
371e052a2a apply the patch metioned in #518 
add libjansson flags to Makefiles
 2014-04-30 16:41:51 +08:00
Jiaqiang Xu
0276624016 [client] Use old sendcommit-proc to sync old version libraries. 2014-04-30 08:57:44 +08:00
Jiaqiang Xu
e08c94d921 [client] fix a sync bug after multiple merges. 2014-04-21 17:42:06 +08:00
Jiaqiang Xu
f04e2872b2 Fix invalid utf8 character handling for commit objects. 2014-04-15 11:10:10 +08:00
Jiaqiang Xu
c8d0d824e8 Fix a few bugs. 
* Sort fields in fs JSON object.
* Fix a minor bug in clone.
* Allow to use symlink for seafile-data directory.
* Enlarge sqlite connection pool and allow setting the size.
* Ignore invalid UTF-8 filename.
 2014-04-10 10:50:25 +08:00
Jiaqiang Xu
014126465d [server] Tool to migrate repo to new layout. 2014-04-10 10:50:25 +08:00
Jiaqiang Xu
93079e2720 Fix bugs for empty directories and merge. 2014-03-27 16:51:56 +08:00
Jiaqiang Xu
abad5959ed Fix a few bugs and memory leak. 2014-03-26 15:32:56 +08:00
lins05
caf8f9109c removed some unused includes 2014-03-25 19:09:20 +08:00
Jiaqiang Xu
f0e56284ee Compress fs objects. 2014-03-25 16:58:34 +08:00
Jiaqiang Xu
2983357dfb Use JSON for fs object format and store modifier, size, mtime in direcotry objects. 2014-03-25 09:49:12 +08:00
Jiaqiang Xu
bf51101235 Merge branch '2.1' 
Conflicts:
	common/commit-mgr.c
	common/commit-mgr.h
	common/diff-simple.c
	common/rpc-service.c
	daemon/sync-mgr.c
	lib/commit.vala
	server/repo-op.c
 2014-03-14 10:54:01 +08:00
Jiaqiang Xu
63d486979f Change data model. 2014-03-13 17:13:30 +08:00
Jiaqiang Xu
558e7c3110 Calculate common ancestor on server. 2014-03-13 17:13:30 +08:00
lins05
a50c0b77bb [client] allow do not delete a repo even if its worktree invalid 2014-03-03 17:32:33 +08:00
Jiaqiang Xu
07c1d0524e [client] Don't popup "auto merge" notifications. 2014-02-20 11:08:17 +08:00
Jiaqiang Xu
012d71709b Undo previous commit. 2014-02-19 17:07:22 +08:00
poetwang
46ed287a54 Fix utf8 filename case conflicts 2014-02-19 12:25:27 +08:00
Jiaqiang Xu
d79f225319 Improve description for merge commits. 
If a commit object satisfies:
commit->second_parent_id != NULL && commit->new_merge && !commit->conflict.
Then this commit is an auto-merge commit with no useful description.
Seahub should not display this commit to the user.
 2014-02-15 14:26:16 +08:00
poetwang
da8d9bbf03 Improve configure.ac for Mac 2014-01-18 16:17:57 +08:00
Jiaqiang Xu
50cf8afb73 Don't download history commit and fs objects. 2014-01-14 13:45:04 +08:00
Jiaqiang Xu
a5ddb28f0f [client] Use single worker thread in getfs proc. 2014-01-09 13:27:09 +08:00