[wip] v2 support code (#13)

pbincli/api.py

@@ -11,17 +11,49 @@ class PrivateBin:
 
 
     def post(self, request):
-        r = requests.post(url = self.server, headers = self.headers, proxies = self.proxy, data = request)
-        return r.text
+        result = requests.post(
+            url = self.server,
+            headers = self.headers,
+            proxies = self.proxy,
+            data = request)
+
+        try:
+            return result.json()
+        except ValueError as e:
+            print("ERROR: Unable parse response as json. Received (size = {}):\n".format(len(result.text), result.text))
+            exit(1)
 
 
     def get(self, request):
-        url = self.server + "?" + request
-        r = requests.get(url = url, headers = self.headers, proxies = self.proxy)
-        return r.text
+        return requests.get(
+            url = self.server + "?" + request,
+            headers = self.headers,
+            proxies = self.proxy).json()
 
 
-    def delete(self, pasteid, token):
-        request = {'pasteid':pasteid,'deletetoken':token}
-        r = requests.post(url = self.server, headers = self.headers, proxies = self.proxy, data = request)
-        return r.text
+    def delete(self, request):
+        result = requests.post(
+            url = self.server,
+            headers = self.headers,
+            proxies = self.proxy,
+            data = request)
+
+        # using try as workaround for versions < 1.3 due to we cant detect
+        # if server used version 1.2, where auto-deletion is added
+        try:
+            return result.json()
+        except ValueError as e:
+            # unable parse response as json because it can be empty (1.2), so simulate correct answer
+            from json import loads as json_loads
+            return json_loads('{"status":0}')
+
+
+    def getVersion(self):
+        jsonldSchema = requests.get(
+            url = self.server + '?jsonld=paste',
+            proxies = self.proxy).json()
+        return jsonldSchema['@context']['v']['@value'] \
+            if ('@context' in jsonldSchema and
+                'v' in jsonldSchema['@context'] and
+                '@value' in jsonldSchema['@context']['v']) \
+            else 1