Merge branch 'devel'

Author: kirch7

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "parallel-gnuplot"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["Cassio Kirch <cassiokirch@gmail.com>"]
 description = "Parallel calls to `GNUPlot`. Calls the same `GNUPlot` script once for each data file block."
 keywords = ["gnuplot", "parallel", "plot", "plotting"]
-categories = ["science"]
+categories = ["science", "command-line-utilities"]
 license = "GPL-3.0"
 readme = "README.md"
 repository = "https://github.com/kirch7/parallel-gnuplot"

README.md

@@ -1,18 +1,24 @@
 # parallel-gnuplot
 Parallel calls to <a href="http://www.gnuplot.info/">GNUPlot</a>.
-Calls the same <tt>GNUPlot</tt> script once for each data file block.
-Please, note <tt>GNUPlot</tt> has copyrights,
-and <tt>parallel-gnuplot</tt> is <strong>not</strong> a modified version of <tt>GNUPlot</tt>.
+Calls the same `GNUPlot` script once for each data file block.
+Please, note `GNUPlot` has copyrights,
+and `parallel-gnuplot` is <strong>not</strong> a modified version of `GNUPlot`.
 
 # GNUPlot variables
-<tt>parallel-gnuplot</tt> sets some <tt>GNUPlot</tt> variables:
+`parallel-gnuplot` sets some `GNUPlot` variables:
 <ul>
-<li><tt>INDEX</tt>: block index, starting at <tt>0</tt>;</li>
-<li><tt>DATAFILE</tt>: path of a data file containing only a single block.</li>
+<li>`INDEX`: block index, starting at `0`;</li>
+<li>`DATAFILE`: path of a data file containing only a single block.</li>
 </ul>
 
 # Usage
-<tt>parallel-gnuplot datafilename gpfilename [tmpdirectory]</tt>
+`parallel-gnuplot datafilename gpfilename [tmpdirectory]`
+
+or
+
+`cargo run --release -- datafilename gpfilename [tmpdirectory]`
+
+where `[tmpdirectory]` is optional.
 
 # Example
 
@@ -50,5 +56,17 @@ set output sprintf("%d", INDEX).'.png'
 plot DATAFILE with lp lw 2 pt 7 ps 3 title sprintf("Block %d", INDEX)
 ```
 
-You can call: <tt>parallel-gnuplot ./data.txt ./script.gp .</tt>
+You can call:
+  `parallel-gnuplot ./data.txt ./script.gp`
+  or
+  `cargo run --release -- ./data.txt ./script.gp`
 
+# Features
+<ul>
+  <li>Tested with the Operating Systems:
+  <ul>
+    <li><em>MS Windows</em> (works since v0.1.4),</li>
+    <li><em>GNU/Linux</em>.</li>
+    <li>(Let me know if works in other OSs.)</li>
+  </ul>
+</ul>

src/main.rs

@@ -61,7 +61,7 @@ extern crate threadpool;
 use threadpool::ThreadPool;
 use std::sync::mpsc::channel;
 use std::process::Command;
-use std::fs::File;
+use std::fs::{File, ReadDir};
 use std::io::Write;
 
 fn get_read_file(filename: &String) -> File {
@@ -71,6 +71,13 @@ fn get_read_file(filename: &String) -> File {
     }
 }
 
+fn get_folder(foldername: &String) -> ReadDir {
+    match std::fs::read_dir(&foldername) {
+        Ok(dir) => dir,
+        Err(e)  => { panic!("Error opening {}: {}", foldername, e.to_string()); },
+    }
+}
+
 fn get_write_file(filename: &String) -> File {
     match File::create(filename) {
         Ok(file) => file,
@@ -79,24 +86,7 @@ fn get_write_file(filename: &String) -> File {
 }
 
 fn check_folder(path: &String) -> Result<(), String> {
-    let file = get_read_file(path);
-    let metadata = match file.metadata() {
-        Ok(metadata) => metadata,
-        Err(e)       => {
-            let message = "Error getting ".to_string() + path + ": " + &e.to_string();
-            return Err(message);
-        },
-    };
-    if !metadata.is_dir() {
-        let message = path.clone() + " is not a directory.";
-        return Err(message);
-    }
-
-    if metadata.permissions().readonly() {
-        let message = path.clone() + "is readonly";
-        return Err(message);
-    }
-
+    let file = get_folder(path);
     Ok(())
 }
 
@@ -126,12 +116,14 @@ fn main() {
     let gpfilename = &args[2];
     let tmpfoldername = {
         if args.len() > 3 {
-            &args[3]
+            args[3].clone()
         } else {
-            "/tmp/"
+            std::env::temp_dir()
+                .into_os_string()
+                .into_string()
+                .unwrap()
         }
     };
-    let tmpfoldername = tmpfoldername.to_string();
     match check_folder(&tmpfoldername) {
         Err(e) => { panic!(e); },
         _      => { },