summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/agenda.rs2
-rw-r--r--src/bin/khaleesi.rs2
-rw-r--r--src/bucketable.rs2
-rw-r--r--src/cal.rs2
-rw-r--r--src/config.rs2
-rw-r--r--src/copy.rs2
-rw-r--r--src/edit.rs2
-rw-r--r--src/index.rs4
-rw-r--r--src/lib.rs3
-rw-r--r--src/list.rs2
-rw-r--r--src/modify.rs2
-rw-r--r--src/new.rs2
-rw-r--r--src/prettyprint.rs2
-rw-r--r--src/select.rs2
-rw-r--r--src/selectors/daterange.rs2
-rw-r--r--src/selectors/mod.rs2
-rw-r--r--src/seq.rs2
-rw-r--r--src/show.rs2
-rw-r--r--src/sort.rs2
-rw-r--r--src/unroll.rs2
-rw-r--r--src/utils/calutil.rs (renamed from src/calutil.rs)0
-rw-r--r--src/utils/dateutil.rs (renamed from src/dateutil.rs)0
-rw-r--r--src/utils/fileutil.rs (renamed from src/utils.rs)0
-rw-r--r--src/utils/lock.rs (renamed from src/lock.rs)0
-rw-r--r--src/utils/mod.rs7
25 files changed, 27 insertions, 23 deletions
diff --git a/src/agenda.rs b/src/agenda.rs
index c90bb1e..5b98fb1 100644
--- a/src/agenda.rs
+++ b/src/agenda.rs
@@ -3,7 +3,7 @@ use itertools::Itertools;
use yansi::{Style};
use icalwrap::*;
-use utils;
+use utils::fileutil as utils;
use config::{Config,CalendarConfig};
pub fn show_events(config: &Config, lines: &mut Iterator<Item = String>) {
diff --git a/src/bin/khaleesi.rs b/src/bin/khaleesi.rs
index 99ad388..098f831 100644
--- a/src/bin/khaleesi.rs
+++ b/src/bin/khaleesi.rs
@@ -21,7 +21,7 @@ use khaleesi::seq;
use khaleesi::show;
use khaleesi::sort;
use khaleesi::unroll;
-use khaleesi::utils;
+use khaleesi::utils::fileutil as utils;
use std::env;
use std::path::{Path,PathBuf};
diff --git a/src/bucketable.rs b/src/bucketable.rs
index 1d04ce2..180e970 100644
--- a/src/bucketable.rs
+++ b/src/bucketable.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
use std::{hash, cmp};
use icalwrap::{IcalVEvent, IcalVCalendar};
-use utils;
+use utils::fileutil as utils;
pub trait Bucketable {
fn get_buckets(&self) -> Result<HashMap<String, Vec<String>>, String>;
diff --git a/src/cal.rs b/src/cal.rs
index 35ad1b0..5a8c335 100644
--- a/src/cal.rs
+++ b/src/cal.rs
@@ -2,7 +2,7 @@ use chrono::Duration;
use chrono::prelude::*;
use yansi::{Style,Color};
-use utils;
+use utils::fileutil as utils;
struct Cell {
date: NaiveDate,
diff --git a/src/config.rs b/src/config.rs
index 53517cc..f02e0dd 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -4,7 +4,7 @@ use yansi::{self,Style,Color};
use defaults;
use icalwrap::IcalVCalendar;
-use utils;
+use utils::fileutil as utils;
#[derive(Deserialize)]
#[serde(default)]
diff --git a/src/copy.rs b/src/copy.rs
index 2ce0cdb..9386c2e 100644
--- a/src/copy.rs
+++ b/src/copy.rs
@@ -1,4 +1,4 @@
-use utils;
+use utils::fileutil as utils;
pub fn do_copy(lines: &mut Iterator<Item = String>, _args: &[String]) {
diff --git a/src/edit.rs b/src/edit.rs
index 86cc08d..c5ed46f 100644
--- a/src/edit.rs
+++ b/src/edit.rs
@@ -2,7 +2,7 @@ use std::env;
use std::fs;
use std::process::Command;
-use utils;
+use utils::fileutil as utils;
pub fn do_edit(filenames: &mut Iterator<Item = String>, _args: &[String]) {
diff --git a/src/index.rs b/src/index.rs
index bfd3cd6..24c6952 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -2,10 +2,10 @@ use icalwrap::*;
use std::collections::HashMap;
use std::fs;
use std::path::{Path,PathBuf};
-use lock;
+use utils::lock;
use defaults::*;
-use utils;
+use utils::fileutil as utils;
fn add_buckets_for_calendar(buckets: &mut HashMap<String, Vec<String>>, cal: &IcalVCalendar) {
use bucketable::Bucketable;
diff --git a/src/lib.rs b/src/lib.rs
index 4f27255..8816b9c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,15 +2,12 @@ pub mod agenda;
pub mod bucketable;
pub mod cal;
pub mod copy;
-pub mod calutil;
pub mod config;
-pub mod dateutil;
pub mod defaults;
pub mod edit;
pub mod icalwrap;
pub mod index;
pub mod list;
-pub mod lock;
pub mod modify;
pub mod new;
pub mod prettyprint;
diff --git a/src/list.rs b/src/list.rs
index 215cbe7..01289f6 100644
--- a/src/list.rs
+++ b/src/list.rs
@@ -1,5 +1,5 @@
use selectors::SelectFilters;
-use utils;
+use utils::fileutil as utils;
pub fn list_by_args(filenames: &mut Iterator<Item = String>, args: &[String]) {
let filters = match SelectFilters::parse_from_args_with_range(args) {
diff --git a/src/modify.rs b/src/modify.rs
index c9e027a..4f656bd 100644
--- a/src/modify.rs
+++ b/src/modify.rs
@@ -1,5 +1,5 @@
use std::path::Path;
-use utils;
+use utils::fileutil as utils;
pub fn do_modify(lines: &mut Iterator<Item = String>, args: &[String]) {
info!("do_modify");
diff --git a/src/new.rs b/src/new.rs
index 9114902..175c4c5 100644
--- a/src/new.rs
+++ b/src/new.rs
@@ -1,4 +1,4 @@
-use utils;
+use utils::fileutil as utils;
use icalwrap::IcalVCalendar;
use defaults;
diff --git a/src/prettyprint.rs b/src/prettyprint.rs
index 80aa25a..cd3b822 100644
--- a/src/prettyprint.rs
+++ b/src/prettyprint.rs
@@ -1,7 +1,7 @@
use std::path::{Path};
use icalwrap::{IcalComponent,IcalVCalendar,IcalProperty};
-use utils;
+use utils::fileutil as utils;
pub fn shortprint_dir(dir: &Path) {
for filepath in utils::file_iter(dir) {
diff --git a/src/select.rs b/src/select.rs
index 3f30331..f9a1ba5 100644
--- a/src/select.rs
+++ b/src/select.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
use defaults;
use selectors::{SelectFilters,daterange::SelectFilterFrom,daterange::SelectFilterTo};
-use utils;
+use utils::fileutil as utils;
impl SelectFilters {
pub fn predicate_path_skip_while(&self) -> impl Fn(&PathBuf) -> bool + '_ {
diff --git a/src/selectors/daterange.rs b/src/selectors/daterange.rs
index 5caf073..05ed7a2 100644
--- a/src/selectors/daterange.rs
+++ b/src/selectors/daterange.rs
@@ -4,7 +4,7 @@ use std::str::FromStr;
use super::*;
-use dateutil;
+use utils::dateutil;
pub struct SelectFilterFrom {
pub date: Option<Date<Local>>,
diff --git a/src/selectors/mod.rs b/src/selectors/mod.rs
index 8a17d75..ec327c9 100644
--- a/src/selectors/mod.rs
+++ b/src/selectors/mod.rs
@@ -1,6 +1,6 @@
use std::collections::HashMap;
-use utils;
+use utils::fileutil as utils;
use icalwrap::IcalVEvent;
use self::daterange::{SelectFilterFrom,SelectFilterTo};
diff --git a/src/seq.rs b/src/seq.rs
index 32f20d9..cbdca21 100644
--- a/src/seq.rs
+++ b/src/seq.rs
@@ -5,7 +5,7 @@ use std::fs::rename;
use std::io;
use defaults::*;
-use utils;
+use utils::fileutil as utils;
pub fn do_seq(_args: &[String]) {
if atty::isnt(atty::Stream::Stdin) {
diff --git a/src/show.rs b/src/show.rs
index ad252a0..a18e701 100644
--- a/src/show.rs
+++ b/src/show.rs
@@ -1,6 +1,6 @@
use std::path::Path;
-use utils;
+use utils::fileutil as utils;
pub fn do_show(filenames: &mut Iterator<Item = String>, _args: &[String]) {
info!("do_show");
diff --git a/src/sort.rs b/src/sort.rs
index fc30d0b..797665d 100644
--- a/src/sort.rs
+++ b/src/sort.rs
@@ -1,4 +1,4 @@
-use utils;
+use utils::fileutil as utils;
pub fn sort_filenames_by_dtstart (files: &mut Iterator<Item = String>) {
let mut cals = utils::read_calendars_from_files(files).unwrap();
diff --git a/src/unroll.rs b/src/unroll.rs
index f29a6b9..49c4cf1 100644
--- a/src/unroll.rs
+++ b/src/unroll.rs
@@ -1,6 +1,6 @@
use std::path::Path;
-use utils;
+use utils::fileutil as utils;
pub fn do_unroll(filepath: &Path) {
let cal = utils::read_calendar_from_path(filepath).unwrap();
diff --git a/src/calutil.rs b/src/utils/calutil.rs
index 17ceea7..17ceea7 100644
--- a/src/calutil.rs
+++ b/src/utils/calutil.rs
diff --git a/src/dateutil.rs b/src/utils/dateutil.rs
index a686961..a686961 100644
--- a/src/dateutil.rs
+++ b/src/utils/dateutil.rs
diff --git a/src/utils.rs b/src/utils/fileutil.rs
index b4e9b12..b4e9b12 100644
--- a/src/utils.rs
+++ b/src/utils/fileutil.rs
diff --git a/src/lock.rs b/src/utils/lock.rs
index 4e3f77f..4e3f77f 100644
--- a/src/lock.rs
+++ b/src/utils/lock.rs
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
new file mode 100644
index 0000000..b3e6fd7
--- /dev/null
+++ b/src/utils/mod.rs
@@ -0,0 +1,7 @@
+pub mod calutil;
+pub mod dateutil;
+pub mod lock;
+pub mod fileutil;
+
+//pub use self::icalvcalendar::IcalVCalendar;
+//pub use self::calutil;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 06:33:54 +0000