Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added --port option, solving Issue #27 #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added --port option, solving Issue #27 #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b6d907
Added --port flag
Jan 1, 2024
8111daa
Made script arg optional
franydev Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ struct Options {
///
/// The script will be run at plugin-level security.
#[structopt(long("script"))]
script_path: PathBuf,
script_path: Option<PathBuf>,

#[structopt(long("port"))]
port: Option<u16>,
}

fn run(options: Options) -> Result<i32, anyhow::Error> {
Expand All @@ -35,6 +38,7 @@ fn run(options: Options) -> Result<i32, anyhow::Error> {
// user that the place is read-only because of a .lock file.
let temp_place_folder = tempdir()?;
let temp_place_path;
let port_num: u16;

match &options.place_path {
Some(place_path) => {
Expand All @@ -55,15 +59,35 @@ fn run(options: Options) -> Result<i32, anyhow::Error> {
}
}

let script_contents = fs::read_to_string(&options.script_path)?;
match &options.port {
Some(port) => {
port_num = *port;
},
_ => {
port_num = 50312;
}
}

let script_contents: String;

match &options.script_path {
Some(script_path) => {
script_contents = fs::read_to_string(script_path)?;
},
_ => {
script_contents = String::new();
}
}



// Generate a random, unique ID for this session. The plugin we inject will
// compare this value with the one reported by the server and abort if they
// don't match.
let server_id = format!("run-in-roblox-{:x}", rand::random::<u128>());

let place_runner = PlaceRunner {
port: 50312,
port: port_num,
place_path: temp_place_path.clone(),
server_id: server_id.clone(),
lua_script: script_contents.clone(),
Expand Down