0.1.5 *Features: Parameters to views*

Author: zabbix-byte

pypulse/Socket/request_handler.py

@@ -25,7 +25,7 @@ def do_GET(self):
             }
 
             render = execute_ast_view_request(
-                node_body=current_view.view, request=request, requirement_view=current_view.requirement_view)
+                node_body=current_view.view, request=request, requirement_view=current_view.requirement_view, other_variables=current_view.variables_list)
 
             if type(render).__name__ == 'Redirect':
                 render = render.get_render(request)
@@ -75,7 +75,7 @@ def do_POST(self):
             self.end_headers()
             self.wfile.write(template.encode())
         else:
-            super().do_GET()
+            super().do_POST()
 
     def do_PUT(self):
         content_length = int(self.headers['Content-Length'])
@@ -114,7 +114,7 @@ def do_PUT(self):
             self.end_headers()
             self.wfile.write(template.encode())
         else:
-            super().do_GET()
+            super().do_PUT()
 
     def do_PATCH(self):
         content_length = int(self.headers['Content-Length'])
@@ -153,4 +153,4 @@ def do_PATCH(self):
             self.end_headers()
             self.wfile.write(template.encode())
         else:
-            super().do_GET()
+            super().do_PATCH()

pypulse/Utils/call_ast_exec_module.py

@@ -1,7 +1,7 @@
 import ast
 
 
-def execute_ast_view_request(request: str, node_body: object, requirement_view: list) -> None:
+def execute_ast_view_request(request: str, node_body: object, requirement_view: list, other_variables: dict = {}) -> None:
     module_body = []
 
     for i in requirement_view:
@@ -35,4 +35,10 @@ def execute_ast_view_request(request: str, node_body: object, requirement_view:
         namespace
     )
 
-    return namespace[node_body.name](request)
+    variables = {
+        'request': request
+    }
+
+    variables.update(other_variables)
+
+    return namespace[node_body.name](**variables)

pypulse/View/callview.py

@@ -2,17 +2,100 @@
 
 
 class CallView:
-    def __init__(self, path: str) -> None:
+    def __init__(self, path_to_find: str) -> None:
         self.name = None
         self.view = None
         self.requirement_view = None
         self.path_trigger = None
+        self.variables_list = {}
+
+        path_to_find = path_to_find.split('/')
 
         for i in View.instances:
-            if i.path_trigger == path:
-                self.name = i.name
-                self.view = i.view
-                self.requirement_view = i.requirement_view
-                self.path_trigger = i.path_trigger
-                break
-    
+            path = i.path_trigger.split('/')
+
+            if len(path) != len(path_to_find):
+                continue
+
+            path_contain_variable = False
+            index = []
+            variables_for_index = {}
+
+            for j in path:
+                if len(j) > 0:
+                    path_variable_parameters = self.find_if_variable_in_path(j)
+                    if path_variable_parameters[0] != False:
+                        path_contain_variable = True
+
+                        variables_for_index[j] = (
+                            path_variable_parameters[2], path_variable_parameters[1])
+                        index.append(j)
+
+            # infind the variable and his context call
+            if path_contain_variable:
+                # this is the part wee dont check at moment
+                view_finded = True
+
+                for path_view in range(len(path)):
+                    # excluding the variables
+                    element_finded = False
+                    for elements_in_path in index:
+                        if path.index(elements_in_path) == path_view:
+                            element_finded = True
+                            break
+
+                    if element_finded:
+                        continue
+
+                    if path[path_view] != path_to_find[path_view]:
+                        view_finded = False
+
+                if view_finded:
+                    self.name = i.name
+                    self.view = i.view
+                    self.requirement_view = i.requirement_view
+                    self.path_trigger = i.path_trigger
+
+                    for current_index_path_variable in index:
+                        self.variables_list[variables_for_index[current_index_path_variable][0]] = self.parse_varible(
+                            path_to_find[path.index(current_index_path_variable)], variables_for_index[current_index_path_variable][1])
+
+                    break
+
+            if path_contain_variable == False:
+                if path == path_to_find:
+                    self.name = i.name
+                    self.view = i.view
+                    self.requirement_view = i.requirement_view
+                    self.path_trigger = i.path_trigger
+                    break
+
+    def find_if_variable_in_path(self, current_path_element: str):
+        # works whit: int, str, float
+
+        methods_allowed = ['str', 'int', 'float']
+
+        if '<' != current_path_element[0] and '>' != current_path_element[-1]:
+            return (False, )
+
+        if ':' not in current_path_element:
+            raise ValueError(
+                f'The parameter you are setting in the path {current_path_element} are incorrect formated')
+
+        type_of_var, var_name = current_path_element[1:-1].split(':')
+
+        if type_of_var.lower() not in methods_allowed:
+            raise TypeError(
+                f'The type you are passing in the path {current_path_element} are not in the list of allowed var types {methods_allowed}')
+
+        return (True, type_of_var, var_name)
+
+    def parse_varible(self, variable: str, type_var: str):
+        if type_var.lower() == 'str':
+            return str(variable)
+
+        if type_var.lower() == 'int':
+            return int(variable)
+
+        if type_var.lower() == 'float':
+            return float(variable)

pypulse/View/setview.py

@@ -17,6 +17,33 @@ def _validate_new_view_consistance(self, name, path_trigger):
             raise KeyError(
                 f'The view with the path_trigger {path_trigger} already exists')
 
+        for i in View.instances:
+            current_path_instance_new = []
+            current_paths_in_views_new = []
+
+            current_path_instance = path_trigger.split('/')
+            current_paths_in_views = i.path_trigger.split('/')
+
+            # removing the variables and see if match
+
+            for j in current_path_instance:
+                if len(j) == 0:
+                    current_path_instance_new.append(j)
+                    continue
+                if j[0] != '<' and j[-1] != '>':
+                    current_path_instance_new.append(j)
+
+            for j in current_paths_in_views:
+                if len(j) == 0:
+                    current_paths_in_views_new.append(j)
+                    continue
+                if j[0] != '<' and j[-1] != '>':
+                    current_paths_in_views_new.append(j)
+
+            if current_path_instance_new == current_paths_in_views_new:
+                raise KeyError(
+                    f'The view with the path_trigger {path_trigger} already exists, coincidende path: {i.path_trigger}')
+
 
 def view(name: str, path_trigger: str):
     def decorator(func):

setup.py

@@ -9,7 +9,7 @@
 setup(
     name='python-pulse',
     packages=find_packages(),
-    version='0.1.4',
+    version='0.1.5',
     description='Python, create desktop applications based on Chromium',
     long_description=long_description,
     long_description_content_type="text/markdown",