fix import cycle

Author: Zettat123

routers/api/v1/repo/wiki.go

@@ -202,7 +202,7 @@ func getUncycloPage(ctx *context.APIContext, wikiName wiki_service.WebPath) *api.Wi
 	}
 
 	return &api.UncycloPage{
-		UncycloPageMetaData: convert.ToUncycloPageMetaData(wikiName, lastCommit, ctx.Repo.Repository),
+		UncycloPageMetaData: wiki_service.ToUncycloPageMetaData(wikiName, lastCommit, ctx.Repo.Repository),
 		ContentBase64:    content,
 		CommitCount:      commitsCount,
 		Sidebar:          sidebarContent,
@@ -332,7 +332,7 @@ func ListUncycloPages(ctx *context.APIContext) {
 			ctx.Error(http.StatusInternalServerError, "UncycloFilenameToName", err)
 			return
 		}
-		pages = append(pages, convert.ToUncycloPageMetaData(wikiName, c, ctx.Repo.Repository))
+		pages = append(pages, wiki_service.ToUncycloPageMetaData(wikiName, c, ctx.Repo.Repository))
 	}
 
 	ctx.SetTotalCountHeader(int64(len(entries)))

services/actions/notifier_helper.go

@@ -473,3 +473,8 @@ func handleSchedules(
 
 	return actions_model.CreateScheduleTask(ctx, crons)
 }
+
+func DetactAndHandleSchedules(ctx context.Context, repo *repo_model.Repository) error {
+	// TODO
+	return nil
+}

services/convert/wiki.go

@@ -6,11 +6,8 @@ package convert
 import (
 	"time"
 
-	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/git"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/modules/util"
-	wiki_service "code.gitea.io/gitea/services/wiki"
 )
 
 // ToUncycloCommit convert a git commit into a UncycloCommit
@@ -46,15 +43,3 @@ func ToUncycloCommitList(commits []*git.Commit, total int64) *api.UncycloCommitList {
 		Count:       total,
 	}
 }
-
-// ToUncycloPageMetaData converts meta information to a UncycloPageMetaData
-func ToUncycloPageMetaData(wikiName wiki_service.WebPath, lastCommit *git.Commit, repo *repo_model.Repository) *api.UncycloPageMetaData {
-	subURL := string(wikiName)
-	_, title := wiki_service.WebPathToUserTitle(wikiName)
-	return &api.UncycloPageMetaData{
-		Title:      title,
-		HTMLURL:    util.URLJoin(repo.HTMLURL(), "wiki", subURL),
-		SubURL:     subURL,
-		LastCommit: ToUncycloCommit(lastCommit),
-	}
-}

services/wiki/wiki_path.go

@@ -9,7 +9,10 @@ import (
 	"strings"
 
 	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/modules/git"
+	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/util"
+	"code.gitea.io/gitea/services/convert"
 )
 
 // To define the wiki related concepts:
@@ -155,3 +158,15 @@ func UserTitleToWebPath(base, title string) WebPath {
 	}
 	return WebPath(title)
 }
+
+// ToUncycloPageMetaData converts meta information to a UncycloPageMetaData
+func ToUncycloPageMetaData(wikiName WebPath, lastCommit *git.Commit, repo *repo_model.Repository) *api.UncycloPageMetaData {
+	subURL := string(wikiName)
+	_, title := WebPathToUserTitle(wikiName)
+	return &api.UncycloPageMetaData{
+		Title:      title,
+		HTMLURL:    util.URLJoin(repo.HTMLURL(), "wiki", subURL),
+		SubURL:     subURL,
+		LastCommit: convert.ToUncycloCommit(lastCommit),
+	}
+}