From f76ca10a745a8fabdcc011ba73e28cf39bc23c23 Mon Sep 17 00:00:00 2001 From: Uzhinskiy Boris Date: Thu, 16 Oct 2025 14:13:24 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D1=83=D1=87=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D1=81=D0=BD?= =?UTF-8?q?=D0=B0=D0=BF=D1=88=D0=BE=D1=82=D0=BE=D0=B2=20=D1=81=20verbose?= =?UTF-8?q?=3Dfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/router/router.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/router/router.go b/modules/router/router.go index 474bd6e..df0bc0f 100644 --- a/modules/router/router.go +++ b/modules/router/router.go @@ -349,7 +349,7 @@ func (rt *Router) ApiHandler(w http.ResponseWriter, r *http.Request) { return } - response, err := rt.doGet(rt.conf.Snapshot.Host+"_cat/snapshots/"+request.Values.Repo+"?format=json", "Snapshot") + response, err := rt.doGet(rt.conf.Snapshot.Host+"_snapshot/"+request.Values.Repo+"/*?verbose=false&format=json", "Snapshot") if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) log.Println(remoteIP, "\t", r.Method, "\t", r.URL.Path, "\t", request.Action, "\t", http.StatusInternalServerError, "\t", err.Error()) From f6fb0464074e76de31b62f93ce877af52d0973f3 Mon Sep 17 00:00:00 2001 From: Boris Date: Thu, 16 Oct 2025 20:02:48 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20API-=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D1=81=D0=BD=D0=B0=D0=BF=D1=88?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/index.html | 18 +++++++++--------- modules/router/router.go | 29 +++++++++++++++-------------- modules/version/version.go | 2 +- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/front/index.html b/front/index.html index 730f316..8a6ec11 100644 --- a/front/index.html +++ b/front/index.html @@ -67,15 +67,15 @@

Snapshots list
  • Sort by Name
    • -
  • + +
    - +
    @@ -87,7 +87,7 @@
    Restored indices
    Attention! The extracted_* indices will be deleted 48 hours after they were created. -
    + @@ -282,14 +282,14 @@ "+reponame+""); - $("#get_repo_sort_time").attr("data-id", reponame); + #$("#get_repo_sort_time").attr("data-id", reponame); $("#get_repo_sort_name").attr("data-id", reponame); var post = { "action": "get_snapshots", "values" : { "repo": reponame, - "otype": "time", + "otype": "name", "odir": "desc" } }; @@ -306,9 +306,9 @@ snap_list[j].Id + return snap_list[i].Name > snap_list[j].Name }) } @@ -414,7 +414,7 @@ func (rt *Router) ApiHandler(w http.ResponseWriter, r *http.Request) { case "get_snapshots_sorted": { - if request.Values.OrderType == "time" { + /*if request.Values.OrderType == "time" { if request.Values.OrderDir == "asc" { sort.Slice(rt.sl[:], func(i, j int) bool { @@ -426,16 +426,17 @@ func (rt *Router) ApiHandler(w http.ResponseWriter, r *http.Request) { }) } - } else if request.Values.OrderType == "name" { + } else */ + if request.Values.OrderType == "name" { if request.Values.OrderDir == "asc" { sort.Slice(rt.sl[:], func(i, j int) bool { - return rt.sl[i].Id < rt.sl[j].Id + return rt.sl[i].Name < rt.sl[j].Name }) } else { sort.Slice(rt.sl[:], func(i, j int) bool { - return rt.sl[i].Id > rt.sl[j].Id + return rt.sl[i].Name > rt.sl[j].Name }) } diff --git a/modules/version/version.go b/modules/version/version.go index 8fd92c7..790f282 100644 --- a/modules/version/version.go +++ b/modules/version/version.go @@ -13,4 +13,4 @@ package version -var Version = "extractor/v0.2.22" +var Version = "extractor/v0.2.23" From d8a6436797720d8fe34e0f3179d68dde1376192c Mon Sep 17 00:00:00 2001 From: Boris Date: Thu, 16 Oct 2025 20:04:52 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=81=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=20=D1=81=D0=BD=D0=B0=D0=BF=D1=88=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/front/index.html b/front/index.html index 8a6ec11..0e80cb1 100644 --- a/front/index.html +++ b/front/index.html @@ -307,10 +307,10 @@ X-tract indices from snapshot

    • "+icon+" " + snapshot + " created at " + hdate + restore_button +""; + str += "
  • "+icon+" " + snapshot + " " + restore_button +"
    • "; } $("#loading").addClass('invisible');