Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Using json file format for del, move, copy RPC #67

Merged
merged 1 commit into from
Aug 8, 2022
Merged

Using json file format for del, move, copy RPC #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions seafdav_tests/test_webdav.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ def _test_under_path(path):

# delete non existent folder from webapi
dirname = 'folder-%s' % randstring()
api.del_file(repo.get('id'), parent_dir, dirname, USER)
api.del_file(repo.get('id'), parent_dir, '[\"'+dirname+'\"]', USER)
entries = davclient.repo_listdir(repo, parent_dir)
self.assertEmpty(entries)

#delete non existent file from webapi
fname = 'uploaded-file-%s.txt' % randstring()
api.del_file(repo.get('id'), parent_dir, fname, USER)
api.del_file(repo.get('id'), parent_dir, '[\"'+fname+'\"]', USER)
entries = davclient.repo_listdir(repo, parent_dir)
self.assertEmpty(entries)

Expand Down
22 changes: 11 additions & 11 deletions wsgidav/seafile_dav_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def handle_delete(self):
return True

parent, filename = os.path.split(self.rel_path)
seafile_api.del_file(self.repo.id, parent, filename, self.username)
seafile_api.del_file(self.repo.id, parent, '[\"'+filename+'\"]', self.username)
except SearpcError as e:
raise DAVError(HTTP_INTERNAL_ERROR, e.msg)

Expand Down Expand Up @@ -290,10 +290,10 @@ def handle_move(self, dest_path):
# some clients such as GoodReader requires "overwrite" semantics
file_id_dest = seafile_api.get_file_id_by_path(dest_repo.id, rel_path)
if file_id_dest != None:
seafile_api.del_file(dest_repo.id, dest_dir, dest_file, self.username)
seafile_api.del_file(dest_repo.id, dest_dir, '[\"'+dest_file+'\"]', self.username)

seafile_api.move_file(self.repo.id, src_dir, src_file,
dest_repo.id, dest_dir, dest_file, 1, self.username, NEED_PROGRESS, SYNCHRONOUS)
seafile_api.move_file(self.repo.id, src_dir, '[\"'+src_file+'\"]',
dest_repo.id, dest_dir, '[\"'+dest_file+'\"]', 1, self.username, NEED_PROGRESS, SYNCHRONOUS)
except SearpcError as e:
raise DAVError(HTTP_INTERNAL_ERROR, e.msg)

Expand Down Expand Up @@ -325,8 +325,8 @@ def handle_copy(self, dest_path, depth_infinity):
if not seafile_api.is_valid_filename(dest_repo.id, dest_file):
raise DAVError(HTTP_BAD_REQUEST)

seafile_api.copy_file(self.repo.id, src_dir, src_file,
dest_repo.id, dest_dir, dest_file, self.username, NEED_PROGRESS, SYNCHRONOUS)
seafile_api.copy_file(self.repo.id, src_dir, '[\"'+src_file+'\"]',
dest_repo.id, dest_dir, '[\"'+dest_file+'\"]', self.username, NEED_PROGRESS, SYNCHRONOUS)
except SearpcError as e:
raise DAVError(HTTP_INTERNAL_ERROR, e.msg)

Expand Down Expand Up @@ -493,7 +493,7 @@ def handle_delete(self):
if not filename:
raise DAVError(HTTP_BAD_REQUEST)

seafile_api.del_file(self.repo.id, parent, filename, self.username)
seafile_api.del_file(self.repo.id, parent, '[\"'+filename+'\"]', self.username)
except SearpcError as e:
raise DAVError(HTTP_INTERNAL_ERROR, e.msg)

Expand Down Expand Up @@ -526,8 +526,8 @@ def handle_move(self, dest_path):
if not seafile_api.is_valid_filename(dest_repo.id, dest_file):
raise DAVError(HTTP_BAD_REQUEST)

seafile_api.move_file(self.repo.id, src_dir, src_file,
dest_repo.id, dest_dir, dest_file, 0, self.username, NEED_PROGRESS, SYNCHRONOUS)
seafile_api.move_file(self.repo.id, src_dir, '[\"'+src_file+'\"]',
dest_repo.id, dest_dir, '[\"'+dest_file+'\"]', 0, self.username, NEED_PROGRESS, SYNCHRONOUS)
except SearpcError as e:
raise DAVError(HTTP_INTERNAL_ERROR, e.msg)

Expand Down Expand Up @@ -560,8 +560,8 @@ def handle_copy(self, dest_path, depth_infinity):
if not seafile_api.is_valid_filename(dest_repo.id, dest_file):
raise DAVError(HTTP_BAD_REQUEST)

seafile_api.copy_file(self.repo.id, src_dir, src_file,
dest_repo.id, dest_dir, dest_file, self.username, NEED_PROGRESS, SYNCHRONOUS)
seafile_api.copy_file(self.repo.id, src_dir, '[\"'+src_file+'\"]',
dest_repo.id, dest_dir, '[\"'+dest_file+'\"]', self.username, NEED_PROGRESS, SYNCHRONOUS)
except SearpcError as e:
raise DAVError(HTTP_INTERNAL_ERROR, e.msg)

Expand Down