3
3
import os
4
4
import time
5
5
6
- from typing_extensions import deprecated
7
-
8
6
from qiniu import config , http
9
7
from qiniu .auth import Auth
10
8
from qiniu .compat import json
11
- from qiniu .utils import _file_iter , crc32 , rfc_from_timestamp , urlsafe_base64_encode
9
+ from qiniu .utils import _file_iter , crc32 , rfc_from_timestamp , urlsafe_base64_encode , deprecated
12
10
13
11
from qiniu .services .storage .upload_progress_recorder import UploadProgressRecorder
14
12
13
+
15
14
@deprecated ("use uploader instead" )
16
15
class _Resume (object ):
17
16
"""deprecated 断点续上传类
@@ -87,7 +86,7 @@ def recovery_from_record(self):
87
86
return 0 , None , None
88
87
try :
89
88
if not record ['modify_time' ] or record ['size' ] != self .size or \
90
- record ['modify_time' ] != self .modify_time :
89
+ record ['modify_time' ] != self .modify_time :
91
90
if self .version == 'v1' :
92
91
return 0
93
92
elif self .version == 'v2' :
@@ -108,8 +107,8 @@ def recovery_from_record(self):
108
107
return record ['offset' ]
109
108
elif self .version == 'v2' :
110
109
if not record .__contains__ ('etags' ) or len (record ['etags' ]) == 0 or \
111
- not record .__contains__ ('expired_at' ) or float (record ['expired_at' ]) < time .time () or \
112
- not record .__contains__ ('upload_id' ):
110
+ not record .__contains__ ('expired_at' ) or float (record ['expired_at' ]) < time .time () or \
111
+ not record .__contains__ ('upload_id' ):
113
112
return 0 , None , None
114
113
self .blockStatus = record ['etags' ]
115
114
return record ['offset' ], record ['upload_id' ], record ['expired_at' ]
@@ -180,7 +179,7 @@ def _upload_v2(self):
180
179
offset , self .uploadId , self .expiredAt = self .recovery_from_record ()
181
180
is_resumed = False
182
181
if offset > 0 and self .blockStatus != [] and self .uploadId is not None \
183
- and self .expiredAt is not None :
182
+ and self .expiredAt is not None :
184
183
self .recovery_index = self .blockStatus [- 1 ]['partNumber' ] + 1
185
184
is_resumed = True
186
185
else :
@@ -203,7 +202,7 @@ def _upload_v2(self):
203
202
if config .get_default ('default_zone' ).up_host_backup :
204
203
host = config .get_default ('default_zone' ).up_host_backup
205
204
else :
206
- host = config .get_default ('default_zone' )\
205
+ host = config .get_default ('default_zone' ) \
207
206
.get_up_host_backup_by_token (self .up_token , self .hostscache_dir )
208
207
209
208
if info .need_retry ():
0 commit comments