aboutsummaryrefslogtreecommitdiff
path: root/src/manager
diff options
context:
space:
mode:
authorHristo Venev <hristo@venev.name>2020-02-04 22:58:37 +0100
committerHristo Venev <hristo@venev.name>2020-02-04 22:58:37 +0100
commit80589fb9c08e3c15b31db51c7a40767ff6fbf33d (patch)
treee75fc9e28a706e89c92fa04af8cbf51b8a574454 /src/manager
parente6c406879696a53d40f175d11d14a55d9480a57e (diff)
Move source names inside the source sections.
This means that the order of the sources is preserved.
Diffstat (limited to 'src/manager')
-rw-r--r--src/manager/builder.rs4
-rw-r--r--src/manager/mod.rs8
-rw-r--r--src/manager/updater.rs8
3 files changed, 9 insertions, 11 deletions
diff --git a/src/manager/builder.rs b/src/manager/builder.rs
index 9c2ad15..e302f7e 100644
--- a/src/manager/builder.rs
+++ b/src/manager/builder.rs
@@ -18,7 +18,7 @@ pub struct Error {
impl Error {
fn new(err: &'static str, src: &Source, p: &proto::Peer, important: bool) -> Self {
Self {
- src: src.name.clone(),
+ src: src.config.name.clone(),
peer: p.public_key,
important,
err,
@@ -170,7 +170,7 @@ fn peer_contact<'a>(
if let Some(pc) = gc.peers.get(&p.public_key) {
if let Some(ref want_src) = &pc.source {
- if *want_src != src.name {
+ if *want_src != src.config.name {
return Err(Error::new("peer source not allowed", src, p, true));
}
}
diff --git a/src/manager/mod.rs b/src/manager/mod.rs
index b7fb8c2..d4799a7 100644
--- a/src/manager/mod.rs
+++ b/src/manager/mod.rs
@@ -9,7 +9,6 @@ use std::path::PathBuf;
use std::time::{Duration, Instant, SystemTime};
struct Source {
- name: String,
config: config::Source,
data: proto::Source,
next_update: Instant,
@@ -50,8 +49,8 @@ impl Manager {
let _ = m.current_load();
- for (name, cfg) in c.sources {
- m.add_source(name, cfg)?;
+ for cfg in c.sources {
+ m.add_source(cfg)?;
}
Ok(m)
@@ -92,9 +91,8 @@ impl Manager {
}
}
- fn add_source(&mut self, name: String, config: config::Source) -> io::Result<()> {
+ fn add_source(&mut self, config: config::Source) -> io::Result<()> {
let mut s = Source {
- name,
config,
data: proto::Source::empty(),
next_update: Instant::now(),
diff --git a/src/manager/updater.rs b/src/manager/updater.rs
index 0245e95..db24d6e 100644
--- a/src/manager/updater.rs
+++ b/src/manager/updater.rs
@@ -20,7 +20,7 @@ impl Updater {
fn cache_path(&self, s: &Source) -> Option<PathBuf> {
let mut p = self.config.cache_directory.as_ref()?.clone();
- p.push(&s.name);
+ p.push(&s.config.name);
Some(p)
}
@@ -34,7 +34,7 @@ impl Updater {
match fileutil::update(&path, &data) {
Ok(()) => {}
Err(e) => {
- eprintln!("<4>Failed to cache [{}]: {}", &src.name, e);
+ eprintln!("<4>Failed to cache [{}]: {}", &src.config.name, e);
}
}
}
@@ -51,7 +51,7 @@ impl Updater {
return false;
}
Err(e) => {
- eprintln!("<3>Failed to read [{}] from cache: {}", &src.name, e);
+ eprintln!("<3>Failed to read [{}] from cache: {}", &src.config.name, e);
return false;
}
};
@@ -60,7 +60,7 @@ impl Updater {
src.data = match serde::Deserialize::deserialize(&mut de) {
Ok(r) => r,
Err(e) => {
- eprintln!("<3>Failed to load [{}] from cache: {}", &src.name, e);
+ eprintln!("<3>Failed to load [{}] from cache: {}", &src.config.name, e);
return false;
}
};