chore(nextcloud): remove duplicate client
This commit is contained in:
parent
e3e766ed82
commit
3d48e2f408
1 changed files with 2 additions and 136 deletions
|
@ -1,19 +1,12 @@
|
||||||
use bytes::Bytes;
|
|
||||||
//
|
//
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use kxio::net::{Net, ReqBuilder};
|
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
api_result::APIResult,
|
|
||||||
execute::Execute,
|
execute::Execute,
|
||||||
f,
|
|
||||||
nextcloud::{
|
nextcloud::{
|
||||||
card::{Create, NextcloudCardCommand},
|
card::NextcloudCardCommand,
|
||||||
deck::NextcloudDeckCommand,
|
deck::NextcloudDeckCommand,
|
||||||
model::{
|
model::{NextcloudBoardId, NextcloudHostname, NextcloudPassword, NextcloudUsername},
|
||||||
Board, Card, NextcloudBoardId, NextcloudHostname, NextcloudPassword, NextcloudStackId,
|
|
||||||
NextcloudUsername, Stack,
|
|
||||||
},
|
|
||||||
stack::NextcloudStackCommand,
|
stack::NextcloudStackCommand,
|
||||||
},
|
},
|
||||||
FullCtx,
|
FullCtx,
|
||||||
|
@ -35,133 +28,6 @@ pub(crate) struct DeckClient<'ctx> {
|
||||||
password: &'ctx NextcloudPassword,
|
password: &'ctx NextcloudPassword,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Uses the API described here: https://deck.readthedocs.io/en/stable/API/#cards
|
|
||||||
impl<'ctx> DeckClient<'ctx> {
|
|
||||||
pub fn new(ctx: &'ctx FullCtx) -> Self {
|
|
||||||
Self {
|
|
||||||
ctx,
|
|
||||||
hostname: &ctx.cfg.nextcloud.hostname,
|
|
||||||
username: &ctx.cfg.nextcloud.username,
|
|
||||||
password: &ctx.cfg.nextcloud.password,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn url(&self, path: impl Into<String>) -> String {
|
|
||||||
f!(
|
|
||||||
"https://{}/index.php/apps/deck/api/v1.0/{}",
|
|
||||||
self.hostname,
|
|
||||||
path.into()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn request<T: for<'a> serde::Deserialize<'a>>(
|
|
||||||
&self,
|
|
||||||
url: impl Into<String>,
|
|
||||||
custom: fn(&Net, String) -> ReqBuilder,
|
|
||||||
) -> APIResult<T> {
|
|
||||||
APIResult::new(
|
|
||||||
custom(&self.ctx.net, self.url(url))
|
|
||||||
.basic_auth(self.username.as_str(), Some(self.password.as_str()))
|
|
||||||
.header("accept", "application/json")
|
|
||||||
.header("content-type", "application/json")
|
|
||||||
.send()
|
|
||||||
.await,
|
|
||||||
&self.ctx.prt,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn request_with_body<T: for<'a> serde::Deserialize<'a>>(
|
|
||||||
&self,
|
|
||||||
url: impl Into<String>,
|
|
||||||
body: impl Into<Bytes>,
|
|
||||||
custom: fn(&Net, String) -> ReqBuilder,
|
|
||||||
) -> APIResult<T> {
|
|
||||||
APIResult::new(
|
|
||||||
custom(&self.ctx.net, self.url(url))
|
|
||||||
.basic_auth(self.username.as_str(), Some(self.password.as_str()))
|
|
||||||
.header("accept", "application/json")
|
|
||||||
.header("content-type", "application/json")
|
|
||||||
.body(body)
|
|
||||||
.send()
|
|
||||||
.await,
|
|
||||||
&self.ctx.prt,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_boards(&self) -> APIResult<Vec<Board>> {
|
|
||||||
self.request("boards", |net, url| net.get(url)).await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_board(&self, board_id: NextcloudBoardId) -> APIResult<Board> {
|
|
||||||
self.request(f!("boards/{board_id}"), |net, url| net.get(url))
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn create_board(&self, title: &str, color: &str) -> APIResult<Board> {
|
|
||||||
self.request_with_body(
|
|
||||||
"boards",
|
|
||||||
serde_json::json!({
|
|
||||||
"title": title,
|
|
||||||
"color": color
|
|
||||||
})
|
|
||||||
.to_string(),
|
|
||||||
|net, url| net.post(url),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_stacks(&self, board_id: NextcloudBoardId) -> APIResult<Vec<Stack>> {
|
|
||||||
self.request(f!("boards/{board_id}/stacks"), |net, url| net.get(url))
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_stack(
|
|
||||||
&self,
|
|
||||||
board_id: NextcloudBoardId,
|
|
||||||
stack_id: NextcloudStackId,
|
|
||||||
) -> APIResult<Stack> {
|
|
||||||
self.request(f!("boards/{board_id}/stacks/{stack_id}"), |net, url| {
|
|
||||||
net.get(url)
|
|
||||||
})
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) async fn create_card(&self, create: &Create) -> APIResult<Card> {
|
|
||||||
let mut body = serde_json::json!({
|
|
||||||
"title": create.title,
|
|
||||||
});
|
|
||||||
|
|
||||||
if let Some(desc) = &create.description {
|
|
||||||
body["description"] = serde_json::Value::String(desc.to_string());
|
|
||||||
}
|
|
||||||
|
|
||||||
self.request_with_body(
|
|
||||||
format!(
|
|
||||||
"boards/{}/stacks/{}/cards",
|
|
||||||
self.ctx.cfg.nextcloud.board_id, create.stack_id
|
|
||||||
),
|
|
||||||
body.to_string(),
|
|
||||||
|net, url| net.post(url),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_card(
|
|
||||||
&self,
|
|
||||||
board_id: NextcloudBoardId,
|
|
||||||
stack_id: NextcloudStackId,
|
|
||||||
card_id: model::NextcloudCardId,
|
|
||||||
) -> APIResult<Card> {
|
|
||||||
self.request(
|
|
||||||
f!("boards/{board_id}/stacks/{stack_id}/cards/{card_id}"),
|
|
||||||
|net, url| net.get(url),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Parser, Debug)]
|
#[derive(Parser, Debug)]
|
||||||
pub(crate) enum NextcloudCommand {
|
pub(crate) enum NextcloudCommand {
|
||||||
#[clap(subcommand)]
|
#[clap(subcommand)]
|
||||||
|
|
Loading…
Reference in a new issue