Skip to content

Commit

Permalink
Merge pull request #384 from ozghimire/platform-api
Browse files Browse the repository at this point in the history
Refactoring as per review
  • Loading branch information
hannobraun authored Mar 21, 2022
2 parents 3f65f50 + 0254274 commit f8dc155
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion fj-host/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl Model {
let src_path = path.join("src");

let lib_path = {
let file = HostPlatform::host_file_name(&name);
let file = HostPlatform::lib_file_name(&name);
let target_dir = target_dir.unwrap_or_else(|| path.join("target"));
target_dir.join("debug").join(file)
};
Expand Down
27 changes: 16 additions & 11 deletions fj-host/src/platform.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Represents platform trait
trait Platform {
fn file_name(name: &str) -> String;
pub trait Platform {
fn model_lib_file_name(&self, name: &str) -> String;
}

// Represents all platforms supported
// Represents all supported platforms

// Mac OS
struct Macos;
Expand All @@ -13,17 +13,19 @@ struct Windows;
struct Unix;

impl Platform for Windows {
fn file_name(name: &str) -> String {
fn model_lib_file_name(&self, name: &str) -> String {
format!("{}.dll", name)
}
}

impl Platform for Macos {
fn file_name(name: &str) -> String {
fn model_lib_file_name(&self, name: &str) -> String {
format!("lib{}.dylib", name)
}
}

impl Platform for Unix {
fn file_name(name: &str) -> String {
fn model_lib_file_name(&self, name: &str) -> String {
format!("lib{}.so", name)
}
}
Expand All @@ -32,14 +34,17 @@ impl Platform for Unix {
pub struct HostPlatform;

impl HostPlatform {
pub fn host_file_name(name: &str) -> String {
pub fn get_os() -> Box<dyn Platform> {
if cfg!(windows) {
Windows::file_name(name)
Box::new(Windows)
} else if cfg!(target_os = "macos") {
Macos::file_name(name)
Box::new(Macos)
} else {
//Unix
Unix::file_name(name)
Box::new(Unix)
}
}

pub fn lib_file_name(name: &str) -> String {
Self::get_os().model_lib_file_name(name)
}
}

0 comments on commit f8dc155

Please sign in to comment.