Create export dialog

Cargo.toml

@@ -13,6 +13,7 @@ opt-level = "s" # Optimize for binary size
 strip = true # Remove debug symbols
 
 [dependencies]
+argmap = "1.1.2"
 clap = { version = "4.5.20", features=["derive"] }
 dunce = "1.0.5"
 enum_dispatch = "0.3.13"

example/basic/manifest.yaml

@@ -49,14 +49,18 @@ departments:
       blender:
         exports:
         - .mesh.blend
+        - .shadergraph.blend
+        - .animbake.abc
 
 assets:
   3d:
     prop:
     - $template:
         departments:
           model:
-          - mesh
+          - !shot_local mesh
+          - lod
+          - test
           lookdev:
           - shadergraph
     - defaultCubeA:

flake.nix

@@ -0,0 +1,48 @@
+{
+  description = "my project description";
+
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, blender-bin, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system: let
+        pkgs = import nixpkgs {
+          system = system;
+        };
+
+        libraries = with pkgs; [
+          rustc
+          cargo
+          rustfmt
+          rust-analyzer
+          clippy
+          nodejs
+          webkitgtk_4_1
+          pkg-config
+          libsoup_3
+          gtk3
+          webkitgtk_4_1
+          cairo
+          gdk-pixbuf
+          libsoup_3
+          gsettings-desktop-schemas
+          glib
+        ];
+
+        in
+        {
+          devShell = pkgs.mkShell {
+          buildInputs = libraries;
+          LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libraries}";
+          SHELL = "${pkgs.bashInteractive}/bin/bash";
+          WEBKIT_DISABLE_COMPOSITING_MODE=1;
+
+          # see: https://github.com/tauri-apps/tauri/issues/7354
+          shellHook = with pkgs; ''
+              export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS;
+            '';
+          };
+        }
+    );
+}

integration/common/conduct.py

@@ -38,11 +38,11 @@ def get_summary(self):
         return summary
 
     def setup(self, file_format):
-        args = ["dialog", "create_setup", "--file-format", file_format]
+        args = ["dialog", "create_setup", "--", "--file-format", file_format]
         return self.run_process(args)
 
     def dialog_load_asset(self, department, shot=None, asset=None ):
-        args = ["dialog", "load_asset", "--program", self.current_program, "--department", department]
+        args = ["dialog", "load_asset", "--", "--program", self.current_program, "--department", department]
         if shot != None and shot != "":
             args.append("--shot")
             args.append(shot)

src/core/commands/command_dialog.rs

@@ -6,21 +6,13 @@ use query_string_builder::QueryString;
 use crate::{core::project::Project, gui};
 use serde::{Deserialize, Serialize};
 
-use super::{args::CommonArgs, error::CommandError, Command};
+use super::{error::CommandError, Command};
 
 #[derive(Debug, Args, Serialize, Deserialize)]
 pub struct DialogArgs {
-    #[command(flatten)]
-    #[serde(flatten)]
-    pub common: CommonArgs,
-
     kind: String,
 
-    #[arg(short, long)]
-    program: Option<String>,
-
-    #[arg(short, long)]
-    file_format: Option<String>,
+    extras: Vec<String>,
 }
 
 pub struct DialogOptions {
@@ -35,12 +27,14 @@ impl Command for DialogArgs {
         self,
         project: &RwLock<Project>,
     ) -> Result<std::option::Option<serde_json::Value>, CommandError> {
-        let args = QueryString::dynamic()
-            .with_opt_value("department", self.common.department)
-            .with_opt_value("asset", self.common.asset)
-            .with_opt_value("shot", self.common.shot)
-            .with_opt_value("program", self.program)
-            .with_opt_value("file_format", self.file_format);
+        let (_, argv) = argmap::parse(self.extras.iter());
+        log::debug!("Got extras: {:?}", argv);
+
+        let mut args = QueryString::dynamic();
+        for pair in argv.iter() {
+            let value = pair.1.get(0).unwrap();
+            _ = args.push(pair.0.clone(), value.clone())
+        }
 
         gui::gui(
             project.read().unwrap().clone(),

ui/src/api.ts

@@ -1,4 +1,4 @@
-import { AssetTreeCategory, ListAssetsResult, ListShotsResult, SetupResult, SummaryResponse } from "./bindings/bindings_gen";
+import { AssetTreeCategory, ListAssetsResult, ListElementsResult, ListExportFormatsResult, ListShotsResult, SetupResult, SummaryResponse } from "./bindings/bindings_gen";
 
 
 declare global {
@@ -45,8 +45,15 @@ export async function getSummary(): Promise<SummaryResponse> {
     return await result.json() as SummaryResponse
 }
 
-export async function doExport(): Promise<SummaryResponse> {
-    let result = await get("api/v1/command/export?asset=suzanneA&department=model")
+export async function doExport(department: string, asset: string, element: string, shot: string | null | undefined, from: string, file_format: string): Promise<SummaryResponse> {
+    let result = await get("api/v1/command/export", {
+        "department": department,
+        "asset": asset,
+        "element": element,
+        "shot": shot,
+        "from": from,
+        "file_format": file_format
+    })
     return await result.json() as SummaryResponse
 }
 
@@ -72,6 +79,29 @@ export async function listAssets(department_filter: null | string = null): Promi
     return await result.json() as ListAssetsResult
 }
 
+export async function listElements(asset: string, department: null | string = null, load: boolean = false): Promise<ListElementsResult> {
+    let result = await get("api/v1/command/list_elements", {
+        "department": department,
+        "asset": asset,
+        "load": load,
+    })
+
+    let data = await result.json()
+    console.log(data)
+    return data as ListElementsResult
+}
+
+export async function listExportFormats(department: string, program: string,): Promise<ListExportFormatsResult> {
+    let result = await get("api/v1/command/list_export_formats", {
+        "department": department,
+        "from": program
+    })
+
+    let data = await result.json()
+    console.log(data)
+    return data as ListExportFormatsResult
+}
+
 export async function getAssetTree(department_filter: null | string = null): Promise<AssetTreeCategory> {
     let result = await get("api/v1/command/get_asset_tree", {
         "department": department_filter

ui/src/index.tsx

@@ -8,6 +8,7 @@ import DialogCreateSetup from './pages/dialogs/create_setup';
 import DialogLoadAsset from './pages/dialogs/load_asset';
 import { ColorModeProvider } from '@kobalte/core/color-mode';
 import { Component } from 'solid-js';
+import DialogExport from './pages/dialogs/export';
 
 const root = document.getElementById('root');
 
@@ -29,4 +30,5 @@ render(() => (<Router root={rootComponent}>
   <Route path="/" component={App} />
   <Route path="/dialogs/create_setup" component={DialogCreateSetup} />
   <Route path="/dialogs/load_asset" component={DialogLoadAsset} />
+  <Route path="/dialogs/export" component={DialogExport} />
 </Router>), root!);

ui/src/pages/dialogs/create_setup.tsx

@@ -21,7 +21,7 @@ const DialogCreateSetup: Component = () => {
     const [shots] = createResource(listShots);
 
     const [searchParams, setSearchParams] = useSearchParams();
-    const fileFormat = () => searchParams.file_format;
+    const fileFormat = () => searchParams['file-format'];
 
     const derivedState = () => {
         return { department: selectedDepartment(), asset: selectedAsset(), shot: selectedShot() }