Add command line parameter

Author: Tristramg

Cargo.toml

@@ -6,11 +6,11 @@ description = "Convert OpenStreetMap data into routing friendly CSV"
 homepage = "https://github.com/Tristramg/osm4routing2"
 readme = "readme.md"
 license = "MIT"
-license-file = "LICENCE.md"
 
 [dependencies]
 osmpbfreader = "0.3"
 csv = "0.14.7"
+docopt = "0.6.86"
 
 [lib]
 name = "osm4routing"

src/main.rs

@@ -1,6 +1,15 @@
 extern crate osm4routing;
+extern crate docopt;
+use docopt::Docopt;
 
 fn main() {
-    let (nodes, edges) = osm4routing::reader::read("idf.osm.pbf");
-    osm4routing::writers::csv(nodes, edges);
+
+    const USAGE: &'static str = "
+Usage: osm4routing <source.osm.pbf>";
+    let args = Docopt::new(USAGE).unwrap().parse().unwrap_or_else(|e| e.exit());
+    let filename = args.get_str("<source.osm.pbf>");
+    match osm4routing::reader::read(filename) {
+        Ok((nodes, edges)) => osm4routing::writers::csv(nodes, edges),
+        Err(error) => println!("Error: {}", error),
+    }
 }

src/osm4routing/reader.rs

@@ -72,9 +72,9 @@ impl Reader {
         result
     }
 
-    fn read(&mut self, filename: &str) {
+    fn read(&mut self, filename: &str) -> Result<(), String> {
         let path = std::path::Path::new(filename);
-        let r = std::fs::File::open(&path).unwrap();
+        let r = try!(std::fs::File::open(&path).map_err(|e| e.to_string()));
         let mut pbf = osmpbfreader::OsmPbfReader::new(r);
         for obj in pbf.iter() {
             match obj {
@@ -104,6 +104,7 @@ impl Reader {
                 osmpbfreader::OsmObj::Relation(_) => {}
             }
         }
+        Ok(())
     }
 
 
@@ -122,11 +123,11 @@ impl Reader {
 }
 
 // Read all the nodes and ways of the osm.pbf file
-pub fn read(filename: &str) -> (Vec<Node>, Vec<Edge>) {
+pub fn read(filename: &str) -> Result<(Vec<Node>, Vec<Edge>), String> {
     let mut r = Reader::new();
-    r.read(filename);
+    try!(r.read(filename));
     r.count_nodes_uses();
-    return (r.nodes(), r.edges());
+    Ok((r.nodes(), r.edges()))
 }
 
 #[test]