restiny 0.5.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

restiny/ui/app.py

@@ -1,34 +1,42 @@
 import asyncio
+from collections.abc import Iterable
 from http import HTTPStatus
 
 import httpx
 import pyperclip
 from textual import on
-from textual.app import App, ComposeResult
+from textual.app import App, ComposeResult, SystemCommand
 from textual.binding import Binding
 from textual.containers import Horizontal, Vertical
 from textual.events import DescendantFocus
+from textual.screen import Screen
 from textual.widget import Widget
 from textual.widgets import Footer, Header
 
 from restiny.__about__ import __version__
 from restiny.assets import STYLE_TCSS
 from restiny.consts import CUSTOM_THEMES
-from restiny.data.repos import FoldersSQLRepo, RequestsSQLRepo, SettingsSQLRepo
+from restiny.data.repos import (
+    EnvironmentsSQLRepo,
+    FoldersSQLRepo,
+    RequestsSQLRepo,
+    SettingsSQLRepo,
+)
 from restiny.entities import Request, Settings
 from restiny.enums import (
     AuthMode,
     BodyMode,
     BodyRawLanguage,
     ContentType,
-    CustomThemes,
 )
 from restiny.ui import (
     CollectionsArea,
     RequestArea,
     ResponseArea,
+    TopBarArea,
     URLArea,
 )
+from restiny.ui.environments_screen import EnvironmentsScreen
 from restiny.ui.response_area import ResponseAreaData
 from restiny.ui.settings_screen import SettingsScreen
 from restiny.widgets.custom_text_area import CustomTextArea
@@ -37,18 +45,11 @@ from restiny.widgets.custom_text_area import CustomTextArea
 class RESTinyApp(App, inherit_bindings=False):
     TITLE = f'RESTiny v{__version__}'
     SUB_TITLE = 'Minimal HTTP client, no bullshit'
-    ENABLE_COMMAND_PALETTE = False
     CSS_PATH = STYLE_TCSS
     BINDINGS = [
         Binding(
             key='escape', action='quit', description='Quit the app', show=True
         ),
-        Binding(
-            key='ctrl+b',
-            action='toggle_collections',
-            description='Toggle collections',
-            show=True,
-        ),
         Binding(
             key='ctrl+n',
             action='prompt_add',
@@ -70,13 +71,13 @@ class RESTinyApp(App, inherit_bindings=False):
         Binding(
             key='ctrl+s',
             action='save',
-            description='Save request',
+            description='Save req',
             show=True,
         ),
         Binding(
-            key='f9',
-            action='copy_as_curl',
-            description='Copy as curl',
+            key='ctrl+b',
+            action='toggle_collections',
+            description='Toggle collections',
             show=True,
         ),
         Binding(
@@ -85,20 +86,14 @@ class RESTinyApp(App, inherit_bindings=False):
             description='Maximize/Minimize area',
             show=True,
         ),
-        Binding(
-            key='f12',
-            action='open_settings',
-            description='Settings',
-            show=True,
-        ),
     ]
-    # theme = 'textual-dark'
 
     def __init__(
         self,
         folders_repo: FoldersSQLRepo,
         requests_repo: RequestsSQLRepo,
         settings_repo: SettingsSQLRepo,
+        environments_repo: EnvironmentsSQLRepo,
         *args,
         **kwargs,
     ) -> None:
@@ -106,18 +101,21 @@ class RESTinyApp(App, inherit_bindings=False):
         self.folders_repo = folders_repo
         self.requests_repo = requests_repo
         self.settings_repo = settings_repo
+        self.environments_repo = environments_repo
 
         self.active_request_task: asyncio.Task | None = None
-        self.selected_request: Request | None = None
         self.last_focused_widget: Widget | None = None
         self.last_focused_maximizable_area: Widget | None = None
 
+        self._selected_request: Request | None = None
+
     def compose(self) -> ComposeResult:
         yield Header(show_clock=True)
         with Horizontal():
             yield CollectionsArea(classes='w-1fr')
             with Vertical(classes='w-6fr'):
-                with Horizontal(classes='h-auto'):
+                with Vertical(classes='h-auto'):
+                    yield TopBarArea()
                     yield URLArea()
                 with Horizontal(classes='h-1fr'):
                     yield RequestArea()
@@ -126,16 +124,35 @@ class RESTinyApp(App, inherit_bindings=False):
 
     def on_mount(self) -> None:
         self.collections_area = self.query_one(CollectionsArea)
+        self.top_bar_area = self.query_one(TopBarArea)
         self.url_area = self.query_one(URLArea)
         self.request_area = self.query_one(RequestArea)
         self.response_area = self.query_one(ResponseArea)
 
-        self.url_area.disabled = True
-        self.request_area.disabled = True
+        self.selected_request = None
 
         self._register_themes()
         self._apply_settings()
 
+    def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
+        yield SystemCommand('Copy as cURL', None, self.action_copy_as_curl)
+        yield SystemCommand(
+            'Show/Hide keys and help panel',
+            None,
+            self.action_toggle_help_panel,
+        )
+        yield SystemCommand(
+            'Save screenshot',
+            None,
+            lambda: self.set_timer(0.1, self.deliver_screenshot),
+        )
+        yield SystemCommand(
+            'Manage environments', None, self.action_manage_envs
+        )
+        yield SystemCommand(
+            'Manage settings', None, self.action_manage_settings
+        )
+
     def action_toggle_collections(self) -> None:
         if self.collections_area.display:
             self.collections_area.display = False
@@ -146,12 +163,24 @@ class RESTinyApp(App, inherit_bindings=False):
         self.collections_area.prompt_add()
 
     def action_prompt_update(self) -> None:
+        if not self.selected_request:
+            self.notify('No request selected', severity='warning')
+            return
+
         self.collections_area.prompt_update()
 
     def action_prompt_delete(self) -> None:
+        if not self.selected_request:
+            self.notify('No request selected', severity='warning')
+            return
+
         self.collections_area.prompt_delete()
 
     def action_save(self) -> None:
+        if not self.selected_request:
+            self.notify('No request selected', severity='warning')
+            return
+
         req = self.get_request()
         self.requests_repo.update(request=req)
         self.collections_area._populate_children(
@@ -169,22 +198,28 @@ class RESTinyApp(App, inherit_bindings=False):
         else:
             self.screen.maximize(self.last_focused_maximizable_area)
 
+    def action_toggle_help_panel(self) -> None:
+        if self.query('HelpPanel'):
+            self.action_hide_help_panel()
+        else:
+            self.action_show_help_panel()
+
     def action_copy_as_curl(self) -> None:
         if not self.selected_request:
             self.notify(
-                'Select a request before copying as CURL.',
+                'No request selected',
                 severity='warning',
             )
             return
 
-        request = self.get_request()
+        request = self.get_resolved_request()
         self.copy_to_clipboard(request.to_curl())
         self.notify(
-            'Command CURL copied to clipboard',
+            'CURL command copied to clipboard',
             severity='information',
         )
 
-    def action_open_settings(self) -> None:
+    def action_manage_settings(self) -> None:
         def on_settings_result(result: dict | None) -> None:
             if not result:
                 return
@@ -192,15 +227,19 @@ class RESTinyApp(App, inherit_bindings=False):
             self.settings_repo.set(Settings(theme=result['theme']))
             self._apply_settings()
 
-        settings: Settings = self.settings_repo.get().data
         self.push_screen(
-            screen=SettingsScreen(
-                themes=[theme.value for theme in CustomThemes],
-                theme=settings.theme,
-            ),
+            screen=SettingsScreen(),
             callback=on_settings_result,
         )
 
+    def action_manage_envs(self) -> None:
+        def on_manage_environments_result(result) -> None:
+            self.top_bar_area.populate()
+
+        self.push_screen(
+            screen=EnvironmentsScreen(), callback=on_manage_environments_result
+        )
+
     def copy_to_clipboard(self, text: str) -> None:
         super().copy_to_clipboard(text)
         try:
@@ -231,14 +270,26 @@ class RESTinyApp(App, inherit_bindings=False):
     def _on_request_selected(
         self, message: CollectionsArea.RequestSelected
     ) -> None:
-        self.url_area.disabled = False
-        self.request_area.disabled = False
         req = self.requests_repo.get_by_id(id=message.request_id).data
         self.selected_request = req
         self.set_request(request=req)
-        self.response_area.set_data(None)
+
+        self.response_area.clear()
         self.response_area.is_showing_response = False
 
+    @on(CollectionsArea.RequestUpdated)
+    def _on_request_updated(self, message) -> None:
+        req = self.requests_repo.get_by_id(id=message.request_id).data
+        self.selected_request = req
+
+    @on(CollectionsArea.RequestDeleted)
+    def _on_request_deleted(self, message) -> None:
+        self.selected_request = None
+
+    @on(CollectionsArea.FolderSelected)
+    def _on_folder_selected(self, message) -> None:
+        self.selected_request = None
+
     def _apply_settings(self) -> None:
         settings = self.settings_repo.get().data
         self.theme = settings.theme
@@ -266,6 +317,27 @@ class RESTinyApp(App, inherit_bindings=False):
                 return widget
             widget = widget.parent
 
+    @property
+    def selected_request(self) -> Request | None:
+        return self._selected_request
+
+    @selected_request.setter
+    def selected_request(self, request: Request | None) -> None:
+        if request is None:
+            self.url_area.clear()
+            self.request_area.clear()
+            self.response_area.clear()
+            self.url_area.disabled = True
+            self.request_area.disabled = True
+            self.response_area.disabled = True
+            self.response_area.is_showing_response = False
+        else:
+            self.url_area.disabled = False
+            self.request_area.disabled = False
+            self.response_area.disabled = False
+
+        self._selected_request = request
+
     def get_request(self) -> Request:
         method = self.url_area.method
         url = self.url_area.url
@@ -369,6 +441,20 @@ class RESTinyApp(App, inherit_bindings=False):
             options=options,
         )
 
+    def get_resolved_request(self) -> Request:
+        global_environment = self.environments_repo.get_by_name(
+            name='global'
+        ).data
+        request = self.get_request().resolve_variables(
+            global_environment.variables
+        )
+        if self.top_bar_area.environment:
+            environment = self.environments_repo.get_by_name(
+                name=self.top_bar_area.environment
+            ).data
+            request = request.resolve_variables(environment.variables)
+        return request
+
     def set_request(self, request: Request) -> None:
         self.url_area.method = request.method
         self.url_area.url = request.url
@@ -437,11 +523,11 @@ class RESTinyApp(App, inherit_bindings=False):
         self.request_area.option_timeout = str(request.options.timeout)
 
     async def _send_request(self) -> None:
-        self.response_area.set_data(data=None)
+        self.response_area.clear()
         self.response_area.loading = True
         self.url_area.request_pending = True
         try:
-            request = self.get_request()
+            request = self.get_resolved_request()
             async with httpx.AsyncClient(
                 timeout=request.options.timeout,
                 follow_redirects=request.options.follow_redirects,
@@ -460,10 +546,10 @@ class RESTinyApp(App, inherit_bindings=False):
                 self.notify(f'{error_name}: {error_message}', severity='error')
             else:
                 self.notify(f'{error_name}', severity='error')
-            self.response_area.set_data(data=None)
+            self.response_area.clear()
             self.response_area.is_showing_response = False
         except asyncio.CancelledError:
-            self.response_area.set_data(data=None)
+            self.response_area.clear()
             self.response_area.is_showing_response = False
         finally:
             self.response_area.loading = False

restiny/ui/collections_area.py

@@ -16,6 +16,7 @@ from textual.widgets import (
     Select,
     Static,
 )
+from textual.widgets.tree import TreeNode
 
 from restiny.entities import Folder, Request
 from restiny.enums import HTTPMethod
@@ -170,8 +171,7 @@ class _BaseEditScreen(ModalScreen):
 
 
 class _AddScreen(_BaseEditScreen):
-    if TYPE_CHECKING:
-        app: RESTinyApp
+    app: 'RESTinyApp'
 
     @on(Button.Pressed, '#confirm')
     def _on_confirm(self, message: Button.Pressed) -> None:
@@ -220,8 +220,7 @@ class _AddScreen(_BaseEditScreen):
 
 
 class _UpdateScreen(_BaseEditScreen):
-    if TYPE_CHECKING:
-        app: RESTinyApp
+    app: 'RESTinyApp'
 
     def __init__(self, id: int, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
@@ -284,8 +283,7 @@ class _UpdateScreen(_BaseEditScreen):
 
 
 class CollectionsArea(Widget):
-    if TYPE_CHECKING:
-        app: RESTinyApp
+    app: 'RESTinyApp'
 
     ALLOW_MAXIMIZE = True
     focusable = True
@@ -478,6 +476,15 @@ class CollectionsArea(Widget):
         if not result.confirmed:
             return
 
+        try:
+            prev_selected_index_in_parent = (
+                self.collections_tree.cursor_node.parent.children.index(
+                    self.collections_tree.cursor_node
+                )
+            )
+        except ValueError:
+            prev_selected_index_in_parent = 0
+
         if self.collections_tree.cursor_node.allow_expand:
             self.app.folders_repo.delete_by_id(
                 self.collections_tree.cursor_node.data['id']
@@ -507,11 +514,24 @@ class CollectionsArea(Widget):
                 )
             )
 
-    def _populate_children(self, node) -> None:
-        folder_id = node.data['id']
+        if self.collections_tree.cursor_node.parent.children:
+            next_index_to_select = min(
+                prev_selected_index_in_parent,
+                len(self.collections_tree.cursor_node.parent.children) - 1,
+            )
+            next_node_to_select = (
+                self.collections_tree.cursor_node.parent.children[
+                    next_index_to_select
+                ]
+            )
+        else:
+            next_node_to_select = self.collections_tree.cursor_node.parent
+        self.call_after_refresh(
+            lambda: self.collections_tree.select_node(next_node_to_select)
+        )
 
-        for child in list(node.children):
-            child.remove()
+    def _populate_children(self, node: TreeNode) -> None:
+        folder_id = node.data['id']
 
         folders = self.app.folders_repo.list_by_parent_id(folder_id).data
         requests = self.app.requests_repo.list_by_folder_id(folder_id).data
@@ -528,6 +548,9 @@ class CollectionsArea(Widget):
         )
         sorted_requests = sorted(requests, key=sort_requests)
 
+        for child_node in list(node.children):
+            self.collections_tree.remove(child_node)
+
         for folder in sorted_folders:
             self.collections_tree.add_folder(
                 parent_node=node, name=folder.name, id=folder.id
@@ -541,6 +564,8 @@ class CollectionsArea(Widget):
                 id=request.id,
             )
 
+        node.refresh()
+
     def _resolve_all_folder_paths(self) -> list[dict[str, str | int | None]]:
         paths: list[dict[str, str | int | None]] = [{'path': '/', 'id': None}]