diff --git a/aquatic_common/src/access_list.rs b/aquatic_common/src/access_list.rs index a038c74..93b8373 100644 --- a/aquatic_common/src/access_list.rs +++ b/aquatic_common/src/access_list.rs @@ -11,11 +11,11 @@ use serde::{Deserialize, Serialize}; #[serde(rename_all = "lowercase")] pub enum AccessListMode { /// Only serve torrents with info hash present in file - Require, + White, /// Do not serve torrents if info hash present in file - Forbid, + Black, /// Turn off access list functionality - Ignore, + Off, } #[derive(Clone, Debug, Serialize, Deserialize)] @@ -31,7 +31,7 @@ impl Default for AccessListConfig { fn default() -> Self { Self { path: "".into(), - mode: AccessListMode::Ignore, + mode: AccessListMode::Off, } } } @@ -70,9 +70,9 @@ impl AccessList { pub fn allows(&self, list_mode: AccessListMode, info_hash_bytes: &[u8; 20]) -> bool { match list_mode { - AccessListMode::Require => self.0.load().contains(info_hash_bytes), - AccessListMode::Forbid => !self.0.load().contains(info_hash_bytes), - AccessListMode::Ignore => true, + AccessListMode::White => self.0.load().contains(info_hash_bytes), + AccessListMode::Black => !self.0.load().contains(info_hash_bytes), + AccessListMode::Off => true, } } } diff --git a/aquatic_http/src/lib/tasks.rs b/aquatic_http/src/lib/tasks.rs index 5cbe755..3273ebd 100644 --- a/aquatic_http/src/lib/tasks.rs +++ b/aquatic_http/src/lib/tasks.rs @@ -6,12 +6,12 @@ use crate::{common::*, config::Config}; pub fn update_access_list(config: &Config, state: &State) { match config.access_list.mode { - AccessListMode::Require | AccessListMode::Forbid => { + AccessListMode::White | AccessListMode::Black => { if let Err(err) = state.access_list.update_from_path(&config.access_list.path) { ::log::error!("Couldn't update access list: {:?}", err); } } - AccessListMode::Ignore => {} + AccessListMode::Off => {} } } diff --git a/aquatic_udp/src/lib/tasks.rs b/aquatic_udp/src/lib/tasks.rs index 83e7f87..83acd3b 100644 --- a/aquatic_udp/src/lib/tasks.rs +++ b/aquatic_udp/src/lib/tasks.rs @@ -10,12 +10,12 @@ use crate::config::Config; pub fn update_access_list(config: &Config, state: &State) { match config.access_list.mode { - AccessListMode::Require | AccessListMode::Forbid => { + AccessListMode::White | AccessListMode::Black => { if let Err(err) = state.access_list.update_from_path(&config.access_list.path) { ::log::error!("Update access list from path: {:?}", err); } } - AccessListMode::Ignore => {} + AccessListMode::Off => {} } } diff --git a/aquatic_ws/src/lib/tasks.rs b/aquatic_ws/src/lib/tasks.rs index 683588e..55cb62d 100644 --- a/aquatic_ws/src/lib/tasks.rs +++ b/aquatic_ws/src/lib/tasks.rs @@ -6,12 +6,12 @@ use crate::config::Config; pub fn update_access_list(config: &Config, state: &State) { match config.access_list.mode { - AccessListMode::Require | AccessListMode::Forbid => { + AccessListMode::White | AccessListMode::Black => { if let Err(err) = state.access_list.update_from_path(&config.access_list.path) { ::log::error!("Couldn't update access list: {:?}", err); } } - AccessListMode::Ignore => {} + AccessListMode::Off => {} } }