Merge pull request #284 from jemygraw/master

add keep_last_modifed to put_file to support some customers' needs

Author: jemygraw

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 7.1.6 (2017-09-26)
+
+* 给 `put_file` 功能增加保持本地文件Last Modified功能，以支持切换源站的客户CDN不回源
+
+## 7.1.5 (2017-08-26)
+
+* 设置表单上传默认校验crc32
+* 增加PutPolicy新参数isPrefixalScope
+* 修复手动指定的zone无效的问题
+
 ## 7.1.4 (2017-06-05)
 ### 修正
 * cdn功能中获取域名日志列表的参数错误

qiniu/__init__.py

@@ -9,7 +9,7 @@
 
 # flake8: noqa
 
-__version__ = '7.1.5'
+__version__ = '7.1.6'
 
 from .auth import Auth, QiniuMacAuth
 

qiniu/services/storage/uploader.py

@@ -4,7 +4,7 @@
 import time
 
 from qiniu import config
-from qiniu.utils import urlsafe_base64_encode, crc32, file_crc32, _file_iter
+from qiniu.utils import urlsafe_base64_encode, crc32, file_crc32, _file_iter, rfc_from_timestamp
 from qiniu import http
 from .upload_progress_recorder import UploadProgressRecorder
 
@@ -33,7 +33,7 @@ def put_data(
 
 def put_file(up_token, key, file_path, params=None,
              mime_type='application/octet-stream', check_crc=False,
-             progress_handler=None, upload_progress_recorder=None):
+             progress_handler=None, upload_progress_recorder=None, keep_last_modified=False):
     """上传文件到七牛
 
     Args:
@@ -55,19 +55,22 @@ def put_file(up_token, key, file_path, params=None,
     # fname = os.path.basename(file_path)
     with open(file_path, 'rb') as input_stream:
         file_name = os.path.basename(file_path)
+        modify_time = int(os.path.getmtime(file_path))
         if size > config._BLOCK_SIZE * 2:
             ret, info = put_stream(up_token, key, input_stream, file_name, size, params,
                                    mime_type, progress_handler,
                                    upload_progress_recorder=upload_progress_recorder,
-                                   modify_time=(int)(os.path.getmtime(file_path)))
+                                   modify_time=modify_time, keep_last_modified=keep_last_modified)
         else:
             crc = file_crc32(file_path)
-            ret, info = _form_put(up_token, key, input_stream, params, mime_type, crc, progress_handler, file_name)
-            # ret, info = _form_put(up_token, key, input_stream, params, mime_type, crc, progress_handler)
+            ret, info = _form_put(up_token, key, input_stream, params, mime_type,
+                                  crc, progress_handler, file_name,
+                                  modify_time=modify_time, keep_last_modified=keep_last_modified)
     return ret, info
 
 
-def _form_put(up_token, key, data, params, mime_type, crc, progress_handler=None, file_name=None):
+def _form_put(up_token, key, data, params, mime_type, crc, progress_handler=None, file_name=None, modify_time=None,
+              keep_last_modified=False):
     fields = {}
     if params:
         for k, v in params.items():
@@ -85,6 +88,10 @@ def _form_put(up_token, key, data, params, mime_type, crc, progress_handler=None
     if not fname or not fname.strip():
         fname = 'file_name'
 
+    # last modify time
+    if modify_time and keep_last_modified:
+        fields['x-qn-meta-!Last-Modified'] = rfc_from_timestamp(modify_time)
+
     r, info = http._post_file(url, data=fields, files={'file': (fname, data, mime_type)})
     if r is None and info.need_retry():
         if info.connect_failed:
@@ -102,9 +109,9 @@ def _form_put(up_token, key, data, params, mime_type, crc, progress_handler=None
 
 def put_stream(up_token, key, input_stream, file_name, data_size, params=None,
                mime_type=None, progress_handler=None,
-               upload_progress_recorder=None, modify_time=None):
+               upload_progress_recorder=None, modify_time=None, keep_last_modified=False):
     task = _Resume(up_token, key, input_stream, data_size, params, mime_type,
-                   progress_handler, upload_progress_recorder, modify_time, file_name)
+                   progress_handler, upload_progress_recorder, modify_time, file_name, keep_last_modified)
     return task.upload()
 
 
@@ -128,7 +135,7 @@ class _Resume(object):
     """
 
     def __init__(self, up_token, key, input_stream, data_size, params, mime_type,
-                 progress_handler, upload_progress_recorder, modify_time, file_name):
+                 progress_handler, upload_progress_recorder, modify_time, file_name, keep_last_modified):
         """初始化断点续上传"""
         self.up_token = up_token
         self.key = key
@@ -140,6 +147,7 @@ def __init__(self, up_token, key, input_stream, data_size, params, mime_type,
         self.upload_progress_recorder = upload_progress_recorder or UploadProgressRecorder()
         self.modify_time = modify_time or time.time()
         self.file_name = file_name
+        self.keep_last_modified = keep_last_modified
         # print(self.modify_time)
         # print(modify_time)
 
@@ -216,6 +224,11 @@ def file_url(self, host):
             for k, v in self.params.items():
                 url.append('{0}/{1}'.format(k, urlsafe_base64_encode(v)))
             pass
+
+        if self.modify_time and self.keep_last_modified:
+            url.append(
+                "x-qn-meta-!Last-Modified/{0}".format(urlsafe_base64_encode(rfc_from_timestamp(self.modify_time))))
+
         url = '/'.join(url)
         # print url
         return url

qiniu/utils.py

@@ -2,11 +2,12 @@
 
 from hashlib import sha1
 from base64 import urlsafe_b64encode, urlsafe_b64decode
-
+from datetime import datetime
 from .compat import b, s
 
 try:
     import zlib
+
     binascii = zlib
 except ImportError:
     zlib = None
@@ -158,3 +159,14 @@ def entry(bucket, key):
         return urlsafe_base64_encode('{0}'.format(bucket))
     else:
         return urlsafe_base64_encode('{0}:{1}'.format(bucket, key))
+
+
+def rfc_from_timestamp(timestamp):
+    """将时间戳转换为HTTP RFC格式
+
+    Args:
+        timestamp: 整型Unix时间戳（单位秒）
+    """
+    last_modified_date = datetime.fromtimestamp(timestamp)
+    last_modified_str = last_modified_date.strftime('%a, %d %b %Y %H:%M:%S GMT')
+    return last_modified_str