From b587a87d50060fa6dc9e57f8011f8f875ca94c68 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sat, 21 Oct 2023 18:37:51 +0200
Subject: [PATCH] Move /admin/repo/update to /admin/refs/update

---
 src/server/web.rs             |  3 +--
 src/server/web/admin.rs       |  1 -
 src/server/web/admin/refs.rs  | 17 ++++++++++++++++-
 src/server/web/admin/repo.rs  | 29 -----------------------------
 src/server/web/pages/index.rs |  6 +++---
 src/server/web/paths.rs       |  4 ++--
 templates/pages/index.html    |  2 +-
 7 files changed, 23 insertions(+), 39 deletions(-)
 delete mode 100644 src/server/web/admin/repo.rs

diff --git a/src/server/web.rs b/src/server/web.rs
index 83df2d8..c75d90e 100644
--- a/src/server/web.rs
+++ b/src/server/web.rs
@@ -17,8 +17,7 @@ use self::{
             post_admin_queue_add, post_admin_queue_add_batch, post_admin_queue_decrease,
             post_admin_queue_delete, post_admin_queue_increase,
         },
-        refs::{post_admin_refs_track, post_admin_refs_untrack},
-        repo::post_admin_repo_update,
+        refs::{post_admin_refs_track, post_admin_refs_untrack, post_admin_repo_update},
     },
     api::worker::{
         get_api_worker_bench_repo_by_hash_tree_tar_gz, get_api_worker_repo_by_hash_tree_tar_gz,
diff --git a/src/server/web/admin.rs b/src/server/web/admin.rs
index 0e97f7b..2f057bc 100644
--- a/src/server/web/admin.rs
+++ b/src/server/web/admin.rs
@@ -1,3 +1,2 @@
 pub mod queue;
 pub mod refs;
-pub mod repo;
diff --git a/src/server/web/admin/refs.rs b/src/server/web/admin/refs.rs
index 6b89c8a..cfe4bee 100644
--- a/src/server/web/admin/refs.rs
+++ b/src/server/web/admin/refs.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use axum::{
     extract::State,
     response::{IntoResponse, Redirect},
@@ -6,12 +8,13 @@ use axum::{
 use log::info;
 use serde::Deserialize;
 use sqlx::SqlitePool;
+use tokio::sync::mpsc;
 
 use crate::{
     config::ServerConfig,
     server::web::{
         base::Base,
-        paths::{PathAdminRefsTrack, PathAdminRefsUntrack, PathIndex},
+        paths::{PathAdminRefsTrack, PathAdminRefsUntrack, PathAdminRefsUpdate, PathIndex},
     },
     somehow,
 };
@@ -56,3 +59,15 @@ pub async fn post_admin_refs_untrack(
     let link = Base::link_with_config(config, PathIndex {});
     Ok(Redirect::to(&link.to_string()))
 }
+
+pub async fn post_admin_repo_update(
+    _path: PathAdminRefsUpdate,
+    State(config): State<&'static ServerConfig>,
+    State(recurring_tx): State<Arc<mpsc::UnboundedSender<()>>>,
+) -> somehow::Result<impl IntoResponse> {
+    let _ = recurring_tx.send(());
+    info!("Admin updated repo");
+
+    let link = Base::link_with_config(config, PathIndex {});
+    Ok(Redirect::to(&link.to_string()))
+}
diff --git a/src/server/web/admin/repo.rs b/src/server/web/admin/repo.rs
deleted file mode 100644
index 290f151..0000000
--- a/src/server/web/admin/repo.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use std::sync::Arc;
-
-use axum::{
-    extract::State,
-    response::{IntoResponse, Redirect},
-};
-use log::info;
-use tokio::sync::mpsc;
-
-use crate::{
-    config::ServerConfig,
-    server::web::{
-        base::Base,
-        paths::{PathAdminRepoUpdate, PathIndex},
-    },
-    somehow,
-};
-
-pub async fn post_admin_repo_update(
-    _path: PathAdminRepoUpdate,
-    State(config): State<&'static ServerConfig>,
-    State(recurring_tx): State<Arc<mpsc::UnboundedSender<()>>>,
-) -> somehow::Result<impl IntoResponse> {
-    let _ = recurring_tx.send(());
-    info!("Admin updated repo");
-
-    let link = Base::link_with_config(config, PathIndex {});
-    Ok(Redirect::to(&link.to_string()))
-}
diff --git a/src/server/web/pages/index.rs b/src/server/web/pages/index.rs
index 7026b8f..b9e6ca3 100644
--- a/src/server/web/pages/index.rs
+++ b/src/server/web/pages/index.rs
@@ -8,7 +8,7 @@ use crate::{
     server::web::{
         base::{Base, Link, Tab},
         link::LinkCommit,
-        paths::{PathAdminRefsTrack, PathAdminRefsUntrack, PathAdminRepoUpdate, PathIndex},
+        paths::{PathAdminRefsTrack, PathAdminRefsUntrack, PathAdminRefsUpdate, PathIndex},
     },
     somehow,
 };
@@ -24,7 +24,7 @@ struct Ref {
 struct IndexTemplate {
     link_admin_refs_track: Link,
     link_admin_refs_untrack: Link,
-    link_admin_repo_update: Link,
+    link_admin_refs_update: Link,
     base: Base,
 
     tracked_refs: Vec<Ref>,
@@ -68,7 +68,7 @@ pub async fn get_index(
     Ok(IndexTemplate {
         link_admin_refs_track: base.link(PathAdminRefsTrack {}),
         link_admin_refs_untrack: base.link(PathAdminRefsUntrack {}),
-        link_admin_repo_update: base.link(PathAdminRepoUpdate {}),
+        link_admin_refs_update: base.link(PathAdminRefsUpdate {}),
         base: Base::new(config, Tab::Index),
 
         tracked_refs,
diff --git a/src/server/web/paths.rs b/src/server/web/paths.rs
index 7be5788..672116d 100644
--- a/src/server/web/paths.rs
+++ b/src/server/web/paths.rs
@@ -62,8 +62,8 @@ pub struct PathAdminRefsTrack {}
 pub struct PathAdminRefsUntrack {}
 
 #[derive(Deserialize, TypedPath)]
-#[typed_path("/admin/repo/update")]
-pub struct PathAdminRepoUpdate {}
+#[typed_path("/admin/refs/update")]
+pub struct PathAdminRefsUpdate {}
 
 #[derive(Deserialize, TypedPath)]
 #[typed_path("/admin/queue/add")]
diff --git a/templates/pages/index.html b/templates/pages/index.html
index 14e21df..4cce739 100644
--- a/templates/pages/index.html
+++ b/templates/pages/index.html
@@ -36,7 +36,7 @@
     </form>
 </details>
 
-<form method="post" action="{{ link_admin_repo_update }}">
+<form method="post" action="{{ link_admin_refs_update }}">
     <button>Update</button>
 </form>