Skip to content

Commit

Permalink
Set delimiter for excel
Browse files Browse the repository at this point in the history
  • Loading branch information
toshitanian committed Apr 6, 2017
1 parent 8dc353f commit b5121a8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "xcat"
version = "0.1.0"
version = "0.1.1"
authors = ["Toshiya. K. <kawasakitoshiya@gmail.com>"]

[dependencies]
Expand Down
10 changes: 5 additions & 5 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ macro_rules! println_stderr(
);


fn read_as_excel(sce: PathBuf) {
fn read_as_excel(sce: PathBuf, delimiter: &str) {
let mut xl = Excel::open(&sce).unwrap();

let range_result = xl.sheet_names()
.map(|elem| elem[0].to_string())
.and_then(|name| xl.worksheet_range(&name));
let range = range_result.unwrap();
write_range(range).unwrap();
write_range(range, delimiter).unwrap();
}

fn read_as_csv(sce: PathBuf, delimiter: &str) {
Expand Down Expand Up @@ -72,7 +72,7 @@ fn main() {
continue;
}
match sce.extension().and_then(|s| s.to_str()) {
Some("xlsx") | Some("xlsm") | Some("xlsb") | Some("xls") => read_as_excel(sce),
Some("xlsx") | Some("xlsm") | Some("xlsb") | Some("xls") => read_as_excel(sce, delimiter),
Some("csv") | Some("txt") => read_as_csv(sce, delimiter),
Some("ods") => println_stderr!("{}: .ods is not supported yet", file),
_ => println_stderr!("{}: Not supported file format", file),
Expand All @@ -82,7 +82,7 @@ fn main() {

}

fn write_range(range: Range) -> Result<()> {
fn write_range(range: Range, delimiter: &str) -> Result<()> {
let n = range.get_size().1 - 1;
for r in range.rows() {
for (i, c) in r.iter().enumerate() {
Expand All @@ -95,7 +95,7 @@ fn write_range(range: Range) -> Result<()> {
DataType::Bool(ref b) => print!("{}", b),
};
if i != n {
let _ = print!(",");
let _ = print!("{}", delimiter);
}
}
let _ = println!("");
Expand Down

0 comments on commit b5121a8

Please sign in to comment.