quarto: adjust manifest construction

* multi-file project according to files.input
* automatic ignores according to files.input
* documentation for '**'

fixes #552
fixes #553
fixes #551

Author: aronatkins

CHANGELOG.md

@@ -7,11 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Pending Next Release
 
 ### Changed
+
 - When deploying Shiny for Python applications on servers using a version of
   Connect prior to 2024.01.0, there is an incompatibility with
   `starlette>=0.35.0`. When deploying to these servers, the starlette version
   is now automatically set to `starlette<0.35.0`.
 
+### Fixed
+
+- Quarto content is marked as a "site" only when there are multiple input
+  files. (#552)
+
+- Quarto content automatically ignores `name.html` and `name_files` when
+  `name.md`, `name.ipynb`, `name.Rmd`, or `name.qmd` is an input. (#553)
+
 ## [1.22.0] - 2024-01-23
 
 ### Added

README.md

@@ -319,6 +319,15 @@ The following shows an example of an extra file taking precedence:
 rsconnect deploy dash --exclude “*.csv” dash-app/ important_data.csv
 ```
 
+The "`**`" glob pattern will recursively match all files and directories,
+while "`*`" only matches files. The "`**`" pattern is useful with complicated
+project hierarchies where enumerating the _included_ files is simpler than
+listing the _exclusions_.
+
+```bash
+rsconnect deploy quarto . _quarto.yml index.qmd requirements.txt --exclude "**" 
+```
+
 Some directories are excluded by default, to prevent bundling and uploading files that are not needed or might interfere with the deployment process:
 
 ```

rsconnect/bundle.py

@@ -94,12 +94,10 @@ def __init__(
                 "version": quarto_inspection.get("quarto", {}).get("version", "99.9.9"),
                 "engines": quarto_inspection.get("engines", []),
             }
-            project_config = quarto_inspection.get("config", {}).get("project", {})
-            render_targets = project_config.get("render", [])
-            if len(render_targets):
-                self.data["metadata"]["primary_rmd"] = render_targets[0]
-            project_type = project_config.get("type", None)
-            if project_type or len(render_targets) > 1:
+
+            files_data = quarto_inspection.get("files", {})
+            files_input_data = files_data.get("input", [])
+            if len(files_input_data) > 1:
                 self.data["metadata"]["content_category"] = "site"
 
         if environment:
@@ -325,12 +323,10 @@ def make_source_manifest(
             "version": quarto_inspection.get("quarto", {}).get("version", "99.9.9"),
             "engines": quarto_inspection.get("engines", []),
         }
-        project_config = quarto_inspection.get("config", {}).get("project", {})
-        render_targets = project_config.get("render", [])
-        if len(render_targets):
-            manifest["metadata"]["primary_rmd"] = render_targets[0]
-        project_type = project_config.get("type", None)
-        if project_type or len(render_targets) > 1:
+
+        files_data = quarto_inspection.get("files", {})
+        files_input_data = files_data.get("input", [])
+        if len(files_input_data) > 1:
             manifest["metadata"]["content_category"] = "site"
 
     if environment:
@@ -1303,13 +1299,19 @@ def make_quarto_manifest(
         output_dir = project_config.get("output-dir", None)
         if output_dir:
             excludes = excludes + [output_dir]
-        else:
-            render_targets = project_config.get("render", [])
-            for target in render_targets:
-                t, _ = splitext(target)
-                # TODO: Single-file inspect would give inspect.formats.html.pandoc.output-file
-                # For foo.qmd, we would get an output-file=foo.html, but foo_files is not available.
-                excludes = excludes + [t + ".html", t + "_files"]
+
+        files_data = quarto_inspection.get("files", {})
+        files_input_data = files_data.get("input", [])
+        # files.input is a list of absolute paths to input (rendered)
+        # files. Automatically ignore the most common derived files for
+        # those inputs.
+        #
+        # These files are ignored even when the project has an output
+        # directory, as Quarto may create these files while a render is
+        # in-flight.
+        for each in files_input_data:
+            t, _ = splitext(os.path.relpath(each, file_or_directory))
+            excludes = excludes + [t + ".html", t + "_files/**"]
 
         # relevant files don't need to include requirements.txt file because it is
         # always added to the manifest (as a buffer) from the environment contents