Remove comments and fix lints

Author: schloerke

shiny/_app.py

@@ -387,11 +387,7 @@ async def _on_root_request_cb(self, request: Request) -> Response:
             if callable(self.ui):
                 ui = self._render_page(self.ui(request), self.lib_prefix)
             else:
-                # TODO: Barret - Q: Why is this here as there's a with restore_context above?
-                # TODO: Barret - Q: Why not `if restore_ctx.active:`?
-                cur_restore_ctx = get_current_restore_context()
-                print("cur_restore_ctx", cur_restore_ctx)
-                if cur_restore_ctx is not None and cur_restore_ctx.active:
+                if restore_ctx.active:
                     # TODO: Barret - Docs: See ?enableBookmarking
                     warnings.warn(
                         "Trying to restore saved app state, but UI code must be a function for this to work!",

shiny/bookmark/__init__.py

@@ -6,7 +6,7 @@
     ShinySaveState,
 )
 from ._button import input_bookmark_button
-from ._external import set_load_dir, set_save_dir
+from ._external import set_restore_dir, set_save_dir
 from ._restore_state import RestoreContext, RestoreContextState, restore_input
 
 __all__ = (
@@ -20,7 +20,7 @@
     "input_bookmark_button",
     # _external
     "set_save_dir",
-    "set_load_dir",
+    "set_restore_dir",
     # _restore_state
     "RestoreContext",
     "RestoreContextState",

shiny/bookmark/_bookmark.py

@@ -589,7 +589,7 @@ async def _scoped_on_bookmark(self, root_state: ShinySaveState) -> None:
         )
 
         # Make subdir for scope
-        # TODO-barret; Is this for uploaded files?!?
+        # TODO: Barret; Is this for uploaded files?!?
         if root_state.dir is not None:
             scope_subpath = self._ns
             scoped_state.dir = Path(root_state.dir) / scope_subpath

shiny/bookmark/_restore_state.py

@@ -59,7 +59,7 @@ def _state_within_namespace(self, prefix: str) -> "RestoreContextState":
             if self._name_has_namespace(name, prefix)
         }
 
-        # TODO-barret; Is this for bookmarking?!?
+        # TODO: Barret; Is this for bookmarking?!?
         dir = self.dir
         if dir is not None:
             dir = dir / prefix

shiny/bookmark/_types.py

@@ -3,85 +3,10 @@
 from pathlib import Path
 from typing import Awaitable, Callable, Literal
 
-# TODO: Barret: Q: Can we merge how bookmark dirs are saved / loaded?... it's the same directory! However, the save will return a possibly new path. Restoring will return an existing path.
+# Q: Can we merge how bookmark dirs are saved / loaded?... it's the same directory! However, the save will return a possibly new path. Restoring will return an existing path.
 # A: No. Keep them separate. The save function may need to create a new directory, while the load function will always return an existing directory.
-
-# TODO: Barret Rename load -> restore. Keep the names consistent!
 GetBookmarkSaveDir = Callable[[str], Awaitable[Path]]
 GetBookmarkRestoreDir = Callable[[str], Awaitable[Path]]
 
 
 BookmarkStore = Literal["url", "server", "disable"]
-
-
-# TODO: Barret; Q: I feel like there could be a `@shiny.globals.on_session_start` decorator that would allow us to set these values.
-
-
-# @shiny.session.on_session_start
-# def _(session): ...
-
-
-# @shiny.session.on_session_started
-# def _(session): ...
-
-
-# shiny.bookmark.globals.bookmark_save_dir = connect_custom_method
-# shiny.bookmark.globals.bookmark_load_dir = connect_custom_method
-
-
-# shiny.bookmark.set_bookmark_save_dir(connect_custom_method)
-# shiny.bookmark.set_bookmark_load_dir(connect_custom_method)
-
-# ------------
-
-# import shiny
-
-# # Garrick like's this one... fix the name!
-# @shiny.bookmark.bookmark_save_dir
-# def connect_custom_method(id: str) -> Path:
-#     return Path("connect") / id
-
-
-# shiny.run_app("some file")
-
-# Using a decorator
-
-
-# from shiny.bookmark import _globals as bookmark_globals
-# bookmark_globals.bookmark_store = "url"
-
-# bookmark.globals.bookmark_store = "url"
-
-# import shiny
-
-# TODO: Barret - Implement
-
-# # Make placeholders start with underscore
-# shiny.bookmark.globals.bookmark_save_dir = connect_save_shiny_bookmark
-# shiny.bookmark.globals.bookmark_load_dir = connect_restore_shiny_bookmark
-
-# # Implement this for now
-# # Hold off on
-
-# # Global level
-# @shiny.bookmark.set_save_dir
-# def connect_save_shiny_bookmark(): ...
-
-# Don't implement this
-# # App level
-# @app.bookmark.set_save_dir
-# def save_shiny_bookmark(): ...
-
-
-# @app.bookmark.set_save_dir
-# def save_shiny_bookmark(): ...
-
-
-# @shiny.bookmark.set_restore_dir
-# def connect_save_shiny_bookmark(): ...
-
-
-# VV Don't use the next line style. It must be in the App() object!
-# shiny.bookmark.globals.bookmark_store = "url"
-
-# shiny.run_app("foo")