pyrite/torn-api.rs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

use IntoSelector trait for key pool requests

Browse source
This commit is contained in:
TotallyNot 2023-06-13 17:05:30 +02:00
parent 6da09226a6
commit 1589811de3
4 changed files with 41 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
torn-key-pool/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "torn-key-pool"
version = "0.6.0"
version = "0.6.1"
edition = "2021"
authors = ["Pyrit [2111649]"]
license = "MIT"

16
torn-key-pool/src/lib.rs
View file

@ -29,8 +29,8 @@ where
Response(ResponseError),
}
pub trait ApiKey: Sync + Send {
type IdType: PartialEq + Eq + std::hash::Hash + Send + Sync;
pub trait ApiKey: Sync + Send + std::fmt::Debug + Clone {
type IdType: PartialEq + Eq + std::hash::Hash + Send + Sync + std::fmt::Debug + Clone;
fn value(&self) -> &str;
@ -66,7 +66,7 @@ where
Self::Key(_) | Self::UserId(_) | Self::Id(_) => None,
Self::Has(domain) => domain.fallback().map(Self::Has),
Self::OneOf(domains) => {
let fallbacks: Vec<_> = domains.into_iter().filter_map(|d| d.fallback()).collect();
let fallbacks: Vec<_> = domains.iter().filter_map(|d| d.fallback()).collect();
if fallbacks.is_empty() {
None
} else {
@ -176,7 +176,7 @@ where
{
storage: &'a S,
comment: Option<&'a str>,
domain: S::Domain,
selector: KeySelector<S::Key, S::Domain>,
_marker: std::marker::PhantomData<C>,
}
@ -184,10 +184,14 @@ impl<'a, C, S> KeyPoolExecutor<'a, C, S>
where
S: KeyPoolStorage,
{
pub fn new(storage: &'a S, domain: S::Domain, comment: Option<&'a str>) -> Self {
pub fn new(
storage: &'a S,
selector: KeySelector<S::Key, S::Domain>,
comment: Option<&'a str>,
) -> Self {
Self {
storage,
domain,
selector,
comment,
_marker: std::marker::PhantomData,
}

19
torn-key-pool/src/local.rs
View file

@ -7,7 +7,7 @@ use torn_api::{
ApiRequest, ApiResponse, ApiSelection, ResponseError,
};
use crate::{ApiKey, KeyPoolError, KeyPoolExecutor, KeyPoolStorage};
use crate::{ApiKey, KeyPoolError, KeyPoolExecutor, KeyPoolStorage, IntoSelector};
#[async_trait(?Send)]
impl<'client, C, S> RequestExecutor<C> for KeyPoolExecutor<'client, C, S>
@ -30,7 +30,7 @@ where
loop {
let key = self
.storage
.acquire_key(self.domain.clone())
.acquire_key(self.selector.clone())
.await
.map_err(|e| KeyPoolError::Storage(Arc::new(e)))?;
let url = request.url(key.value(), id.as_deref());
@ -66,7 +66,7 @@ where
{
let keys = match self
.storage
.acquire_many_keys(self.domain.clone(), ids.len() as i64)
.acquire_many_keys(self.selector.clone(), ids.len() as i64)
.await
{
Ok(keys) => keys,
@ -114,7 +114,7 @@ where
Ok(res) => return (id, Ok(res)),
};
key = match self.storage.acquire_key(self.domain.clone()).await {
key = match self.storage.acquire_key(self.selector.clone()).await {
Ok(k) => k,
Err(why) => return (id, Err(Self::Error::Storage(Arc::new(why)))),
};
@ -150,25 +150,26 @@ where
}
}
pub fn torn_api(&self, domain: S::Domain) -> ApiProvider<C, KeyPoolExecutor<C, S>> {
pub fn torn_api<I>(&self, selector: I) -> ApiProvider<C, KeyPoolExecutor<C, S>> where I: IntoSelector<S::Key, S::Domain> {
ApiProvider::new(
&self.client,
KeyPoolExecutor::new(&self.storage, domain, self.comment.as_deref()),
KeyPoolExecutor::new(&self.storage, selector.into_selector(), self.comment.as_deref()),
)
}
}
pub trait WithStorage {
fn with_storage<'a, S>(
fn with_storage<'a, S, I>(
&'a self,
storage: &'a S,
domain: S::Domain,
selector: I
) -> ApiProvider<Self, KeyPoolExecutor<Self, S>>
where
Self: ApiClient + Sized,
S: KeyPoolStorage + 'static,
I: IntoSelector<S::Key, S::Domain>
{
ApiProvider::new(self, KeyPoolExecutor::new(storage, domain, None))
ApiProvider::new(self, KeyPoolExecutor::new(storage, selector.into_selector(), None))
}
}

29
torn-key-pool/src/send.rs
View file

@ -7,7 +7,7 @@ use torn_api::{
ApiRequest, ApiResponse, ApiSelection, ResponseError,
};
use crate::{ApiKey, KeyPoolError, KeyPoolExecutor, KeyPoolStorage};
use crate::{ApiKey, IntoSelector, KeyPoolError, KeyPoolExecutor, KeyPoolStorage};
#[async_trait]
impl<'client, C, S> RequestExecutor<C> for KeyPoolExecutor<'client, C, S>
@ -30,7 +30,7 @@ where
loop {
let key = self
.storage
.acquire_key(self.domain.clone())
.acquire_key(self.selector.clone())
.await
.map_err(|e| KeyPoolError::Storage(Arc::new(e)))?;
let url = request.url(key.value(), id.as_deref());
@ -66,7 +66,7 @@ where
{
let keys = match self
.storage
.acquire_many_keys(self.domain.clone(), ids.len() as i64)
.acquire_many_keys(self.selector.clone(), ids.len() as i64)
.await
{
Ok(keys) => keys,
@ -114,7 +114,7 @@ where
Ok(res) => return (id, Ok(res)),
};
key = match self.storage.acquire_key(self.domain.clone()).await {
key = match self.storage.acquire_key(self.selector.clone()).await {
Ok(k) => k,
Err(why) => return (id, Err(Self::Error::Storage(Arc::new(why)))),
};
@ -150,25 +150,36 @@ where
}
}
pub fn torn_api(&self, domain: S::Domain) -> ApiProvider<C, KeyPoolExecutor<C, S>> {
pub fn torn_api<I>(&self, selector: I) -> ApiProvider<C, KeyPoolExecutor<C, S>>
where
I: IntoSelector<S::Key, S::Domain>,
{
ApiProvider::new(
&self.client,
KeyPoolExecutor::new(&self.storage, domain, self.comment.as_deref()),
KeyPoolExecutor::new(
&self.storage,
selector.into_selector(),
self.comment.as_deref(),
),
)
}
}
pub trait WithStorage {
fn with_storage<'a, S>(
fn with_storage<'a, S, I>(
&'a self,
storage: &'a S,
domain: S::Domain,
selector: I,
) -> ApiProvider<Self, KeyPoolExecutor<Self, S>>
where
Self: ApiClient + Sized,
S: KeyPoolStorage + Send + Sync + 'static,
I: IntoSelector<S::Key, S::Domain>,
{
ApiProvider::new(self, KeyPoolExecutor::new(storage, domain, None))
ApiProvider::new(
self,
KeyPoolExecutor::new(storage, selector.into_selector(), None),
)
}
}