use md5 to be the resumable upload recorder key

Author: jemygraw

qiniu/services/storage/upload_progress_recorder.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import base64
+import hashlib
 import json
 import os
 import tempfile
@@ -21,33 +21,30 @@ class UploadProgressRecorder(object):
     Attributes:
         record_folder: 保存上传记录的目录
     """
+
     def __init__(self, record_folder=tempfile.gettempdir()):
         self.record_folder = record_folder
 
     def get_upload_record(self, file_name, key):
+        record_key = '{0}/{1}'.format(key, file_name)
 
-        key = '{0}/{1}'.format(key, file_name)
-
-        record_file_name = base64.b64encode(key.encode('utf-8')).decode('utf-8')
-        upload_record_file_path = os.path.join(self.record_folder,
-                                               record_file_name)
+        record_file_name = hashlib.md5(record_key.encode('utf-8')).hexdigest()
+        upload_record_file_path = os.path.join(self.record_folder, record_file_name)
         if not os.path.isfile(upload_record_file_path):
             return None
         with open(upload_record_file_path, 'r') as f:
             json_data = json.load(f)
         return json_data
 
     def set_upload_record(self, file_name, key, data):
-        key = '{0}/{1}'.format(key, file_name)
-        record_file_name = base64.b64encode(key.encode('utf-8')).decode('utf-8')
-        upload_record_file_path = os.path.join(self.record_folder,
-                                               record_file_name)
+        record_key = '{0}/{1}'.format(key, file_name)
+        record_file_name = hashlib.md5(record_key.encode('utf-8')).hexdigest()
+        upload_record_file_path = os.path.join(self.record_folder, record_file_name)
         with open(upload_record_file_path, 'w') as f:
             json.dump(data, f)
 
     def delete_upload_record(self, file_name, key):
-        key = '{0}/{1}'.format(key, file_name)
-        record_file_name = base64.b64encode(key.encode('utf-8')).decode('utf-8')
-        record_file_path = os.path.join(self.record_folder,
-                                        record_file_name)
-        os.remove(record_file_path)
+        record_key = '{0}/{1}'.format(key, file_name)
+        record_file_name = hashlib.md5(record_key.encode('utf-8')).hexdigest()
+        upload_record_file_path = os.path.join(self.record_folder, record_file_name)
+        os.remove(upload_record_file_path)

qiniu/services/storage/uploader.py

@@ -10,7 +10,8 @@
 
 
 def put_data(
-        up_token, key, data, params=None, mime_type='application/octet-stream', check_crc=False, progress_handler=None, fname=None):
+        up_token, key, data, params=None, mime_type='application/octet-stream', check_crc=False, progress_handler=None,
+        fname=None):
     """上传二进制流到七牛
 
     Args:
@@ -160,7 +161,7 @@ def recovery_from_record(self):
 
         try:
             if not record['modify_time'] or record['size'] != self.size or \
-                    record['modify_time'] != self.modify_time:
+                            record['modify_time'] != self.modify_time:
                 return 0
         except KeyError:
             return 0
@@ -187,8 +188,8 @@ def upload(self):
             self.blockStatus.append(ret)
             offset += length
             self.record_upload_progress(offset)
-            if(callable(self.progress_handler)):
-                self.progress_handler(((len(self.blockStatus) - 1) * config._BLOCK_SIZE)+length, self.size)
+            if (callable(self.progress_handler)):
+                self.progress_handler(((len(self.blockStatus) - 1) * config._BLOCK_SIZE) + length, self.size)
         return self.make_file(host)
 
     def make_block(self, block, block_size, host):
@@ -223,6 +224,7 @@ def make_file(self, host):
         """创建文件"""
         url = self.file_url(host)
         body = ','.join([status['ctx'] for status in self.blockStatus])
+        self.upload_progress_recorder.delete_upload_record(self.file_name, self.key)
         return self.post(url, body)
 
     def post(self, url, data):