show versions

roboplc-cli/src/arguments.rs

@@ -32,7 +32,7 @@ pub enum SubCommand {
     #[clap(name = "new", about = "Generate a new project")]
     New(NewCommand),
     #[clap(name = "stat", about = "Get program status")]
-    Stat,
+    Stat(StatCommand),
     #[clap(name = "config", about = "Switch remote into CONFIG mode")]
     Config,
     #[clap(name = "run", about = "Switch remote into RUN mode")]
@@ -118,6 +118,12 @@ impl LockingPolicy {
     }
 }
 
+#[derive(Parser)]
+pub struct StatCommand {
+    #[clap(long, help = "Show remote versions (requires RoboPLC Pro)")]
+    pub show_versions: bool,
+}
+
 #[derive(Parser)]
 pub struct FlashCommand {
     #[clap(long, env = "CARGO", help = "cargo/cross binary path")]

roboplc-cli/src/main.rs

@@ -102,8 +102,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         SubCommand::New(_) => {
             panic!("BUG");
         }
-        SubCommand::Stat => {
-            remote::stat(&url, &key, agent)?;
+        SubCommand::Stat(opts) => {
+            remote::stat(&url, &key, agent, opts.show_versions)?;
         }
         SubCommand::Config => {
             remote::set_mode(&url, &key, &agent, Mode::Config, true)?;

roboplc-cli/src/remote.rs

+use bma_ts::Timestamp;
+use prettytable::{cell, row, Table};
+use serde::Deserialize;
 use ureq::Agent;
 
 use crate::{
@@ -6,7 +9,12 @@ use crate::{
     API_PREFIX,
 };
 
-pub fn stat(url: &str, key: &str, agent: Agent) -> Result<(), Box<dyn std::error::Error>> {
+pub fn stat(
+    url: &str,
+    key: &str,
+    agent: Agent,
+    show_versions: bool,
+) -> Result<(), Box<dyn std::error::Error>> {
     let resp = agent
         .post(&format!("{}{}/query.stats.program", url, API_PREFIX))
         .set("x-auth-key", key)
@@ -14,9 +22,62 @@ pub fn stat(url: &str, key: &str, agent: Agent) -> Result<(), Box<dyn std::error
         .process_error()?;
     let stats: State = resp.into_json()?;
     stats.print_std();
+    if show_versions {
+        println!();
+        let resp = agent
+            .post(&format!("{}{}/query.program.meta", url, API_PREFIX))
+            .set("x-auth-key", key)
+            .call()
+            .process_error()?;
+        let meta: PlcMetadata = resp.into_json()?;
+        let mut table = Table::new();
+        table.add_row(row!["Program", "Exists", "Created"]);
+        table.add_row(row![
+            "current",
+            meta.program_current.exists_as_cell(),
+            meta.program_current.created_iso()?
+        ]);
+        for (i, program) in meta.program_previous.iter().enumerate() {
+            table.add_row(row![
+                format!("prev.{}", i),
+                program.exists_as_cell(),
+                program.created_iso()?
+            ]);
+        }
+        table.printstd();
+    }
     Ok(())
 }
 
+#[derive(Deserialize)]
+struct PlcMetadata {
+    program_current: ProgramFileMetdata,
+    #[serde(default)]
+    program_previous: Vec<ProgramFileMetdata>,
+}
+
+#[derive(Deserialize)]
+struct ProgramFileMetdata {
+    exists: bool,
+    created: Timestamp,
+}
+
+impl ProgramFileMetdata {
+    fn exists_as_cell(&self) -> prettytable::Cell {
+        if !self.exists {
+            cell!("YES")
+        } else {
+            cell!(Fr->"NO")
+        }
+    }
+    fn created_iso(&self) -> Result<String, Box<dyn std::error::Error>> {
+        Ok(self
+            .created
+            .try_into_datetime_local()?
+            .to_rfc3339_opts(chrono::SecondsFormat::Secs, true))
+    }
+}
+
 pub fn set_mode(
     url: &str,
     key: &str,