binary refactor

src/bin/client.rs

@@ -1,8 +0,0 @@
-#![windows_subsystem = "windows"]
-
-use openworm::{client::App, net::install_crypto_provider};
-
-fn main() {
-    install_crypto_provider();
-    App::run();
-}

src/bin/openworm-client/app.rs

@@ -7,7 +7,7 @@ use winit::{
     window::{Window, WindowId},
 };
 
-use crate::client::ClientEvent;
+use crate::ClientEvent;
 
 use super::Client;
 

src/bin/openworm-client/main.rs

@@ -1,29 +1,33 @@
-use std::sync::Arc;
+#![windows_subsystem = "windows"]
 
-pub use app::App;
+use crate::{app::App, net::NetSender, ui::*};
+pub use app::AppHandle;
 use arboard::Clipboard;
 use input::Input;
 use iris::prelude::*;
+use openworm::{
+    net::{ClientMsg, ServerMsg, install_crypto_provider},
+    rsc::{CLIENT_DATA, ClientData, DataDir},
+};
 use render::Renderer;
+use std::sync::Arc;
 use winit::{
     event::{Ime, WindowEvent},
     event_loop::{ActiveEventLoop, EventLoopProxy},
     window::Window,
 };
 
-use crate::{
-    client::ui::{Edited, Submit, main_view, msg_widget},
-    net::{ClientMsg, ServerMsg, client::NetSender},
-    rsc::{CLIENT_DATA, ClientData, DataDir},
-};
+fn main() {
+    install_crypto_provider();
+    App::run();
+}
 
 mod app;
 mod input;
+mod net;
 mod render;
 mod ui;
 
-pub use app::AppHandle;
-
 pub enum ClientEvent {
     Connect { send: NetSender, username: String },
     ServerMsg(ServerMsg),

src/bin/openworm-client/net.rs

@@ -1,10 +1,6 @@
-use crate::{
-    client::{AppHandle, ClientEvent},
-    net::{
-        ClientMsg, SERVER_NAME, ServerMsg,
-        no_cert::SkipServerVerification,
-        transfer::{RecvHandler, recv_uni, send_uni},
-    },
+use crate::{AppHandle, ClientEvent};
+use openworm::net::{
+    ClientMsg, RecvHandler, SERVER_NAME, ServerMsg, SkipServerVerification, recv_uni, send_uni,
 };
 use quinn::{
     ClientConfig, Connection, Endpoint, IdleTimeout, TransportConfig,

src/bin/openworm-client/ui.rs

@@ -1,13 +1,11 @@
 use iris::prelude::*;
 use len_fns::*;
+use openworm::net::{ClientMsg, Msg};
 use winit::dpi::{LogicalPosition, LogicalSize};
 
 use crate::{
-    client::Client,
-    net::{
-        ClientMsg, Msg,
-        client::{ConnectInfo, NetSender, connect},
-    },
+    Client,
+    net::{ConnectInfo, NetSender, connect},
 };
 
 #[derive(Eq, PartialEq, Hash, Clone)]

src/bin/server.rs

@@ -1,6 +0,0 @@
-use openworm::{net::install_crypto_provider, server::run_server};
-
-fn main() {
-    install_crypto_provider();
-    run_server();
-}

src/bin/server/main.rs

@@ -1,9 +1,8 @@
-use crate::{
-    net::{
-        ClientMsg, Msg, ServerMsg,
-        server::{ClientSender, ConAccepter, listen},
-        transfer::{DisconnectReason, RecvHandler},
-    },
+mod net;
+
+use net::{ClientSender, ConAccepter, listen};
+use openworm::{
+    net::{ClientMsg, DisconnectReason, Msg, RecvHandler, ServerMsg, install_crypto_provider},
     rsc::DataDir,
 };
 use std::{
@@ -15,6 +14,11 @@ use std::{
 };
 use tokio::sync::RwLock;
 
+fn main() {
+    install_crypto_provider();
+    run_server();
+}
+
 #[tokio::main]
 pub async fn run_server() {
     let dir = DataDir::default();

src/bin/server/net.rs

@@ -1,6 +1,5 @@
-use crate::net::{
-    ClientMsg, SERVER_NAME, ServerMsg,
-    transfer::{RecvHandler, SendResult, recv_uni, send_uni},
+use openworm::net::{
+    ClientMsg, RecvHandler, SERVER_NAME, SendResult, ServerMsg, recv_uni, send_uni,
 };
 use quinn::{
     Connection, Endpoint, ServerConfig,

src/lib.rs

@@ -1,4 +1,2 @@
-pub mod client;
 pub mod net;
-pub mod server;
 pub mod rsc;

src/net/mod.rs

@@ -1,9 +1,10 @@
 use bincode::config::Configuration;
 
-pub mod client;
 mod no_cert;
-pub mod server;
-pub mod transfer;
+mod transfer;
+
+pub use no_cert::*;
+pub use transfer::*;
 
 pub const SERVER_NAME: &str = "openworm";
 pub const BINCODE_CONFIG: Configuration = bincode::config::standard();