padlite: cleanup of api return values

1 files changed, 32 insertions, 28 deletions

diff --git a/padlite.py b/padlite.py
index 716c82b..0635937 100644
--- a/padlite.py
+++ b/padlite.py
@@ -56,31 +56,31 @@ class PadLite:
         return self._apiCall('/api/1/createGroupIfNotExistsFor', groupMapper=groupMapper)['groupID']
 
     def deleteGroup(self, groupID):
-        return self._apiCall('/api/1/deleteGroup', groupID=groupID)
+        self._apiCall('/api/1/deleteGroup', groupID=groupID)
 
     def listPads(self, groupID):
-        return self._apiCall('/api/1/listPads', groupID=groupID)
+        return self._apiCall('/api/1/listPads', groupID=groupID)['padIDs']
 
     def createPad(self, padID, text):
-        return self._apiCall('/api/1/createPad', padID=padID, text=text)
+        self._apiCall('/api/1/createPad', padID=padID, text=text)
 
     def createGroupPad(self, groupID, padName, text):
-        return self._apiCall('/api/1/createGroupPad', groupID=groupID, padName=padName, text=text)
+        return self._apiCall('/api/1/createGroupPad', groupID=groupID, padName=padName, text=text)['padID']
 
     def createAuthor(self, name):
-        return self._apiCall('/api/1/createAuthor', name=name)
+        return self._apiCall('/api/1/createAuthor', name=name)['authorID']
 
     def createAuthorIfNotExistsFor(self, authorMapper, name):
-        return self._apiCall('/api/1/createAuthorIfNotExistsFor', authorMapper=authorMapper, name=name)
+        return self._apiCall('/api/1/createAuthorIfNotExistsFor', authorMapper=authorMapper, name=name)['authorID']
 
     def listPadsOfAuthor(self, authorID):
-        return self._apiCall('/api/1/listPadsOfAuthor', authorID=authorID)
+        return self._apiCall('/api/1/listPadsOfAuthor', authorID=authorID)['padIDs']
 
     def createSession(self, groupID, authorID, validUntil):
-        return self._apiCall('/api/1/createSession', groupID=groupID, authorID=authorID, validUntil=validUntil)
+        return self._apiCall('/api/1/createSession', groupID=groupID, authorID=authorID, validUntil=validUntil)['sessionID']
 
     def deleteSession(self, sessionID):
-        return self._apiCall('/api/1/deleteSession', sessionID=sessionID)
+        self._apiCall('/api/1/deleteSession', sessionID=sessionID)
 
     def getSessionInfo(self, sessionID):
         return self._apiCall('/api/1/getSessionInfo', sessionID=sessionID)
@@ -92,46 +92,52 @@ class PadLite:
         return self._apiCall('/api/1/listSessionsOfAuthor', authorID=authorID)
 
     def getText(self, padID, rev):
-        return self._apiCall('/api/1/getText', padID=padID, rev=rev)
+        return self._apiCall('/api/1/getText', padID=padID, rev=rev)['text']
 
     def setText(self, padID, text):
-        return self._apiCall('/api/1/setText', padID=padID, text=text)
+        self._apiCall('/api/1/setText', padID=padID, text=text)
 
     def getHTML(self, padID, rev):
-        return self._apiCall('/api/1/getHTML', padID=padID, rev=rev)
+        return self._apiCall('/api/1/getHTML', padID=padID, rev=rev)['html']
 
     def setHTML(self, padID, html):
+        # currently not working
         return self._apiCall('/api/1/setHTML', padID=padID, html=html)
 
     def getRevisionsCount(self, padID):
-        return self._apiCall('/api/1/getRevisionsCount', padID=padID)
+        return self._apiCall('/api/1/getRevisionsCount', padID=padID)['revisions']
 
     def getLastEdited(self, padID):
-        return self._apiCall('/api/1/getLastEdited', padID=padID)
+        return self._apiCall('/api/1/getLastEdited', padID=padID)['lastEdited']
 
     def deletePad(self, padID):
-        return self._apiCall('/api/1/deletePad', padID=padID)
+        self._apiCall('/api/1/deletePad', padID=padID)
 
     def getReadOnlyID(self, padID):
-        return self._apiCall('/api/1/getReadOnlyID', padID=padID)
+        return self._apiCall('/api/1/getReadOnlyID', padID=padID)['readOnlyID']
 
     def setPublicStatus(self, padID, publicStatus):
-        return self._apiCall('/api/1/setPublicStatus', padID=padID, publicStatus=publicStatus)
+        if publicStatus:
+            publicStatus = 'true'
+        else:
+            publicStatus = 'false'
+
+        self._apiCall('/api/1/setPublicStatus', padID=padID, publicStatus=publicStatus)
 
     def getPublicStatus(self, padID):
-        return self._apiCall('/api/1/getPublicStatus', padID=padID)
+        return self._apiCall('/api/1/getPublicStatus', padID=padID)['publicStatus']
 
     def setPassword(self, padID, password):
-        return self._apiCall('/api/1/setPassword', padID=padID, password=password)
+        self._apiCall('/api/1/setPassword', padID=padID, password=password)
 
     def isPasswordProtected(self, padID):
-        return self._apiCall('/api/1/isPasswordProtected', padID=padID)
+        return self._apiCall('/api/1/isPasswordProtected', padID=padID)['isPasswordProtected']
 
     def listAuthorsOfPad(self, padID):
-        return self._apiCall('/api/1/listAuthorsOfPad', padID=padID)
+        return self._apiCall('/api/1/listAuthorsOfPad', padID=padID)['authorIDs']
 
     def padUsersCount(self, padID):
-        return self._apiCall('/api/1/padUsersCount', padID=padID)
+        return self._apiCall('/api/1/padUsersCount', padID=padID)['padUsersCount']
 
 
     #
@@ -141,6 +147,7 @@ class PadLite:
         return self._apiCall('/api/1.1/getAuthorName', authorID=authorID)
 
     def padUsers(self, padID):
+        # not working right now
         return self._apiCall('/api/1.1/padUsers', padID=padID)
 
     def sendClientsMessage(self, padID, msg):
@@ -154,7 +161,7 @@ class PadLite:
     # API Version 1.2
     #
     def checkToken(self):
-        return self._apiCall('/api/1.2/checkToken')
+        self._apiCall('/api/1.2/checkToken')
 
 
     #
@@ -168,17 +175,14 @@ class PadLite:
     # API Version 1.2.7
     #
     def getChatHistory(self, padID, start=None, end=None):
-        return self._apiCall('/api/1.2.7/getChatHistory', padID=padID, start=start, end=end)
+        return self._apiCall('/api/1.2.7/getChatHistory', padID=padID, start=start, end=end)['messages']
 
     def getChatHead(self, padID):
-        return self._apiCall('/api/1.2.7/getChatHead', padID=padID)
+        return self._apiCall('/api/1.2.7/getChatHead', padID=padID)['chatHead']
 
 
     #
     # API Version 1.2.8
     #
-    def getRevisionsCount(self, padID):
-        return self._apiCall('/api/1.2.8/getRevisionsCount', padID=padID)
-
     def getRevisionChangeset(self, padID, rev):
         return self._apiCall('/api/1.2.8/getRevisionChangeset', padID=padID, rev=rev)