Skip to content

refactor: generate idiomatic Motoko for __dfx_asset_path #322

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

Merged
mergify merged 2 commits into from
Jan 16, 2020
Merged

refactor: generate idiomatic Motoko for __dfx_asset_path #322

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf9057
refactor: generate idiomatic Motoko for __dfx_asset_path
ggreif Jan 16, 2020
57a32f0
Remove redundant semi
ggreif Jan 16, 2020
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
16 changes: 8 additions & 8 deletions src/dfx/src/commands/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,16 @@ pub fn construct() -> App<'static, 'static> {

fn get_asset_fn(assets: &AssetMap) -> String {
// Create the if/else series.
let mut if_else = String::new();
let mut cases = String::new();
assets.iter().for_each(|(filename, content)| {
if_else += format!(
r#"if (path == "{}") {par} return "{}"; {end};{endline}"#,
cases += format!(
r#"case "{}" "{}";{endline}"#,
filename,
content
.replace("\\", "\\\\")
.replace("\"", "\\\"")
.replace("\n", "\\n")
.replace("\r", ""),
par = "{",
end = "}",
endline = "\n"
)
.as_str();
Expand All @@ -53,11 +51,13 @@ fn get_asset_fn(assets: &AssetMap) -> String {
format!(
r#"
public query func __dfx_asset_path(path: Text): async Text {par}
{}
return "";
switch path {par}
{}
case _ {par}assert false; ""{end}
{end}
{end};
"#,
if_else,
cases,
par = "{",
end = "}"
)
Expand Down