s3 ready

Author: syf20020816

.DS_Store

@@ -24,7 +24,7 @@ before-packaging-command = "cargo build --release"
 name = "GenUI Cloud Drive"
 authors = ["Will Sheng <syf20020816@outlook.com>"]
 identifier = "com.privoce"
-icon = ["./resources/32x32.jpg", "./resources/128x128.jpg"]
+icons = ["./resources/32x32.jpg", "./resources/128x128.jpg"]
 version = "0.0.1"
 resources = [
     { src = "./dist/resources/makepad_widgets", target = "makepad_widgets" },

aws_s3_cloud_drive/.DS_Store

@@ -2,6 +2,9 @@
 
 A simple AWS S3 cloud storage client written using Rust Makepad framework
 
+> [!IMPORTANT]
+> **Chinese Mainland needs to ensure access to AWS services**
+
 ## Prepare
 
 For installation instructions, expand the section for your operating system.

aws_s3_cloud_drive/Cargo.toml

@@ -1,5 +1,5 @@
 use std::{
-    env::current_dir,
+    env::current_exe,
     fs::{File, OpenOptions},
     io::{Read, Write},
     path::PathBuf,
@@ -234,7 +234,7 @@ pub fn remove_virtual(target: &str) -> Result<Vec<String>, std::io::Error> {
 }
 
 pub fn read_or_create(target: &str) -> std::io::Result<File> {
-    let current_path = current_dir().unwrap();
+    let current_path = current_exe().unwrap();
     let conf_path = current_path.join(target);
     OpenOptions::new()
         .create(true)
@@ -246,27 +246,3 @@ pub fn read_or_create(target: &str) -> std::io::Result<File> {
 pub fn format_s3_path(path: &Vec<String>) -> String {
     format!("s3://{}/", path.join("/"))
 }
-
-#[cfg(test)]
-mod t {
-    #[test]
-    fn test_ls() {
-        // let results = super::ls();
-        // dbg!(results.unwrap());
-        // assert!(results.is_ok());
-    }
-    #[test]
-    fn test_ls_dir() {
-        let results = super::ls_dir("yarddesign");
-        dbg!(results.unwrap());
-    }
-    // #[test]
-    // fn test_cp() {
-    //     let results = super::cp(
-    //         r#"E:\pratice_imgs\makepad_taobao-main.zip"#,
-    //         "s3://yarddesign/pratice_imgs/",
-    //         true,
-    //     ).await?;
-    //     dbg!(results);
-    // }
-}

aws_s3_cloud_drive/README.md

@@ -35,18 +35,18 @@ pub struct State {
 }
 
 #[derive(Debug, Clone, Default, PartialEq, Eq)]
-pub enum Req{
+pub enum Req {
     #[default]
     None,
     Upload,
     Rm,
     Cp,
     Mv,
     Share,
-    Error(String)
+    Error(String),
 }
 
-impl Req{
+impl Req {
     pub fn is_none(&self) -> bool {
         matches!(self, Req::None)
     }
@@ -297,7 +297,12 @@ impl State {
                         self.msg = String::from_utf8_lossy(&out.stderr.as_slice()).to_string();
                     }
                 }
-                Err(e) => self.msg = e.to_string(),
+                Err(e) => {
+                    // write to ./log
+                    // let mut f = read_or_create("log").expect("Can not create log file!");
+                    // let _ = f.write(format!("{}\n", e).as_bytes());
+                    self.msg = e.to_string();
+                }
             }
             return None;
         };