Allow the sixtyfps-compiler and sixtyfps-viewer to read from stdin

By specifing `-` as a path
task-jp · Sep 9, 2021 · fe015a8 · fe015a8
1 parent 011a9ff
commit fe015a8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+ - sixtyfps-compiler and sixtyfps-viewer can read the .60 file content from stdin by passing `-`
+
 ### Fixed
 
 ## [0.1.2] - 2021-09-09

diff --git a/sixtyfps_compiler/diagnostics.rs b/sixtyfps_compiler/diagnostics.rs
@@ -8,6 +8,7 @@
     Please contact info@sixtyfps.io for more information.
 LICENSE END */
 
+use std::io::Read;
 use std::path::{Path, PathBuf};
 use std::rc::Rc;
 
@@ -115,7 +116,17 @@ impl SourceFileInner {
 pub type SourceFile = Rc<SourceFileInner>;
 
 pub fn load_from_path(path: &Path) -> Result<String, Diagnostic> {
-    std::fs::read_to_string(path).map_err(|err| Diagnostic {
+    (if path == Path::new("-") {
+        let mut buffer = Vec::new();
+        let r = std::io::stdin().read_to_end(&mut buffer);
+        r.and_then(|_| {
+            String::from_utf8(buffer)
+                .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidData, err))
+        })
+    } else {
+        std::fs::read_to_string(path)
+    })
+    .map_err(|err| Diagnostic {
         message: format!("Could not load {}: {}", path.display(), err),
         span: SourceLocation {
             source_file: Some(SourceFileInner::from_path_only(path.to_owned())),

diff --git a/sixtyfps_runtime/interpreter/api.rs b/sixtyfps_runtime/interpreter/api.rs
@@ -516,6 +516,8 @@ impl ComponentCompiler {
     ///
     /// Diagnostics from previous calls are cleared when calling this function.
     ///
+    /// If the path is `"-"`, the file will be read from stdin.
+    ///
     /// This function is `async` but in practice, this is only asynchronous if
     /// [`Self::set_file_loader`] was called and its future is actually asynchronous.
     /// If that is not used, then it is fine to use a very simple executor, such as the one

diff --git a/tools/compiler/main.rs b/tools/compiler/main.rs
@@ -22,7 +22,7 @@ struct Cli {
     #[structopt(short = "I", name = "include path", number_of_values = 1)]
     include_paths: Vec<std::path::PathBuf>,
 
-    /// Path to .60 file
+    /// Path to .60 file ('-' for stdin)
     #[structopt(name = "file", parse(from_os_str))]
     path: std::path::PathBuf,
 

diff --git a/tools/viewer/main.rs b/tools/viewer/main.rs
@@ -24,6 +24,7 @@ struct Cli {
     #[structopt(short = "I", name = "include path for other .60 files", number_of_values = 1)]
     include_paths: Vec<std::path::PathBuf>,
 
+    /// The .60 file to load ('-' for stdin)
     #[structopt(name = "path to .60 file", parse(from_os_str))]
     path: std::path::PathBuf,