move actions into actions module

19 files changed, 24 insertions, 32 deletions

diff --git a/src/agenda.rs b/src/actions/agenda.rs
index 5b98fb1..5b98fb1 100644
--- a/src/agenda.rs
+++ b/src/actions/agenda.rs
diff --git a/src/cal.rs b/src/actions/cal.rs
index a23be91..a23be91 100644
--- a/src/cal.rs
+++ b/src/actions/cal.rs
diff --git a/src/copy.rs b/src/actions/copy.rs
index 5ed7aef..5ed7aef 100644
--- a/src/copy.rs
+++ b/src/actions/copy.rs
diff --git a/src/edit.rs b/src/actions/edit.rs
index e7f0afb..e7f0afb 100644
--- a/src/edit.rs
+++ b/src/actions/edit.rs
diff --git a/src/bucketable.rs b/src/actions/index/bucketable.rs
index e0f743a..e0f743a 100644
--- a/src/bucketable.rs
+++ b/src/actions/index/bucketable.rs
diff --git a/src/index.rs b/src/actions/index/index.rs
index e3f02a7..96acf8a 100644
--- a/src/index.rs
+++ b/src/actions/index/index.rs
@@ -7,15 +7,15 @@ use std::time::SystemTime;
 use walkdir::DirEntry;
 
 use defaults::*;
-use indextime;
+use super::indextime;
 use utils::fileutil;
 use utils::lock;
 use utils::misc;
 
 
 fn add_buckets_for_calendar(buckets: &mut HashMap<String, Vec<String>>, cal: &IcalVCalendar) {
-  use bucketable::Bucketable;
-  use bucketable::Merge;
+  use super::bucketable::Bucketable;
+  use super::bucketable::Merge;
 
   match cal.get_buckets() {
     Ok(cal_buckets) => buckets.merge(cal_buckets),
@@ -102,7 +102,7 @@ fn read_buckets(ics_files: impl Iterator<Item = PathBuf>) -> HashMap<String, Vec
 
   let mut total_files = 0;
   for file in ics_files {
-    trace!("File: {:?}", file);
+    debug!("Indexing file: {:?}", file);
     match fileutil::read_file_to_string(&file) {
       Ok(content) => {
         total_files += 1;
diff --git a/src/indextime.rs b/src/actions/index/indextime.rs
index b078b2f..b078b2f 100644
--- a/src/indextime.rs
+++ b/src/actions/index/indextime.rs
diff --git a/src/actions/index/mod.rs b/src/actions/index/mod.rs
new file mode 100644
index 0000000..7081c0b
--- /dev/null
+++ b/src/actions/index/mod.rs
@@ -0,0 +1,5 @@
+pub mod index;
+mod indextime;
+mod bucketable;
+
+pub use self::index::index_dir;
diff --git a/src/list.rs b/src/actions/list.rs
index 01289f6..01289f6 100644
--- a/src/list.rs
+++ b/src/actions/list.rs
diff --git a/src/actions/mod.rs b/src/actions/mod.rs
new file mode 100644
index 0000000..20d8149
--- /dev/null
+++ b/src/actions/mod.rs
@@ -0,0 +1,13 @@
+pub mod agenda;
+pub mod cal;
+pub mod copy;
+pub mod edit;
+pub mod index;
+pub mod list;
+pub mod modify;
+pub mod new;
+pub mod prettyprint;
+pub mod select;
+pub mod seq;
+pub mod show;
+pub mod unroll;
diff --git a/src/modify.rs b/src/actions/modify.rs
index 449d95a..449d95a 100644
--- a/src/modify.rs
+++ b/src/actions/modify.rs
diff --git a/src/new.rs b/src/actions/new.rs
index b834015..b834015 100644
--- a/src/new.rs
+++ b/src/actions/new.rs
diff --git a/src/prettyprint.rs b/src/actions/prettyprint.rs
index 0baef7d..0baef7d 100644
--- a/src/prettyprint.rs
+++ b/src/actions/prettyprint.rs
diff --git a/src/select.rs b/src/actions/select.rs
index 87bca2b..87bca2b 100644
--- a/src/select.rs
+++ b/src/actions/select.rs
diff --git a/src/seq.rs b/src/actions/seq.rs
index cbdca21..cbdca21 100644
--- a/src/seq.rs
+++ b/src/actions/seq.rs
diff --git a/src/show.rs b/src/actions/show.rs
index 89d07e0..89d07e0 100644
--- a/src/show.rs
+++ b/src/actions/show.rs
diff --git a/src/unroll.rs b/src/actions/unroll.rs
index 156432f..156432f 100644
--- a/src/unroll.rs
+++ b/src/actions/unroll.rs
diff --git a/src/bin/khaleesi.rs b/src/bin/khaleesi.rs
index 07d3c4e..dd56435 100644
--- a/src/bin/khaleesi.rs
+++ b/src/bin/khaleesi.rs
@@ -5,21 +5,9 @@ extern crate stderrlog;
 #[macro_use]
 extern crate log;
 
-use khaleesi::agenda;
-use khaleesi::cal;
-use khaleesi::copy;
 use khaleesi::config::Config;
 use khaleesi::defaults::*;
-use khaleesi::edit;
-use khaleesi::index;
-use khaleesi::list;
-use khaleesi::modify;
-use khaleesi::new;
-use khaleesi::prettyprint;
-use khaleesi::select;
-use khaleesi::seq;
-use khaleesi::show;
-use khaleesi::unroll;
+use khaleesi::actions::*;
 use khaleesi::utils::fileutil as utils;
 
 use std::env;
diff --git a/src/lib.rs b/src/lib.rs
index c210fb5..5488eca 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,22 +1,8 @@
-pub mod agenda;
-pub mod bucketable;
-pub mod cal;
-pub mod copy;
+pub mod actions;
 pub mod config;
 pub mod defaults;
-pub mod edit;
 pub mod icalwrap;
-pub mod index;
-pub mod indextime;
-pub mod list;
-pub mod modify;
-pub mod new;
-pub mod prettyprint;
-pub mod select;
 pub mod selectors;
-pub mod seq;
-pub mod show;
-pub mod unroll;
 pub mod utils;
 #[cfg(test)]
 pub mod testutils;