otterlib: wip new arrangements

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Cargo.lock.example b/Cargo.lock.example
index da91b49ae1242c083996989099a7bf16169717cf..22a2e4a1d4fe93abcff5979a5602c3a2d35b4b1a 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1615,6 +1615,7 @@ dependencies = [
  "serde_json",
  "serde_with",
  "slotmap",
+ "structopt",
  "strum",
  "tempfile",
  "tera",

diff --git a/Cargo.toml b/Cargo.toml
index e257770116f4d9ac1267d00ad64faba921214305..a34d1fde47d7788ddacf612fd46607c4a436eaef 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,6 +56,7 @@ serde = { version = "1", features = ["derive","rc"] }
 serde_json = "1"
 serde_with = "1"
 slotmap = { version = "0.4", features = ['serde'] }
+structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
 thiserror = "1"
 tempfile = "3"

diff --git a/src/bin/otterlib.rs b/src/bin/otterlib.rs
index 1886c0f924204a175c2cf316e42c9e91985cfaa4..bdefbd618af3a570a9969df903750391664dc749 100644 (file)
--- a/src/bin/otterlib.rs
+++ b/src/bin/otterlib.rs
@@ -1,9 +1,27 @@
+// Copyright 2020 Ian Jackson
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// There is NO WARRANTY.
+
 pub use otter::imports::*;
 
+use structopt::StructOpt;
+
+#[derive(Debug,Clone)]
+#[derive(StructOpt)]
+pub struct Opts {
+  #[structopt(long="--libs", default_value="library/*.toml")]
+  libs: String,
+
+  #[structopt(long="--items", default_value="*")]
+  items: String,
+}
+
 #[throws(anyhow::Error)]
 fn main() {
-  let mut a = env::args();
-  a.next().unwrap();
+  let opts = Opts::from_args();
+  let libs = shapelib::Config1::PathGlob(opts.libs.clone());
+  shapelib::load(&vec![libs])?;
+/*
   let name = a.next().unwrap();
   let dirname = a.next().unwrap();
   let catalogue = format!("{}.toml", &dirname);
@@ -11,4 +29,5 @@ fn main() {
     name, dirname, catalogue
   };
   shapelib::load1(&e).unwrap();
+*/
 }