Skip to content

Commit

Permalink
refactor: split server crate into server and cli
Browse files Browse the repository at this point in the history
  • Loading branch information
meowtec committed Apr 16, 2023
1 parent 0b40a16 commit 840ff47
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
- name: Build the cli
uses: taiki-e/upload-rust-binary-action@v1
with:
bin: lansend-server
archive: cli-$tag-$target
bin: lansend
archive: lansend-cli-$tag-$target
target: ${{ matrix.target }}
token: ${{ secrets.GITHUB_TOKEN }}
13 changes: 11 additions & 2 deletions 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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
members = [
"packages/launcher/src-tauri",
"packages/server",
"packages/cli",
]

[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"scripts": {
"dev:app": "cd packages/launcher && pnpm run tauri dev",
"dev:cli": "cd packages/server && cargo run -- --verbose",
"dev:cli": "cd packages/cli && cargo run",
"tsc": "tsc --build",
"lint:js": "eslint --ext .js,.jsx,.ts,.tsx packages",
"build:web": "cd packages/web && pnpm run build",
Expand Down
13 changes: 13 additions & 0 deletions packages/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "lansend"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
clap = { version = "4.1", features = ["derive"] }
env_logger = "0.10"
tokio = { version = "1.26", features = ["rt", "rt-multi-thread", "macros", "fs"] }
lansend-server = { path = "../server" }
local-ip-address = { git = "https://github.com/meowtec/local-ip-address.git", branch = "feat/unix" }
2 changes: 1 addition & 1 deletion packages/server/src/main.rs → packages/cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct Args {
port: u16,
}

#[actix_web::main]
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
let args = Args::parse();

Expand Down
2 changes: 0 additions & 2 deletions packages/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ anyhow = "1.0"
futures-core = "0.3"
futures-util = "0.3"
log = "0.4"
env_logger = "0.10"
indexmap = "1.9"
include_dir = "0.7"
mime = "0.3"
mime_guess = "2"
sled = "0.34"
clap = { version = "4.1.8", features = ["derive"] }
4 changes: 2 additions & 2 deletions packages/server/src/center.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl PostOfficeInner {

let message = WsMessageToClient::Users(self.get_user_list());

log::info!("PostOffice actor broadcast to all users");
log::debug!("PostOffice actor broadcast to all users");
self.send_message_to_all(&message);
}
}
Expand Down Expand Up @@ -179,7 +179,7 @@ impl Actor for PostOffice {
type Context = Context<Self>;

fn started(&mut self, ctx: &mut Self::Context) {
log::info!("PostOffice actor started");
log::debug!("PostOffice actor started");
self.start_users_interval(ctx);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ impl LansendServer {
let port = self.port;
let data_dir = self.data_dir.clone();
data_dir.ensure_dirs().await?;
log::info!("Data dir is: {:?}", &data_dir.path());
log::debug!("Data dir: {:?}", &data_dir.path());

let key = match self.key.as_ref() {
Some(key) => key.clone(),
Expand Down

0 comments on commit 840ff47

Please sign in to comment.