hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ServeSession -> Session

Browse source
This commit is contained in:
Lucien Greathouse 2018-08-19 21:53:25 -07:00
parent 214c93dc95
commit 1129c2e679
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/src/commands/serve.rs
View file

@ -7,7 +7,7 @@ use std::{
use ::{ use ::{
project::Project, project::Project,
web::Server, web::Server,
serve_session::ServeSession, session::Session,
roblox_studio, roblox_studio,
}; };
@ -25,7 +25,7 @@ pub fn serve(fuzzy_project_location: &Path) {
roblox_studio::install_bundled_plugin().unwrap(); roblox_studio::install_bundled_plugin().unwrap();
let session = Arc::new(ServeSession::new(project)); let session = Arc::new(Session::new(project));
let server = Server::new(Arc::from(session)); let server = Server::new(Arc::from(session));
println!("Server listening on port 8000."); println!("Server listening on port 8000.");

2
server/src/lib.rs
View file

@ -17,6 +17,6 @@ pub mod pathext;
pub mod project; pub mod project;
pub mod rbx; pub mod rbx;
pub mod roblox_studio; pub mod roblox_studio;
pub mod serve_session; pub mod session;
pub mod web; pub mod web;
pub mod web_util; pub mod web_util;

8
server/src/serve_session.rs → server/src/session.rs
View file

@ -8,15 +8,15 @@ use ::{
project::Project, project::Project,
}; };
pub struct ServeSession { pub struct Session {
project: Project, project: Project,
message_queue: Arc<MessageQueue>, message_queue: Arc<MessageQueue>,
tree: Arc<RbxTree>, tree: Arc<RbxTree>,
} }
impl ServeSession { impl Session {
pub fn new(project: Project) -> ServeSession { pub fn new(project: Project) -> Session {
ServeSession { Session {
project, project,
message_queue: Arc::new(MessageQueue::new()), message_queue: Arc::new(MessageQueue::new()),
tree: Arc::new(RbxTree::new()), tree: Arc::new(RbxTree::new()),

6
server/src/web.rs
View file

@ -10,7 +10,7 @@ use ::{
message_queue::Message, message_queue::Message,
project::Project, project::Project,
rbx::RbxInstance, rbx::RbxInstance,
serve_session::ServeSession, session::Session,
}; };
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
@ -39,13 +39,13 @@ pub struct SubscribeResponse<'a> {
} }
pub struct Server { pub struct Server {
session: Arc<ServeSession>, session: Arc<Session>,
server_version: &'static str, server_version: &'static str,
server_id: String, server_id: String,
} }
impl Server { impl Server {
pub fn new(session: Arc<ServeSession>) -> Server { pub fn new(session: Arc<Session>) -> Server {
let server_id = rand::random::<u64>().to_string(); let server_id = rand::random::<u64>().to_string();
Server { Server {