This commit is contained in:
parent
fb0fa1f351
commit
ff1607d623
3 changed files with 17 additions and 22 deletions
|
@ -1,4 +1,3 @@
|
|||
|
||||
[mirror]
|
||||
repos = [
|
||||
"core",
|
||||
|
@ -6,8 +5,7 @@ repos = [
|
|||
"multilib"
|
||||
]
|
||||
|
||||
[mirrorlist]
|
||||
x86_64 = [
|
||||
mirrorlist.x86_64 = [
|
||||
"http://mirrors.kernel.org/archlinux/$repo/os/$arch",
|
||||
"https://geo.mirror.pkgbuild.com/$repo/os/$arch",
|
||||
"https://ftpmirror.infania.net/mirror/archlinux/$repo/os/$arch",
|
||||
|
@ -15,6 +13,6 @@ x86_64 = [
|
|||
"https://mirror.rackspace.com/archlinux/$repo/os/$arch"
|
||||
]
|
||||
|
||||
aarch64 = [
|
||||
mirrorlist.aarch64 = [
|
||||
"https://mirror.archlinuxarm.org/$arch/$repo/"
|
||||
]
|
||||
|
|
|
@ -31,7 +31,7 @@ impl Mirrorlist {
|
|||
impl Config {
|
||||
pub fn is_mirrored_repo(&self, repo: &str) -> bool {
|
||||
if let Some(mirrorc) = &self.mirror {
|
||||
return mirrorc.repos.iter().any(|x| x == repo);
|
||||
return mirrorc.repos.iter().any(|x| x.trim() == repo.trim());
|
||||
}
|
||||
|
||||
false
|
||||
|
|
31
src/main.rs
31
src/main.rs
|
@ -56,23 +56,20 @@ async fn launch(config: String) {
|
|||
..Default::default()
|
||||
})
|
||||
.mount_assets()
|
||||
.mount(
|
||||
"/",
|
||||
routes![
|
||||
routes::index_page,
|
||||
routes::pkg_route,
|
||||
routes::push::upload_pkg,
|
||||
routes::user::login,
|
||||
routes::user::login_post,
|
||||
routes::user::account_page,
|
||||
routes::ui::pkg_ui,
|
||||
routes::ui::repo_ui,
|
||||
routes::user::new_api_key,
|
||||
routes::user::end_session,
|
||||
routes::user::change_password,
|
||||
routes::user::change_password_post
|
||||
],
|
||||
)
|
||||
.mount("/", routes![
|
||||
routes::index_page,
|
||||
routes::pkg_route,
|
||||
routes::push::upload_pkg,
|
||||
routes::user::login,
|
||||
routes::user::login_post,
|
||||
routes::user::account_page,
|
||||
routes::ui::pkg_ui,
|
||||
routes::ui::repo_ui,
|
||||
routes::user::new_api_key,
|
||||
routes::user::end_session,
|
||||
routes::user::change_password,
|
||||
routes::user::change_password_post
|
||||
])
|
||||
.manage(config)
|
||||
.manage(shell)
|
||||
.launch()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue