Added comments, minor changes

Author: elnelson575

shiny/ui/_include_helpers.py

@@ -226,50 +226,45 @@ def maybe_copy_files(path: Path | str, include_files: bool) -> tuple[str, str]:
     # Since the hash/tmpdir should represent all the files in the path's directory,
     # we can check if it exists to determine if we have a cache hit
     if os.path.exists(path_dest):
-        print("Already exists", path_dest)
+        print("Path already exists:", path_dest)
         return path_dest, hash
 
-    permissions = (
-        0o755  # Store permissions var set to -rwxr-xr-x (owner rwx, others rx)
-    )
-
     # Otherwise, make sure we have a clean slate
     if os.path.exists(tmpdir):
-        print("folder exists, not contents:", os.stat(tmpdir))
+        print("Folder already exists, but not files, removing.")
         shutil.rmtree(tmpdir)
 
-    # Looks like this is copying twice? puts stuff in diff folders?
+    # This recursively changes permissions to 755 (owner rwx, other rx) for all files
+    # under `tmp/unique_hash` so that the app can be run by other collaborators
+    # on a multi-tenant system. See #2061
     if include_files:
         shutil.copytree(os.path.dirname(path), tmpdir)
-        print("new folder, perms: ", oct(os.stat(tmpdir).st_mode))
-        for root, dirs, files in os.walk(tmpdir):
-            # set perms on sub-directories
-            for dir in dirs:
-                os.chmod(os.path.join(root, dir), permissions)
-                print("Dir: ", dir)
-                print("dir perms: ", oct(os.stat(os.path.join(root, dir)).st_mode))
-
+        for dirpath, dirs, filenames in os.walk(tmpdir):
             # set perms on files
-            for file in files:
-                print("File: ", file)
-                os.chmod(os.path.join(root, file), permissions)
-                print("file perms: ", oct(os.stat(os.path.join(root, file)).st_mode))
-
+            for file in filenames:
+                os.chmod(os.path.join(dirpath, file), 0o755)
+                print(
+                    "File: ",
+                    file,
+                    "File perms: ",
+                    oct(os.stat(os.path.join(dirpath, file)).st_mode),
+                )
+    else:
+        os.mkdir(tmpdir, mode=0o755)
         shutil.copy(path, path_dest)
-    print("PATH_DEST: ", path_dest)
+        os.chmod(path_dest, 0o755)
+        print("File: ", path_dest, "perms", oct(os.stat(path_dest).st_mode))
+
     return path_dest, hash
 
 
 def get_hash(path: Path | str, include_files: bool) -> str:
     if include_files:
-        print("get_hash, include_files is true")
         dir = os.path.dirname(path)
         files = glob.iglob(os.path.join(dir, "**"), recursive=True)
         key = "\n".join([get_file_key(x) for x in files])
-        print("KEY: ", key)
     else:
         key = get_file_key(path)
-        print("not include key: ", key)
 
     return hash_deterministic(key)
 

tests/playwright/shiny/bugs/2061-css-js-inclusion/app.py renamed to tests/playwright/shiny/bugs/2061-css-js-inclusion/include_files_case/app.py

@@ -0,0 +1,19 @@
+@import url("./evenmorecss/more.css");
+
+body {
+  font-family: Arial, sans-serif;
+}
+
+h1 {
+  color: black;
+  border-bottom: 2px solid #4682b4;
+  padding-bottom: 10px;
+}
+
+.content {
+  margin: 20px;
+  padding: 15px;
+  background-color: white;
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}

tests/playwright/shiny/bugs/2061-css-js-inclusion/css/more.css renamed to tests/playwright/shiny/bugs/2061-css-js-inclusion/include_files_case/css/evenmorecss/more.css

@@ -0,0 +1,27 @@
+from pathlib import Path
+
+from shiny import App, Inputs, Outputs, Session, ui
+
+js_file = Path(__file__).parent / "customjs.js"
+css_file = Path(__file__).parent / "style.css"
+
+# Define the UI
+app_ui = ui.page_fluid(
+    ui.include_css(css_file, method="link"),
+    ui.include_js(js_file, method="inline"),
+    ui.h1("Simple Shiny App with External CSS"),
+    ui.div(
+        ui.p("This is a simple Shiny app that demonstrates ui.include_css()"),
+        ui.p("The styling comes from an external CSS file!"),
+        class_="content",
+    ),
+)
+
+
+# Define the server
+def server(input: Inputs, output: Outputs, session: Session):
+    pass
+
+
+# Create and run the app
+app = App(app_ui, server)

tests/playwright/shiny/bugs/2061-css-js-inclusion/include_files_case/css/style.css

@@ -0,0 +1,4 @@
+const newParagraph = document.createElement('p');
+newParagraph.textContent = 'Heyo!';
+const bodyElement = document.body;
+bodyElement.appendChild(newParagraph);

tests/playwright/shiny/bugs/2061-css-js-inclusion/js/customjs.js renamed to tests/playwright/shiny/bugs/2061-css-js-inclusion/include_files_case/js/customjs.js

@@ -1,6 +1,5 @@
-@import url("more.css");
-
 body {
+  background-color: #70bfef;
   font-family: Arial, sans-serif;
 }
 

tests/playwright/shiny/bugs/2061-css-js-inclusion/test_css-js-inclusion.py renamed to tests/playwright/shiny/bugs/2061-css-js-inclusion/include_files_case/test_css-js-inclusion.py

@@ -0,0 +1,9 @@
+from playwright.sync_api import Page, expect
+
+from shiny.run import ShinyAppProc
+
+
+def test_inclusion(page: Page, local_app: ShinyAppProc) -> None:
+    page.goto(local_app.url)
+
+    expect(page.locator("body > p")).to_have_text("Heyo!")