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

Implement Project, which is more direct

Browse source
This commit is contained in:
Lucien Greathouse 2018-06-05 00:02:24 -07:00
parent 6b9367c370
commit 0a05ab4d69
3 changed files with 121 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,19 +1,17 @@
use std::collections::HashMap;
use std::path::PathBuf;
use std::process;
use std::fs;
use rand;
use project::SourceProject;
use project::Project;
use web;
use session::{Session, SessionConfig};
use partition::Partition;
pub fn serve(project_path: &PathBuf, port: Option<u64>) {
let server_id = rand::random::<u64>();
let project = match SourceProject::load(project_path) {
let project = match Project::load(project_path) {
Ok(v) => {
println!("Using project from {}", fs::canonicalize(project_path).unwrap().display());
v
@ -24,21 +22,8 @@ pub fn serve(project_path: &PathBuf, port: Option<u64>) {
},
};
let mut partitions = HashMap::new();
for (partition_name, partition) in project.partitions.iter() {
let path = fs::canonicalize(project_path.join(&partition.path)).unwrap();
let target = partition.target.split(".").map(String::from).collect::<Vec<_>>();
partitions.insert(partition_name.clone(), Partition {
path,
target,
name: partition_name.clone(),
});
}
let config = SessionConfig {
partitions: partitions.clone(),
partitions: project.partitions.clone(),
};
println!("Using session config {:#?}", config);
@ -51,7 +36,7 @@ pub fn serve(project_path: &PathBuf, port: Option<u64>) {
server_id,
rbx_session: session.get_rbx_session(),
message_session: session.get_message_session(),
partitions,
partitions: project.partitions,
};
println!("Server listening on port {}", web_config.port);