|
@@ -364,7 +364,7 @@ class Fdfs_client(object):
|
|
|
"""
|
|
|
Download a file from Storage server.
|
|
|
arguments:
|
|
|
- @local_filename: string, local name of file
|
|
|
+ @local_filename: string, local name of file
|
|
|
@remote_file_id: string, file_id of file that is on storage server
|
|
|
@offset: long
|
|
|
@downbytes: long
|
|
@@ -379,14 +379,12 @@ class Fdfs_client(object):
|
|
|
if not tmp:
|
|
|
raise DataError('[-] Error: remote_file_id is invalid.(in download file)')
|
|
|
group_name, remote_filename = tmp
|
|
|
- if not offset:
|
|
|
- file_offset = offset
|
|
|
if not down_bytes:
|
|
|
download_bytes = down_bytes
|
|
|
tc = Tracker_client(self.tracker_pool)
|
|
|
store_serv = tc.tracker_query_storage_fetch(group_name, remote_filename)
|
|
|
store = Storage_client(store_serv.ip_addr, store_serv.port, self.timeout)
|
|
|
- return store.storage_download_to_file(tc, store_serv, local_filename, file_offset, download_bytes,
|
|
|
+ return store.storage_download_to_file(tc, store_serv, local_filename, offset, download_bytes,
|
|
|
remote_filename)
|
|
|
|
|
|
def download_to_buffer(self, remote_file_id, offset=0, down_bytes=0):
|
|
@@ -407,8 +405,6 @@ class Fdfs_client(object):
|
|
|
if not tmp:
|
|
|
raise DataError('[-] Error: remote_file_id is invalid.(in download file)')
|
|
|
group_name, remote_filename = tmp
|
|
|
- if not offset:
|
|
|
- file_offset = offset
|
|
|
if not down_bytes:
|
|
|
download_bytes = down_bytes
|
|
|
tc = Tracker_client(self.tracker_pool)
|
|
@@ -416,7 +412,7 @@ class Fdfs_client(object):
|
|
|
store = Storage_client(store_serv.ip_addr, store_serv.port, self.timeout)
|
|
|
file_buffer = None
|
|
|
return store.storage_download_to_buffer(tc, store_serv, file_buffer, \
|
|
|
- file_offset, download_bytes, \
|
|
|
+ offset, download_bytes, \
|
|
|
remote_filename)
|
|
|
|
|
|
def list_one_group(self, group_name):
|
|
@@ -583,14 +579,10 @@ class Fdfs_client(object):
|
|
|
if not tmp:
|
|
|
raise DataError('[-] Error: remote_fileid is invalid.(modify)')
|
|
|
group_name, appender_filename = tmp
|
|
|
- if not offset:
|
|
|
- file_offset = offset
|
|
|
- else:
|
|
|
- file_offset = 0
|
|
|
tc = Tracker_client(self.tracker_pool)
|
|
|
store_serv = tc.tracker_query_storage_update(group_name, appender_filename)
|
|
|
store = Storage_client(store_serv.ip_addr, store_serv.port, self.timeout)
|
|
|
- return store.storage_modify_by_filename(tc, store_serv, filename, file_offset, \
|
|
|
+ return store.storage_modify_by_filename(tc, store_serv, filename, offset, \
|
|
|
filesize, appender_filename)
|
|
|
|
|
|
def modify_by_file(self, filename, appender_fileid, offset=0):
|
|
@@ -613,14 +605,10 @@ class Fdfs_client(object):
|
|
|
if not tmp:
|
|
|
raise DataError('[-] Error: remote_fileid is invalid.(modify)')
|
|
|
group_name, appender_filename = tmp
|
|
|
- if not offset:
|
|
|
- file_offset = offset
|
|
|
- else:
|
|
|
- file_offset = 0
|
|
|
tc = Tracker_client(self.tracker_pool)
|
|
|
store_serv = tc.tracker_query_storage_update(group_name, appender_filename)
|
|
|
store = Storage_client(store_serv.ip_addr, store_serv.port, self.timeout)
|
|
|
- return store.storage_modify_by_file(tc, store_serv, filename, file_offset, \
|
|
|
+ return store.storage_modify_by_file(tc, store_serv, filename, offset, \
|
|
|
filesize, appender_filename)
|
|
|
|
|
|
def modify_by_buffer(self, filebuffer, appender_fileid, offset=0):
|
|
@@ -642,12 +630,8 @@ class Fdfs_client(object):
|
|
|
if not tmp:
|
|
|
raise DataError('[-] Error: remote_fileid is invalid.(modify)')
|
|
|
group_name, appender_filename = tmp
|
|
|
- if not offset:
|
|
|
- file_offset = offset
|
|
|
- else:
|
|
|
- file_offset = 0
|
|
|
tc = Tracker_client(self.tracker_pool)
|
|
|
store_serv = tc.tracker_query_storage_update(group_name, appender_filename)
|
|
|
store = Storage_client(store_serv.ip_addr, store_serv.port, self.timeout)
|
|
|
- return store.storage_modify_by_buffer(tc, store_serv, filebuffer, file_offset, \
|
|
|
+ return store.storage_modify_by_buffer(tc, store_serv, filebuffer, offset, \
|
|
|
filesize, appender_filename)
|