fix windows build and add command help text

Author: Panaetius

coman/src/cli.rs

@@ -10,7 +10,9 @@ use crate::{
 
 #[derive(Subcommand, Debug)]
 pub enum CliCommands {
+    #[clap(about = "Show version and config file locations")]
     Version,
+    #[clap(about = "Subcommands related to CSCS")]
     Cscs {
         #[command(subcommand)]
         command: CscsCommands,
@@ -28,36 +30,37 @@ pub enum CliCommands {
 
 #[derive(Subcommand, Debug)]
 pub enum CscsCommands {
+    #[clap(about = "Log in to CSCS")]
     Login,
-    #[clap(alias("j"))]
+    #[clap(alias("j"), about = "Job subcommands [aliases: j]")]
     Job {
         #[command(subcommand)]
         command: CscsJobCommands,
     },
-    #[clap(alias("f"))]
+    #[clap(alias("f"), about = "File management subcommands [aliases: f]")]
     File {
         #[command(subcommand)]
         command: CscsFileCommands,
     },
-    #[clap(alias("s"))]
+    #[clap(
+        alias("s"),
+        about = "Subcommands for managing for interacting with the compute system config (e.g. 'daint') [aliases: s]"
+    )]
     System {
         #[command(subcommand)]
         command: CscsSystemCommands,
     },
 }
 #[derive(Subcommand, Debug)]
 pub enum CscsJobCommands {
-    #[clap(alias("ls"))]
+    #[clap(alias("ls"), about = "List all jobs [aliases: ls]")]
     List,
-    #[clap(alias("g"))]
-    Get {
-        job_id: i64,
-    },
-    Log {
-        job_id: i64,
-    },
+    #[clap(alias("g"), about = "Get metadata for a specific job [aliases: g]")]
+    Get { job_id: i64 },
+    #[clap(about = "Get the stdout of a job")]
+    Log { job_id: i64 },
 
-    #[clap(alias("s"))]
+    #[clap(alias("s"), about = "Submit a new compute job [aliases: s]")]
     Submit {
         #[clap(short, long, help = "the path to the srun script file to use")]
         script_file: Option<PathBuf>,
@@ -74,24 +77,25 @@ pub enum CscsJobCommands {
         #[clap(trailing_var_arg = true, help = "The command to run in the container")]
         command: Option<Vec<String>>,
     },
-    #[clap(alias("c"))]
-    Cancel {
-        job_id: i64,
-    },
+    #[clap(
+        alias("c"),
+        about = "Cancel a running job, fails if the job isn't running [aliases: c]"
+    )]
+    Cancel { job_id: i64 },
 }
 
 #[derive(Subcommand, Debug)]
 pub enum CscsFileCommands {
-    #[clap(alias("ls"))]
+    #[clap(alias("ls"), about = "List folders and files in a remote path [aliases: ls]")]
     List { path: PathBuf },
-    #[clap(alias("dl"))]
+    #[clap(alias("dl"), about = "Download a remote file [aliases: dl]")]
     Download {
         #[clap(short, long, help = "account/project to use")]
         account: Option<String>,
         remote: PathBuf,
         local: PathBuf,
     },
-    #[clap(alias("ul"))]
+    #[clap(alias("ul"), about = "Upload a file to remote storage [aliases: ul]")]
     Upload {
         #[clap(short, long, help = "account/project to use")]
         account: Option<String>,
@@ -102,11 +106,11 @@ pub enum CscsFileCommands {
 
 #[derive(Subcommand, Debug)]
 pub enum CscsSystemCommands {
-    #[clap(alias("ls"), about = "List available compute systems")]
+    #[clap(alias("ls"), about = "List available compute systems [aliases: ls]")]
     List,
     #[clap(
         alias("s"),
-        about = "Set system to use (e.g. `daint`, see `coman cscs ls` for available systems)"
+        about = "Set system to use (e.g. `daint`, see `coman cscs ls` for available systems) [aliases: s]"
     )]
     Set {
         #[clap(short, long, action, help = "set in global config instead of project-local one")]

coman/src/cscs/handlers.rs

@@ -1,4 +1,8 @@
-use std::{os::unix::fs::MetadataExt, path::PathBuf};
+#[cfg(target_family = "unix")]
+use std::os::unix::fs::MetadataExt;
+#[cfg(target_family = "windows")]
+use std::os::windows::fs::MetadataExt;
+use std::path::PathBuf;
 
 use color_eyre::{Result, eyre::eyre};
 use reqwest::Url;
@@ -313,7 +317,14 @@ pub async fn cscs_file_upload(
             let config = Config::new().unwrap();
 
             let file_meta = std::fs::metadata(local.clone())?;
-            if (file_meta.size() as usize) < CSCS_MAX_DIRECT_SIZE {
+
+            #[cfg(target_family = "unix")]
+            let size = file_meta.size() as usize;
+
+            #[cfg(target_family = "windows")]
+            let size = file_meta.file_size() as usize;
+
+            if size < CSCS_MAX_DIRECT_SIZE {
                 // upload directly
                 let contents = std::fs::read(local)?;
                 api_client

firecrest_client/src/types.rs

@@ -9,7 +9,7 @@
 //! AUTO-GENERATED CODE - DO NOT EDIT!
 //!
 //! FirecREST
-//! Source: /tmp/.tmpNLmwEL.json
+//! Source: /tmp/.tmpJ9quLA.json
 //! Version: 2.4.1
 //! Generated by `oas3-gen v0.21.1`
 //!