Add GetMessages (#26)

* Add Martin's code

* Minor updates

* Minor fixes

Author: artemlos

licensing/methods.py

@@ -214,12 +214,42 @@ def get_web_api_log(token, product_id = 0, key = "", machine_code="", friendly_n
 
         if jobj == None or not("result" in jobj) or jobj["result"] == 1:
             if jobj != None:
-                return (False, jobj["message"])
+                return (None, jobj["message"])
             else:
-               return (False, "Could not contact the server.")
+               return (None, "Could not contact the server.")
 
         return (jobj["logs"], "")
 
+class Message:
+    
+    @staticmethod
+    def get_messages(token, channel="", time=0):
+        
+        """
+        This method will return a list of messages that were broadcasted.
+        You can create new messages here. Messages can be filtered based on the time and the channel.
+        
+        More docs: https://app.cryptolens.io/docs/api/v3/GetMessages
+        """
+        
+        try:
+            response = HelperMethods.send_request("/message/getmessages/", {"token":token, "Channel": channel, "Time": time})
+        except HTTPError as e:
+            response = e.read()
+        except URLError as e:
+            return (None, "Could not contact the server. Error message: " + str(e))
+        except Exception:
+            return (None, "Could not contact the server.")
+
+        jobj = json.loads(response)
+
+        if jobj == None or not("result" in jobj) or jobj["result"] == 1:
+            if jobj != None:
+                return (None, jobj["message"])
+            else:
+               return (None, "Could not contact the server.")
+
+        return (jobj["messages"], "")
 
 class Helpers:
 
@@ -264,5 +294,4 @@ def IsOnRightMachine(license_key, is_floating_license = False, allow_overdraft=F
                 if current_mid == act_machine.Mid:
                     return True
 
-        return False
-        
+        return False

setup.py

@@ -2,13 +2,13 @@
 setup(
   name = 'licensing',         # How you named your package folder (MyLib)
   packages = ['licensing'],   # Chose the same as "name"
-  version = '0.21',      # Start with a small number and increase it with every change you make
+  version = '0.22',      # Start with a small number and increase it with every change you make
   license='MIT',        # Chose a license from here: https://help.github.com/articles/licensing-a-repository
   description = 'Client library for Cryptolens licensing Web API.',   # Give a short description about your library
   author = 'Cryptolens AB',                   # Type in your name
   author_email = 'support@cryptolens.io',      # Type in your E-Mail
   url = 'https://cryptolens.io',   # Provide either the link to your github or to your website
-  download_url = 'https://github.com/Cryptolens/cryptolens-python/archive/v_21.tar.gz',    # I explain this later on
+  download_url = 'https://github.com/Cryptolens/cryptolens-python/archive/v_22.tar.gz',    # I explain this later on
   keywords = ['software licensing', 'licensing library', 'cryptolens'],   # Keywords that define your package best
   classifiers=[
     #'Development Status :: 5 - Stable',      # Chose either "3 - Alpha", "4 - Beta" or "5 - Production/Stable" as the current state of your package

test.py

@@ -6,7 +6,7 @@
 """
 
 from licensing.models import *
-from licensing.methods import Key, Helpers
+from licensing.methods import Key, Helpers, Message
 
 import socket