Allow returning of attachments as bytes and fix base64

JelteF · JelteF · commit 44c6dcf2c459 · 2016-02-05T13:18:41.000+01:00
diff --git a/dokuwiki.py b/dokuwiki.py
@@ -11,6 +11,8 @@
     from xmlrpclib import ServerProxy, Binary, Fault
     from urllib import urlencode
 
+from base64 import b64decode
+
 ERR = 'XML or text declaration not at start of entity: line 2, column 0'
 
 def utc2local(date):
@@ -172,8 +174,13 @@ def changes(self, timestamp):
     def list(self, namespace='/', **options):
         return self._dokuwiki.send('wiki.getAttachments', namespace, options)
 
-    def get(self, media, dirpath, filename='', overwrite=False):
+    def get(self, media, dirpath=None, filename='', overwrite=False):
         import os
+        data = self._dokuwiki.send('wiki.getAttachment', media)
+        data = b64decode(data)
+        if dirpath is None:
+            return data
+
         if not filename:
             filename = media.replace('/', ':').split(':')[-1]
         if not os.path.exists(dirpath):
@@ -182,7 +189,7 @@ def get(self, media, dirpath, filename='', overwrite=False):
         if os.path.exists(filepath) and not overwrite:
             raise FileExistsError("[Errno 17] File exists: '%s'" % filepath)
         with open(filepath, 'wb') as fhandler:
-            fhandler.write(self._dokuwiki.send('wiki.getAttachment', media).data)
+            fhandler.write(data)
 
     def info(self, media):
         return self._dokuwiki.send('wiki.getAttachmentInfo', media)
