Skip to content

fix resume uploader error when using chinese character as the file key #291

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

Merged
jemygraw merged 2 commits into from
Nov 3, 2017
Merged

fix resume uploader error when using chinese character as the file key #291

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4813ad7
fix the resume uploader recorder key error under python2 when using c…
jemygraw Nov 3, 2017
850eb13
Merge branch 'master' of https://github.com/jemygraw/python-sdk
jemygraw Nov 3, 2017
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
18 changes: 15 additions & 3 deletions qiniu/services/storage/upload_progress_recorder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import json
import os
import tempfile
from qiniu.compat import is_py2, is_py3


class UploadProgressRecorder(object):
Expand All @@ -27,8 +28,11 @@ def __init__(self, record_folder=tempfile.gettempdir()):

def get_upload_record(self, file_name, key):
record_key = '{0}/{1}'.format(key, file_name)
if is_py2:
record_file_name = hashlib.md5(record_key).hexdigest()
else:
record_file_name = hashlib.md5(record_key.encode('utf-8')).hexdigest()

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
Expand All @@ -38,13 +42,21 @@ def get_upload_record(self, file_name, key):

def set_upload_record(self, file_name, key, data):
record_key = '{0}/{1}'.format(key, file_name)
record_file_name = hashlib.md5(record_key.encode('utf-8')).hexdigest()
if is_py2:
record_file_name = hashlib.md5(record_key).hexdigest()
else:
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):
record_key = '{0}/{1}'.format(key, file_name)
record_file_name = hashlib.md5(record_key.encode('utf-8')).hexdigest()
if is_py2:
record_file_name = hashlib.md5(record_key).hexdigest()
else:
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)