Merge branch 'main' into deb

.golangci.yml

@@ -65,6 +65,9 @@ linters-settings:
       - standard # Standard section: captures all standard packages.
       - default # Default section: contains all imports that could not be matched to another section type.
       - prefix(github.com/ustclug/Yuki)
+  govet:
+    enable:
+      - nilness
   exhaustive:
     # Only run exhaustive check on switches with "//exhaustive:enforce" comment.
     explicit-exhaustive-switch: true

pkg/server/repo_handlers.go

@@ -62,7 +62,7 @@ func (s *Server) handlerGetRepo(c echo.Context) error {
 		Where(model.Repo{Name: name}).
 		Limit(1).
 		Find(&repo)
-	if err != nil {
+	if res.Error != nil {
 		const msg = "Fail to get Repo"
 		l.Error(msg, slogErrAttr(err))
 		return newHTTPError(http.StatusInternalServerError, msg)
@@ -84,8 +84,8 @@ func (s *Server) handlerRemoveRepo(c echo.Context) error {
 	}
 
 	db := s.getDB(c)
-	err = db.Where(model.Repo{Name: name}).Delete(&model.Repo{}).Error
-	if err != nil {
+	res := db.Where(model.Repo{Name: name}).Delete(&model.Repo{})
+	if res.Error != nil {
 		const msg = "Fail to delete Repo"
 		l.Error(msg, slogErrAttr(err), slog.String("repo", name))
 		return newHTTPError(http.StatusInternalServerError, msg)
@@ -95,6 +95,10 @@ func (s *Server) handlerRemoveRepo(c echo.Context) error {
 		l.Error("Fail to delete RepoMeta", slogErrAttr(err), slog.String("repo", name))
 	}
 	s.repoSchedules.Remove(name)
+	// Check repo existence after RepoMeta and schedule removal, to prevent inconsistency
+	if res.RowsAffected == 0 {
+		return newHTTPError(http.StatusNotFound, "Repo not found")
+	}
 	return c.NoContent(http.StatusNoContent)
 }
 

pkg/server/repo_handlers_test.go

@@ -176,4 +176,8 @@ func TestHandlerRemoveRepo(t *testing.T) {
 	require.False(t, te.server.repoSchedules.Has(name))
 	require.ErrorContains(t, te.server.db.First(&model.Repo{Name: name}).Error, "record not found")
 	require.ErrorContains(t, te.server.db.First(&model.RepoMeta{Name: name}).Error, "record not found")
+
+	resp, err = cli.R().Delete("/repos/nonexist")
+	require.NoError(t, err)
+	require.Equal(t, 404, resp.StatusCode(), "Removing non-exist repo does not return 404")
 }