Commit: a29d230f341c57d8c633d59860f696654c24a854 - sfjpmag2ools (git)

maintaince tools for sfjp magazine

Commit MetaInfo

• Revision: a29d230f341c57d8c633d59860f696654c24a854 (tree)
• Time: 2016-11-01 18:25:16
• Author: hylom <hylom@hylo...>
• Commiter: hylom

Log Message

Merge branch 'master' of https://pf.osdn.jp/gitroot/h/hy/hylom/sfjpmag2ools

Conflicts:
sfjpmagclient/sfjpmagclient.py

Change Summary

• modified: sfjpmagclient/sfjpmagclient.py
• add: test/sample.png
• modified: test/test_sfjpmagclient.py
• add: test/test_upload_media.py

Incremental Difference

--- a/sfjpmagclient/sfjpmagclient.py
+++ b/sfjpmagclient/sfjpmagclient.py
@@ -42,9 +42,12 @@ class CookieTransport(xmlrpclib.SafeTransport):
         return self.parse_response(response)
 
 class MagClient(object):
-    def __init__(self, username, password, auth_user="", auth_pass=""):
+    def __init__(self, username, password, auth_user="", auth_pass="", endpoint=None):
         self.username = username
         self.password = password
+        if endpoint == None:
+            endpoint = HOST_PATH
+
         if auth_user and auth_pass:
 #            self.uri = "http://{username}:{password}@{url}".format(username=auth_user, password=auth_pass, url=HOST_PATH)
             self.uri = "https://%s:%s@%s" % (auth_user, auth_pass, HOST_PATH)
@@ -80,6 +83,23 @@ class MagClient(object):
                                 self.password,
                                 content)
 
+    def upload_media(self, filename, data, mimetype, overwrite=True, parent=None):
+        proxy = self._get_proxy()
+        post_data = {
+            "name": filename,
+            "type": mimetype,
+            "bits": xmlrpclib.Binary(data),
+            "overwrite": overwrite
+            }
+
+        if parent != None:
+            post_data["post_id"] = parent
+
+        return proxy.wp.uploadFile(self._get_blog_id(),
+                                   self.username,
+                                   self.password,
+                                   post_data)
+
     def get_users_blogs(self):
         proxy = self._get_proxy()
         return proxy.wp.getUsersBlogs(self.username, self.password)

Binary files /dev/null and b/test/sample.png differ

--- a/test/test_sfjpmagclient.py
+++ b/test/test_sfjpmagclient.py
@@ -9,10 +9,11 @@ from sfjpmagclient import MagClient
 
 username = config["username"]
 password = config["password"]
-auth_user = config["auth_user"]
-auth_pass = config["auth_pass"]
+auth_user = config.get("auth_user", "")
+auth_pass = config.get("auth_pass", "")
+endpoint = config["endpoint"]
 
-c = MagClient(username, password, auth_user, auth_pass)
+c = MagClient(username, password, auth_user, auth_pass, endpoint)
 ret = c.get_users_blogs()
 print ret
 

--- /dev/null
+++ b/test/test_upload_media.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+import json
+import sys
+import xmlrpclib
+sys.path.append('.')
+
+from testconfig import config
+from sfjpmagclient import MagClient
+
+username = config["username"]
+password = config["password"]
+auth_user = config.get("auth_user", "")
+auth_pass = config.get("auth_pass", "")
+endpoint = config["endpoint"]
+
+POST_ID = 1
+TEST_FILE = "test/sample.png"
+
+c = MagClient(username, password, auth_user, auth_pass, endpoint)
+
+f = open(TEST_FILE, "r")
+test_data = f.read()
+f.close()
+
+try:
+    ret = c.upload_media("This_is_test.png", test_data, "image/png",
+                     True, 1)
+except xmlrpclib.Fault, e:
+    for k in e.__dict__:
+        print k, e.__getattribute__(k)
+    sys.exit(-1)
+print ret
+
+