mirrors/n-link
1
0
Fork 0
mirror of https://github.com/lights0123/n-link.git synced 2024-12-22 18:25:27 +00:00
Code Issues Projects Releases Wiki Activity

Small tweaks

Browse source
This commit is contained in:
lights0123 2021-10-27 16:59:08 -04:00 committed by Ben Schattinger
parent 3311e0d358
commit a8dddd1756
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
desktop/src-tauri/src/cli.rs
View file

@ -163,13 +163,12 @@ pub fn run() -> bool {
match res { match res {
Ok(_) => { Ok(_) => {
println!("Upload {}: Ok", dest); bar.finish_with_message(&format!("Upload {}: Ok", dest));
} }
Err(error) => { Err(error) => {
bar.abandon_with_message(&format!("Failed: {}", error)); bar.abandon_with_message(&format!("Failed: {}", error));
} }
} }
bar.finish();
} }
} else { } else {
eprintln!("Couldn't find any device"); eprintln!("Couldn't find any device");
@ -247,11 +246,10 @@ pub fn run() -> bool {
.to_string(); .to_string();
let mut buf = vec![]; let mut buf = vec![];
let mut f = File::open(cwd().join(&file)) let mut f = File::open(cwd().join(&file)).unwrap_or_else(|err| {
.unwrap_or_else(|err| { eprintln!("Failed to open file: {}", err);
eprintln!("Failed to open file: {}", err); std::process::exit(1);
std::process::exit(1); });
});
if format!(".{}", file_ext) != calc_info.os_extension { if format!(".{}", file_ext) != calc_info.os_extension {
if no_check_os { if no_check_os {
@ -298,7 +296,10 @@ pub fn run() -> bool {
eprintln!("Couldn't find any device"); eprintln!("Couldn't find any device");
} }
} }
SubCommand::Copy(Copy { from_path, dist_path }) => { SubCommand::Copy(Copy {
from_path,
dist_path,
}) => {
if let Some(handle) = get_dev() { if let Some(handle) = get_dev() {
match handle.copy_file(&from_path, &dist_path) { match handle.copy_file(&from_path, &dist_path) {
Ok(_) => { Ok(_) => {
@ -312,7 +313,10 @@ pub fn run() -> bool {
eprintln!("Couldn't find any device"); eprintln!("Couldn't find any device");
} }
} }
SubCommand::Move(Move { from_path, dist_path }) => { SubCommand::Move(Move {
from_path,
dist_path,
}) => {
if let Some(handle) = get_dev() { if let Some(handle) = get_dev() {
match handle.move_file(&from_path, &dist_path) { match handle.move_file(&from_path, &dist_path) {
Ok(_) => { Ok(_) => {
@ -358,13 +362,16 @@ pub fn run() -> bool {
if let Some(handle) = get_dev() { if let Some(handle) = get_dev() {
match handle.list_dir(&path) { match handle.list_dir(&path) {
Ok(dir_list) => { Ok(dir_list) => {
for i in 0..dir_list.len() { for item in dir_list.iter() {
let item = dir_list.get(i).unwrap(); println!(
let mut item_name = String::from(item.name().to_str().unwrap()); "{}{}",
if item.entry_type() == EntryType::Directory { item.name().to_str().unwrap(),
item_name += "/"; if item.entry_type() == EntryType::Directory {
} "/"
println!("{}", item_name); } else {
""
}
);
} }
} }
Err(error) => { Err(error) => {