Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 40 additions & 11 deletions apps/cli/src/upload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,27 @@ pub async fn upload_video_path(file_path: &Path, name: Option<String>) -> Result
}
}

fn agent_upload_payload(
file_name: &str,
name: Option<&str>,
content_length: u64,
meta: &VideoMeta,
) -> serde_json::Value {
let mut payload = json!({
"fileName": file_name,
"contentType": "video/mp4",
"contentLength": content_length,
"durationSeconds": meta.duration_in_secs,
"width": meta.width,
"height": meta.height,
"fps": meta.fps,
});
if let Some(name) = name {
payload["title"] = json!(name);
}
payload
}

async fn upload_file_with_agent(
file_path: &Path,
name: Option<&str>,
Expand All @@ -276,16 +297,7 @@ async fn upload_file_with_agent(
.mutate_json(
Method::POST,
"/uploads",
&json!({
"fileName": file_name,
"contentType": "video/mp4",
"contentLength": content_length,
"durationSeconds": meta.duration_in_secs,
"width": meta.width,
"height": meta.height,
"fps": meta.fps,
"title": name,
}),
&agent_upload_payload(file_name, name, content_length, meta),
)
.await
.map_err(|error| error.to_string())?;
Expand Down Expand Up @@ -529,9 +541,26 @@ async fn upload_file(http: &Client, put_url: &str, path: &Path) -> Result<(), St

#[cfg(test)]
mod tests {
use super::prefer_agent_upload_sources;
use super::{VideoMeta, agent_upload_payload, prefer_agent_upload_sources};
use crate::credentials::{AgentCredentialSource, CredentialSource};

#[test]
fn agent_upload_payload_only_includes_a_requested_title() {
let meta = VideoMeta {
duration_in_secs: 1.0,
width: 640,
height: 360,
fps: 30.0,
};
for name in [None, Some("Demo"), Some("")] {
let payload = agent_upload_payload("demo.mp4", name, 1024, &meta);
match name {
Some(name) => assert_eq!(payload["title"], name),
None => assert!(payload.get("title").is_none()),
}
}
}

#[test]
fn explicit_agent_environment_credential_has_highest_upload_priority() {
assert!(prefer_agent_upload_sources(
Expand Down
Loading