MagisterPy 0.1.2__tar.gz → 0.1.22__tar.gz

magisterpy-0.1.22/MagisterPy/jsparser.py

@@ -0,0 +1,48 @@
+import json
+from .magister_errors import *
+class JsParser():
+    def __init__(self):
+        pass
+    def get_authcode_from_js(self,js_content:str):
+        try:
+            line = 1131
+            column = 18203
+            buffer = 200
+            authcode = ""
+            js_content = js_content.split("\n")[line][column:column+buffer]
+            start_list_index = None
+            content_list = [] #stores the 2 lists containing info about the authcode
+            
+            #Find the first and the second list
+            for idx, _char in enumerate(js_content):
+                
+                if _char == "[":
+                    start_list_index = idx
+                    
+                if _char == "]" and (not (start_list_index is None)):
+                    
+                    content_list.append(json.loads(js_content[start_list_index:idx+1]))
+                
+                if len(content_list)>1:
+                    break
+            
+            
+            convert_to_int = lambda a: int(a)
+
+            random_char_list, index_list = content_list
+
+            index_list = list(map(convert_to_int,index_list))
+
+                
+            for idx in index_list:
+                authcode+= str(random_char_list[idx])
+            
+            return authcode
+        except KeyboardInterrupt:
+            raise KeyboardInterrupt()
+        except Exception:
+            raise AuthcodeError()
+        
+                
+
+        

{magisterpy-0.1.2 → magisterpy-0.1.22}/MagisterPy/magister_errors.py

@@ -19,5 +19,9 @@ class IncorrectCredentials(BaseMagisterError):
         
 class ConnectionError(BaseMagisterError):
     def __init__(self, message="\nCould not connect to Magister. Please check your internet connection"):
+        super().__init__(message)
+        self.message = message
+class AuthcodeError(BaseMagisterError):
+    def __init__(self, message="\nCould not get the authcode from the javascript. This is likely due to magister updating their code structure, please update the package or create an issue if it the latest version"):
         super().__init__(message)
         self.message = message

{magisterpy-0.1.2 → magisterpy-0.1.22/MagisterPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: MagisterPy
-Version: 0.1.2
+Version: 0.1.22
 Summary: A Python package for retrieving information from magister
 Home-page: https://github.com/H3LL0U/MagisterPy
 Author: H3LL0U
@@ -17,6 +17,14 @@ Requires-Dist: idna==3.10
 Requires-Dist: requests==2.32.3
 Requires-Dist: soupsieve==2.6
 Requires-Dist: urllib3==2.2.3
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # MagisterPY
 
@@ -31,6 +39,10 @@ For more details, please refer to Magister's Terms of Service. (https://magister
 ```
 pip install git+https://github.com/H3LL0U/MagisterPy.git
 ```
+or 
+```
+pip install MagisterPy
+```
 
 ## Contributing
 Feel free to create an issue if something doesn't work. It's only been tested on a singular school so far so it is to be expected. If you want to help add a feature it would be great as well! :D

{magisterpy-0.1.2/MagisterPy.egg-info → magisterpy-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: MagisterPy
-Version: 0.1.2
+Version: 0.1.22
 Summary: A Python package for retrieving information from magister
 Home-page: https://github.com/H3LL0U/MagisterPy
 Author: H3LL0U
@@ -17,6 +17,14 @@ Requires-Dist: idna==3.10
 Requires-Dist: requests==2.32.3
 Requires-Dist: soupsieve==2.6
 Requires-Dist: urllib3==2.2.3
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # MagisterPY
 
@@ -31,6 +39,10 @@ For more details, please refer to Magister's Terms of Service. (https://magister
 ```
 pip install git+https://github.com/H3LL0U/MagisterPy.git
 ```
+or 
+```
+pip install MagisterPy
+```
 
 ## Contributing
 Feel free to create an issue if something doesn't work. It's only been tested on a singular school so far so it is to be expected. If you want to help add a feature it would be great as well! :D

{magisterpy-0.1.2 → magisterpy-0.1.22}/README.MD

@@ -11,6 +11,10 @@ For more details, please refer to Magister's Terms of Service. (https://magister
 ```
 pip install git+https://github.com/H3LL0U/MagisterPy.git
 ```
+or 
+```
+pip install MagisterPy
+```
 
 ## Contributing
 Feel free to create an issue if something doesn't work. It's only been tested on a singular school so far so it is to be expected. If you want to help add a feature it would be great as well! :D

{magisterpy-0.1.2 → magisterpy-0.1.22}/setup.py

@@ -7,7 +7,7 @@ def parse_requirements(filename):
 
 setup(
     name="MagisterPy",  
-    version="0.1.2",  
+    version="0.1.22",  
     description="A Python package for retrieving information from magister",
     long_description=open("./README.MD").read(),  
     long_description_content_type="text/markdown", 

{magisterpy-0.1.2 → magisterpy-0.1.22}/tests/test_jsonparser.py

@@ -15,14 +15,10 @@ class TestJsParser(unittest.TestCase):
         self.parser = JsParser()
 
     def test_valid_authcode_extraction(self):
-        with open(r"tests\test_javascripts\account-85bb24d85718eb247b7c.js") as file:
+        with open(r"tests\test_javascripts\account-56c22c13622e321fb1f1.js") as file:
             content = file.read()
-            self.assertEqual(self.parser.get_authcode_from_js(content),"1ca5d248")
+            self.assertEqual(self.parser.get_authcode_from_js(content),"6380e45e80d5bb")
 
-
-        with open(r"tests\test_javascripts\account-e6fb87fd4f567cbd37f5.js") as file:
-            content = file.read()
-            self.assertEqual(self.parser.get_authcode_from_js(content),"b7cf076f")
         
 
 if __name__ == "__main__":

magisterpy-0.1.2/MagisterPy/jsparser.py

@@ -1,43 +0,0 @@
-import json
-
-class JsParser():
-    def __init__(self):
-        pass
-    def get_authcode_from_js(self,js_content:str):
-        line = 1192
-        column = 15476
-        buffer = 200
-        authcode = ""
-        js_content = js_content.split("\n")[line][column:column+buffer]
-        start_list_index = None
-        content_list = [] #stores the 2 lists containing info about the authcode
-        
-        #Find the first and the second list
-        for idx, _char in enumerate(js_content):
-            
-            if _char == "[":
-                start_list_index = idx
-                
-            if _char == "]" and (not (start_list_index is None)):
-                
-                content_list.append(json.loads(js_content[start_list_index:idx+1]))
-            
-            if len(content_list)>1:
-                break
-        
-        if len(content_list) == 2:
-            convert_to_int = lambda a: int(a)
-
-            random_char_list, index_list = content_list
-
-            index_list = list(map(convert_to_int,index_list))
-
-            
-            for idx in index_list:
-                authcode+= random_char_list[idx]
-        if len(authcode) == 8:
-            return authcode
-        return None
-                
-
-