Merge pull request #67 from webosbrew/fix/ls-compatible-option

Fix/ls compatible option

Author: mariotaku

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "dev-manager-desktop",
-  "version": "1.9.7",
+  "version": "1.9.8",
   "description": "Device Manager for webOS",
   "homepage": "https://github.com/webosbrew/dev-manager-desktop",
   "author": {

package.json

@@ -12,6 +12,7 @@ mod device_manager;
 mod plugins;
 mod session_manager;
 mod error;
+mod ssh_files;
 
 fn main() {
     env_logger::init();

src-tauri/src/main.rs

@@ -13,6 +13,7 @@ use crate::device_manager::Device;
 use crate::error::Error;
 use crate::plugins::cmd::escape_path;
 use crate::session_manager::SessionManager;
+use crate::ssh_files::ls::for_entries;
 
 #[tauri::command]
 async fn ls(
@@ -41,24 +42,19 @@ async fn ls(
     entries.pop();
     entries.sort();
     let mut items = Vec::<FileItem>::new();
+    let mut ls_legacy = false;
     for chunk in entries.chunks(100) {
-        let ls_input = chunk.join("\0").into_bytes();
-        let mut details: Vec<String> = String::from_utf8(
-            manager
-                .exec(
-                    device.clone(),
-                    "xargs -0 ls -ld --full-time",
-                    Some(ls_input),
-                )
-                .await?,
-        )
-        .unwrap()
-        .split('\n')
-        .map(|l| String::from(l))
-        .collect();
-        // Last line is empty, remove it
-        details.pop();
-        assert_eq!(chunk.len(), details.len());
+        let details = match for_entries(&manager, device.clone(), chunk, ls_legacy).await {
+            Ok(details) => details,
+            Err(Error::Unsupported) => {
+                if ls_legacy {
+                    return Err(Error::Unsupported);
+                }
+                ls_legacy = true;
+                for_entries(&manager, device.clone(), chunk, true).await?
+            }
+            Err(e) => return Err(e),
+        };
         let mut group: Vec<FileItem> = zip(chunk, details)
             .skip(1)
             .map(|(entry, line)| {

src-tauri/src/plugins/file.rs

@@ -0,0 +1,49 @@
+use crate::device_manager::Device;
+use crate::error::Error;
+use crate::session_manager::SessionManager;
+
+pub(crate) async fn for_entries(
+    manager: &SessionManager,
+    device: Device,
+    entries: &[String],
+    use_legacy: bool,
+) -> Result<Vec<String>, Error> {
+    let ls_input = entries.join("\0").into_bytes();
+    let ls_output = match manager
+        .exec(
+            device.clone(),
+            &format!(
+                "xargs -0 ls -ld {}",
+                if use_legacy { "-e" } else { "--full-time" }
+            ),
+            Some(ls_input.clone()),
+        )
+        .await
+    {
+        Ok(v) => v,
+        Err(Error::ExitStatus {
+            message,
+            exit_code,
+            stderr,
+        }) => {
+            if exit_code == 123 {
+                return Err(Error::Unsupported);
+            }
+            return Err(Error::ExitStatus {
+                message,
+                exit_code,
+                stderr,
+            });
+        }
+        Err(e) => return Err(e),
+    };
+    let mut details: Vec<String> = String::from_utf8(ls_output)
+        .unwrap()
+        .split('\n')
+        .map(|l| String::from(l))
+        .collect();
+    // Last line is empty, remove it
+    details.pop();
+    assert_eq!(entries.len(), details.len());
+    return Ok(details);
+}

src-tauri/src/ssh_files/ls.rs

@@ -0,0 +1 @@
+pub(crate) mod ls;