0.1.4: *Features: Redirect in views*, *Bugs: Solving post no body error and multiple one line imports bug*

zabbix-byte · zabbix-byte · commit cecf12b62699 · 2023-09-16T15:44:25.000+02:00
diff --git a/pypulse/Aplication/reader.py b/pypulse/Aplication/reader.py
@@ -5,19 +5,18 @@
 from pypulse import View
 
 
-def collect_imports(node):
-    if isinstance(node, ast.Import):
-        for alias in node.names:
-            import_name = alias.name
-            as_name = alias.asname
-            return (import_name, as_name)
-        
-    elif isinstance(node, ast.ImportFrom):
-        module_name = node.module
-        for alias in node.names:
-            import_name = alias.name
-            as_name = alias.asname
-            return (f"{module_name}.{import_name}", as_name)
+def get_imports(node):
+    imports = []
+    for item in node.body:
+        if isinstance(item, ast.Import):
+            for alias in item.names:
+                imports.append((alias.name, alias.asname))
+
+        elif isinstance(item, ast.ImportFrom):
+            module = item.module
+            for alias in item.names:
+                imports.append((f"{module}.{alias.name}", alias.asname))
+    return imports
 
 
 class ReadViews:
@@ -44,14 +43,9 @@ def find_views_ho_are_using_the_decoratos(aplication_dir: str):
 
             target_decorator = "@view"
 
-            all_imports = []
+            all_imports = get_imports(parsed_ast)
 
             for node in ast.walk(parsed_ast):
-                if isinstance(node, (ast.Import, ast.ImportFrom)):
-                    lib = collect_imports(node)
-                    if lib != None:
-                        all_imports.append(lib)
-
                 if isinstance(node, ast.FunctionDef):
 
                     for decorator in node.decorator_list:
diff --git a/pypulse/Socket/request_handler.py b/pypulse/Socket/request_handler.py
@@ -26,6 +26,10 @@ def do_GET(self):
 
             render = execute_ast_view_request(
                 node_body=current_view.view, request=request, requirement_view=current_view.requirement_view)
+
+            if type(render).__name__ == 'Redirect':
+                render = render.get_render(request)
+
             template = str.join(" ", render.render_template().splitlines())
             self.send_response(200)
             self.send_header('Content-type', 'text/html')
@@ -61,6 +65,88 @@ def do_POST(self):
 
             render = execute_ast_view_request(
                 node_body=current_view.view, request=request, requirement_view=current_view.requirement_view)
+
+            if type(render).__name__ == 'Redirect':
+                render = render.get_render(request)
+
+            template = str.join(" ", render.render_template().splitlines())
+            self.send_response(200)
+            self.send_header('Content-type', 'text/html')
+            self.end_headers()
+            self.wfile.write(template.encode())
+        else:
+            super().do_GET()
+
+    def do_PUT(self):
+        content_length = int(self.headers['Content-Length'])
+        post_body = self.rfile.read(content_length)
+        temp_post_body = {}
+        for i in post_body.decode('utf-8').split('&'):
+            element = i.split('=')
+            if len(element) == 2:
+                temp_post_body[element[0]] = element[1]
+
+        current_view = View.CallView(self.path)
+
+        if current_view.name is not None:
+            request = {
+                'method': 'PUT',
+                'headers': {
+                    'Host': self.headers.get('Host'),
+                    'Upgrade-Insecure-Requests': self.headers.get('Upgrade-Insecure-Requests'),
+                    'User-Agent': self.headers.get('User-Agent'),
+                    'Accept': self.headers.get('Accept'),
+                    'Accept-Encoding': self.headers.get('Accept-Encoding'),
+                    'Accept-Language': self.headers.get('Accept-Language')
+                },
+                'body': temp_post_body
+            }
+
+            render = execute_ast_view_request(
+                node_body=current_view.view, request=request, requirement_view=current_view.requirement_view)
+
+            if type(render).__name__ == 'Redirect':
+                render = render.get_render(request)
+
+            template = str.join(" ", render.render_template().splitlines())
+            self.send_response(200)
+            self.send_header('Content-type', 'text/html')
+            self.end_headers()
+            self.wfile.write(template.encode())
+        else:
+            super().do_GET()
+
+    def do_PATCH(self):
+        content_length = int(self.headers['Content-Length'])
+        post_body = self.rfile.read(content_length)
+        temp_post_body = {}
+        for i in post_body.decode('utf-8').split('&'):
+            element = i.split('=')
+            if len(element) == 2:
+                temp_post_body[element[0]] = element[1]
+
+        current_view = View.CallView(self.path)
+
+        if current_view.name is not None:
+            request = {
+                'method': 'PATCH',
+                'headers': {
+                    'Host': self.headers.get('Host'),
+                    'Upgrade-Insecure-Requests': self.headers.get('Upgrade-Insecure-Requests'),
+                    'User-Agent': self.headers.get('User-Agent'),
+                    'Accept': self.headers.get('Accept'),
+                    'Accept-Encoding': self.headers.get('Accept-Encoding'),
+                    'Accept-Language': self.headers.get('Accept-Language')
+                },
+                'body': temp_post_body
+            }
+
+            render = execute_ast_view_request(
+                node_body=current_view.view, request=request, requirement_view=current_view.requirement_view)
+
+            if type(render).__name__ == 'Redirect':
+                render = render.get_render(request)
+
             template = str.join(" ", render.render_template().splitlines())
             self.send_response(200)
             self.send_header('Content-type', 'text/html')
diff --git a/pypulse/Template/__init__.py b/pypulse/Template/__init__.py
@@ -1,2 +1,3 @@
 from .render_template import RenderTemplate
 from .template import Template
+from .redirect_path import Redirect
diff --git a/pypulse/Template/redirect_path.py b/pypulse/Template/redirect_path.py
@@ -0,0 +1,16 @@
+from pypulse.View import CallView
+from pypulse.Utils import execute_ast_view_request
+
+
+class Redirect():
+    def __init__(self, path: str) -> None:
+        self.view = CallView(path)
+
+    def get_render(self, request):
+        render = execute_ast_view_request(
+            node_body=self.view.view, request=request, requirement_view=self.view.requirement_view)
+
+        if type(render).__name__ == 'Redirect':
+            raise RecursionError('You cant do a recursive redirect!')
+
+        return render
diff --git a/pypulse/__init__.py b/pypulse/__init__.py
@@ -1,5 +1,5 @@
 import importlib.metadata
 
 __all__ = ["window"]
-__version__ = importlib.metadata.version('pypulse')
+__version__ = importlib.metadata.version('python-pulse')
 __author__ = "The pypulse Authors"
diff --git a/pypulse/manage.py b/pypulse/manage.py
@@ -19,7 +19,7 @@
 
 
 def main():
-    print(f'v{importlib.metadata.version("pypulse")}')
+    print(f'v{importlib.metadata.version("python-pulse")}')
     print(MANAGE_lOGO)
 
     parser = argparse.ArgumentParser(
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 setup(
     name='python-pulse',
     packages=find_packages(),
-    version='0.1.3',
+    version='0.1.4',
     description='Python, create desktop applications based on Chromium',
     long_description=long_description,
     long_description_content_type="text/markdown",

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`from .render_template import RenderTemplate`
`2`	`2`	`from .template import Template`
	`3`	`+from .redirect_path import Redirect`