Merge pull request #209 from bug-is-zhanglinlin/master

ci-change-merge

Author: zhy1985555

demo/ci_media.py

@@ -30,6 +30,19 @@
 bucket_name = 'demo-1253960454'
 
 
+def ci_get_media_bucket():
+    # 查询媒体处理开通状态
+    response = client.ci_get_media_bucket(
+        Regions=region,
+        BucketName='demo',
+        BucketNames=bucket_name,
+        PageSize="1",
+        PageNumber="1"
+    )
+    print(response)
+    return response
+
+
 def ci_get_media_queue():
     # 查询媒体队列信息
     response = client.ci_get_media_queue(
@@ -38,6 +51,7 @@ def ci_get_media_queue():
     print(response)
     return response
 
+
 def ci_create_media_transcode_watermark_jobs():
     # 创建转码任务
     body = {
@@ -102,6 +116,7 @@ def ci_create_media_transcode_watermark_jobs():
     print(response)
     return response    
 
+
 def ci_create_media_transcode_jobs():
     # 创建转码任务
     body = {
@@ -124,6 +139,7 @@ def ci_create_media_transcode_jobs():
     print(response)
     return response   
 
+
 def ci_list_media_transcode_jobs():
     # 转码任务
     response = client.ci_list_media_jobs(
@@ -135,6 +151,7 @@ def ci_list_media_transcode_jobs():
     print(response)
     return response 
 
+
 def ci_get_media_transcode_jobs():
     # 转码任务
     response = client.ci_get_media_jobs(
@@ -145,6 +162,7 @@ def ci_get_media_transcode_jobs():
     print(response)
     return response 
 
+
 def get_media_info():
     # 获取媒体信息
     response = client.get_media_info(
@@ -153,6 +171,7 @@ def get_media_info():
     )
     print(response)
 
+
 def get_snapshot():
     # 产生同步截图
     response = client.get_snapshot(
@@ -165,6 +184,18 @@ def get_snapshot():
     print(response)
     response['Body'].get_stream_to_file('snapshot.jpg')
 
+
+def get_pm3u8():
+    # 获取私有 M3U8 ts 资源的下载授权
+    response = client.get_pm3u8(
+        Bucket=bucket_name,
+        Key='demo.m3u8',
+        Expires='3600',
+    )
+    print(response)
+    response['Body'].get_stream_to_file('pm3u8.m3u8')
+
+
 def ci_trigger_workflow():
     # 触发工作流接口
     response = client.ci_trigger_workflow(
@@ -175,6 +206,7 @@ def ci_trigger_workflow():
     print(response)
     return response
 
+
 def ci_get_workflowexecution():
     # 查询工作流实例接口
     response = client.ci_get_workflowexecution(
@@ -184,6 +216,7 @@ def ci_get_workflowexecution():
     print(response)
     return response
 
+
 def ci_list_workflowexecution():
     # 查询工作流实例接口
     response = client.ci_list_workflowexecution(
@@ -198,8 +231,10 @@ def ci_list_workflowexecution():
     #ci_get_media_queue()
     #ci_get_media_transcode_jobs()
     #ci_create_media_transcode_jobs()
-    #get_media_info()
-    #get_snapshot()
+    # get_media_info()
+    # get_snapshot()
     #ci_trigger_workflow()
     #ci_list_workflowexecution()
-    ci_get_workflowexecution()
+    # ci_get_workflowexecution()
+    # ci_get_media_bucket()
+    get_pm3u8()

qcloud_cos/cos_client.py

@@ -114,7 +114,7 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token
         else:
             raise CosClientError('SecretId and SecretKey is Required!')
 
-    def uri(self, bucket, path=None, endpoint=None, domain=None):
+    def uri(self, bucket=None, path=None, endpoint=None, domain=None):
         """拼接url
 
         :param bucket(string): 存储桶名称.
@@ -130,11 +130,14 @@ def uri(self, bucket, path=None, endpoint=None, domain=None):
         if domain is not None:
             url = domain
         else:
-            bucket = format_bucket(bucket, self._appid)
             if endpoint is None:
                 endpoint = self._endpoint
 
-            url = u"{bucket}.{endpoint}".format(bucket=bucket, endpoint=endpoint)
+            if bucket is not None:
+                bucket = format_bucket(bucket, self._appid)
+                url = u"{bucket}.{endpoint}".format(bucket=bucket, endpoint=endpoint)
+            else:
+                url = u"{endpoint}".format(endpoint=endpoint)
         if self._ip is not None:
             url = self._ip
             if self._port is not None:
@@ -5529,6 +5532,70 @@ def ci_auditing_virus_query(self, Bucket, JobID, **kwargs):
 
         return data
 
+    def ci_get_media_bucket(self, Regions='', BucketName='', BucketNames='', PageNumber='', PageSize='', **kwargs):
+        """查询媒体处理开通状态接口 https://cloud.tencent.com/document/product/436/48988
+
+        :param Regions(string): 地域信息，例如 ap-shanghai、ap-beijing，若查询多个地域以“,”分隔字符串
+        :param BucketName(string): 存储桶名称前缀，前缀搜索
+        :param BucketNames(string): 存储桶名称，以“,”分隔，支持多个存储桶，精确搜索
+        :param PageNumber(string): 第几页
+        :param PageSize(string): 每页个数
+        :param kwargs(dict): 设置请求的headers.
+        :return(dict): 查询成功返回的结果,dict类型.
+
+        .. code-block:: python
+
+            config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key, Token=token)  # 获取配置对象
+            client = CosS3Client(config)
+            # 查询媒体处理队列接口
+            response = client.ci_get_media_bucket(
+                Regions='ap-chongqing,ap-shanghai',
+                BucketName='demo',
+                BucketNames='demo-1253960454,demo1-1253960454',
+                PageNumber='2'，
+                PageSize='3',
+            )
+            print response
+        """
+        headers = mapped(kwargs)
+        final_headers = {}
+        params = {}
+        for key in headers:
+            if key.startswith("response"):
+                params[key] = headers[key]
+            else:
+                final_headers[key] = headers[key]
+        headers = final_headers
+
+        params = format_values(params)
+
+        path = "/mediabucket"
+        url = self._conf.uri(bucket=None, path=path, endpoint=self._conf._endpoint_ci)
+        url = u"{url}?{regions}&{bucketNames}&{bucketName}&{pageNumber}&{pageSize}".format(
+            url=to_unicode(url),
+            regions=to_unicode('regions='+Regions),
+            bucketNames=to_unicode('bucketNames='+BucketNames),
+            bucketName=to_unicode('bucketName='+BucketName),
+            pageNumber=to_unicode('pageNumber='+PageNumber),
+            pageSize=to_unicode('pageSize='+PageSize),
+        )
+        logger.info("get_media_bucket result, url=:{url} ,headers=:{headers}, params=:{params}".format(
+            url=url,
+            headers=headers,
+            params=params))
+        rt = self.send_request(
+            method='GET',
+            url=url,
+            bucket=None,
+            auth=CosS3Auth(self._conf, path, params=params),
+            params=params,
+            headers=headers)
+
+        data = xml_to_dict(rt.content)
+        # 单个元素时将dict转为list
+        format_dict(data, ['MediaBucketList'])
+        return data
+
     def ci_get_media_queue(self, Bucket, **kwargs):
         """查询媒体处理队列接口 https://cloud.tencent.com/document/product/436/54045
 
@@ -6052,6 +6119,59 @@ def get_snapshot(self, Bucket, Key, Time, Width=None, Height=None, Format='jpg',
 
         return response
 
+    def get_pm3u8(self, Bucket, Key, Expires, **kwargs):
+        """获取私有 M3U8 ts 资源的下载授权 https://cloud.tencent.com/document/product/436/63740
+
+        :param Bucket(string): 存储桶名称.
+        :param Key(string): COS路径.
+        :param Expires(string): 私有 ts 资源 url 下载凭证的相对有效期.
+        :param kwargs(dict): 设置请求的headers.
+        :return(dict): 下载成功返回的结果,包含Body对应的StreamBody,可以获取文件流或下载文件到本地.
+
+        .. code-block:: python
+
+            config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key, Token=token)  # 获取配置对象
+            client = CosS3Client(config)
+            # 用于获取COS文件某个时间的截图
+            response = client.get_snapshot(
+                Bucket='bucket',
+                Key='test.mp4',
+                Expires='3600',
+            )
+            response['Body'].get_stream_to_file('pm3u8.m3u8')
+        """
+        headers = mapped(kwargs)
+        final_headers = {}
+        params = {'ci-process': 'pm3u8'}
+        for key in headers:
+            if key.startswith("response"):
+                params[key] = headers[key]
+            else:
+                final_headers[key] = headers[key]
+        headers = final_headers
+
+        params['expires'] = Expires
+        params = format_values(params)
+
+        url = self._conf.uri(bucket=Bucket, path=Key)
+        logger.info("get_pm3u8, url=:{url} ,headers=:{headers}, params=:{params}".format(
+            url=url,
+            headers=headers,
+            params=params))
+        rt = self.send_request(
+            method='GET',
+            url=url,
+            bucket=Bucket,
+            stream=True,
+            auth=CosS3Auth(self._conf, Key, params=params),
+            params=params,
+            headers=headers)
+
+        response = dict(**rt.headers)
+        response['Body'] = StreamBody(rt)
+
+        return response
+
     def ci_get_doc_queue(self, Bucket, **kwargs):
         """查询文档转码处理队列接口 https://cloud.tencent.com/document/product/460/46946
 

ut/test.py

@@ -1789,6 +1789,34 @@ def test_get_snapshot():
     assert (response)
 
 
+def test_get_pm3u8():
+    if TEST_CI != 'true':
+        return
+    # 获取私有 M3U8 ts 资源的下载授权
+    response = client.get_pm3u8(
+        Bucket=ci_bucket_name,
+        Key='/data/media/m3u8_no_end.m3u8',
+        Expires='3600'
+    )
+    print(response)
+    assert (response)
+
+
+def test_ci_get_media_bucket():
+    if TEST_CI != 'true':
+        return
+    # 获取私有 M3U8 ts 资源的下载授权
+    response = client.ci_get_media_bucket(
+        Regions=ci_region,
+        BucketNames=ci_bucket_name,
+        BucketName=ci_bucket_name,
+        PageNumber='1',
+        PageSize='2'
+    )
+    print(response)
+    assert (response)
+
+
 def test_ci_create_doc_transcode_jobs():
     if TEST_CI != 'true':
         return
@@ -1965,6 +1993,8 @@ def test_sse_c_file():
     test_ci_list_doc_transcode_jobs()
     test_get_media_info()
     test_get_snapshot()
+    test_get_pm3u8()
+    test_ci_get_media_bucket()
     test_sse_c_file()
     """
     tearDown()