Skip to content

Publish url can be set #6

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Publish url can be set #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ struct Config {
base_path: String,
remote_api: String,
listen_on: String,
publish_url: String,
registry_config: GitConfig,
poll_intervall: Option<i32>,
}
Expand Down Expand Up @@ -295,7 +296,8 @@ fn main() {
if !base_dir.exists() {
create_dir_all(base_dir.clone()).unwrap();
}
let url: &str = &config.listen_on.clone();
let url: &str = &std::env::var("PUBLISH_URL").unwrap_or(config.publish_url.clone());
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest to use the dotenv crate here instead.

let listen_on: &str = &config.listen_on.clone();
base_dir.push("index");
let repo = if !base_dir.exists() {
let repo =
Expand All @@ -306,7 +308,7 @@ fn main() {
let mut config_file = File::create(config_file_path.clone()).unwrap();
write!(
&mut config_file,
"{{\"dl\": \"http://{url}/api/v1/crates\", \"api\": \"http://{url}\"}}",
"{{\"dl\": \"{url}/api/v1/crates\", \"api\": \"{url}\"}}",
url = url
)
.unwrap();
Expand Down Expand Up @@ -388,7 +390,7 @@ fn main() {
.unwrap_or_else(|| format!("file://{}", base_dir.to_str().unwrap()))
);

Iron::new(router).http(url).unwrap();
Iron::new(router).http(listen_on).unwrap();
}

fn progress_monitor(progress: git2::Progress) -> bool {
Expand Down