resource iamge 구현 완료

Author: hosysy

.gitignore

@@ -1,4 +1,5 @@
-coolsms.pyc
+*.pyc
 */.idea/*
 */__pycache__
 test.py
+test.jpg

sdk/api/__pycache__/image.cpython-34.pyc

@@ -2,6 +2,7 @@
 # -*- coding: utf8 -*-
 
 import sys
+import base64
 sys.path.insert(0, "../../")
 
 from sdk.coolsms import Coolsms
@@ -53,25 +54,22 @@ def get_image_info(self, image_id):
 
     # @brief upload image ( HTTP Method POST )
     # @param string image [required]
-    # @param string encoding [optional] 
     # @return JSONobject
-    def upload_image(self, image, encoding=None):
+    def upload_image(self, image):
         if image == None:
             raise CoolsmsSDKException("'image' is required", 201);
 
         params = dict()
         params = {'image':image}
-        if encoding:
-            params['encoding'] = encoding
+        params['image_encoding'] = 'base64'
 
         files = {}
-
         try:
-            with open(params['image'], 'rb') as content_file:
-                content = content_file.read()
+            with open(image, 'rb') as content_file:
+                content = base64.b64encode(content_file.read())
+                content = content.decode()
         except Exception as e:
             raise CoolsmsSystemException(e, 399)
-
         files = {'image': {'filename': image, 'content': content}}
 
         response = self.cool.request_post_multipart("upload_image", params, files)

sdk/api/__pycache__/message.cpython-34.pyc

@@ -3,6 +3,7 @@
 
 import sys
 import platform
+import base64
 sys.path.insert(0, "../../")
 
 from sdk.coolsms import Coolsms
@@ -63,11 +64,12 @@ def send(self, params):
 
             try:
                 with open(params['image'], 'rb') as content_file:
-                    content = content_file.read()
+                    content = base64.b64encode(content_file.read())
+                    content = content.decode()
             except Exception as e:
                 raise CoolsmsSystemException(e, 399)
-
             files = {'image': {'filename': params['image'], 'content': content}}
+            params['image_encoding'] = 'base64'
 
         # request post multipart-form
         response = self.cool.request_post_multipart("send", params, files)

sdk/api/image.py

@@ -154,11 +154,12 @@ def request_post_multipart(self, resource, params, files):
         selector = "/%s/%s/%s" % (self.api_name, self.api_version, resource)
 
         params = self.set_base_params(params)
+
         content_type, body = self.encode_multipart_formdata(params, files)
         conn = HTTPSConnection(host)
         conn.putrequest('POST', selector)
-        conn.putheader('content-type', content_type)
-        conn.putheader('content-length', str(len(body)))
+        conn.putheader('Content-type', content_type)
+        conn.putheader('Content-length', str(len(body)))
         conn.putheader('User-Agent', 'sms-python')
         conn.endheaders()
         conn.send(body)
@@ -188,6 +189,7 @@ def request_post_multipart(self, resource, params, files):
     def encode_multipart_formdata(self, params, files):
         boundary = str(uuid.uuid1())
         crlf = '\r\n'
+
         l = []
         for key, value in params.items():
             l.append('--' + boundary)
@@ -196,41 +198,16 @@ def encode_multipart_formdata(self, params, files):
             l.append(value)
 
         for key, value in files.items():
-
-            print(self.get_content_type(value['filename']))
             l.append('--' + boundary)
             l.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, value['filename']))
             l.append('Content-Type: %s' % self.get_content_type(value['filename']))
-
-            print(type(value['content']))
             l.append('')
             l.append(str(value['content']))
 
         l.append('--' + boundary + '--')
         l.append('')
-        
         body = crlf.join(l).encode('utf-8')
-        """
-        body = body.encode('utf-8')
-
-        print("WOW")
-        for key, value in files.items():
-            print(self.get_content_type(value['filename']))
-            image_data = '--' + boundary + crlf
-            image_data += 'Content-Type: %s' % self.get_content_type(value['filename']) + crlf
-            image_data += 'Content-Disposition: form-data; name="%s"; filename="%s"' % (key, value['filename']) + crlf
-            image_data += crlf
-            image_data = image_data.encode('utf-8')
-
-            body += image_data
-            body += value['content']
-
-        end_data = crlf + '--' + boundary + '--' + crlf
-        end_data += crlf
-        end_data = end_data.encode('utf-8')
-        body += end_data
-        """
-
+        
         content_type = 'multipart/form-data; boundary=%s' % boundary
 
         return content_type, body