Skip to content

Commit

Permalink
use async trait
Browse files Browse the repository at this point in the history
  • Loading branch information
fuyoo authored and fuyoo committed Jul 13, 2024
1 parent 0ee41b0 commit 96cd3ad
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 28 deletions.
1 change: 1 addition & 0 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ log = { version = "0.4.21", features = [] }
tauri-plugin-shell = "2.0.0-beta.7"
redis = { version = "0.25.4", features = ["tokio-comp"] }
anyhow = "1.0.86"
async-trait = "0.1.81"

[features]
# This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!
Expand Down
3 changes: 0 additions & 3 deletions src-tauri/src/api/defines.rs

This file was deleted.

4 changes: 3 additions & 1 deletion src-tauri/src/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ use crate::api::rdb::RedisClientImpl;
#[command]
pub async fn request(rid: &str, action: &str, connection_info: rdb::ConnectionImpl, data: &str) -> tauri::Result<Response<Option<String>>> {
println!("rid: {}\naction: {}\nconnection_info: {:?}\ndata: {:?}", rid, action, connection_info, data);
let r = connection_info.into_client().unwrap().do_command::<Option<String>>(&cmd("get").arg("123"))?;
let r = connection_info.into_client().unwrap().do_command::<Option<String>>(&cmd("get").arg("123")).await?;
println!("{:#?}", r);
Ok(r_ok!(r, None))
}





9 changes: 6 additions & 3 deletions src-tauri/src/api/rdb.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use async_trait::async_trait;
use redis::{Client, Cmd, FromRedisValue};
use serde::{Deserialize, Serialize};

Expand Down Expand Up @@ -26,21 +27,23 @@ impl ConnectionImpl {
let cfg = &self.node[0];
RedisSingleClient::connect(cfg)
} else {
// 这里等下一步去实现
// next work step.
todo!()
}
}
}


#[async_trait]
pub trait RedisClientImpl {
fn do_command<T: FromRedisValue>(self, cmd: &Cmd) -> anyhow::Result<T>;
async fn do_command<T: FromRedisValue>(self, cmd: &Cmd) -> anyhow::Result<T>;
}

pub struct RedisSingleClient(Client);

#[async_trait]
impl RedisClientImpl for RedisSingleClient {
fn do_command<T: FromRedisValue>(self, cmd: &Cmd) -> anyhow::Result<T> {
async fn do_command<T: FromRedisValue>(self, cmd: &Cmd) -> anyhow::Result<T> {
let mut conn = self.0.get_connection()?;
return Ok(cmd.query::<T>(&mut conn)?);
}
Expand Down
21 changes: 0 additions & 21 deletions src/views/TabView.vue

This file was deleted.

11 changes: 11 additions & 0 deletions src/views/TabView/Data.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<script setup lang="ts">
</script>

<template>
$END$
</template>

<style scoped>
</style>
11 changes: 11 additions & 0 deletions src/views/TabView/Page.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<script setup lang="ts">
</script>

<template>
$END$
</template>

<style scoped>
</style>
11 changes: 11 additions & 0 deletions src/views/TabView/Status.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<script setup lang="ts">
</script>

<template>
$END$
</template>

<style scoped>
</style>
Empty file added src/views/TabView/index.ts
Empty file.

0 comments on commit 96cd3ad

Please sign in to comment.