From 1031ebaf35374f2d6118438dd3b5010afbad9551 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Sun, 25 Apr 2021 11:59:00 +0800 Subject: [PATCH 01/54] add gpy_type select --- models/cloudbrain.go | 10 ++++++++++ modules/auth/cloudbrain.go | 1 + modules/cloudbrain/cloudbrain.go | 4 ++-- modules/setting/setting.go | 4 +++- routers/repo/cloudbrain.go | 7 ++++++- templates/repo/cloudbrain/new.tmpl | 9 +++++++++ 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 5c0a5f007..00d4b00e6 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -276,6 +276,16 @@ type Category struct { Value string `json:"value"` } +type GpuTypes struct { + GpuType []*GpuType `json:"gpu_type"` +} + +type GpuType struct { + Id int `json:"id"` + Value string `json:"value"` + Queue string `json:"queue"` +} + type CommitImageParams struct { Ip string `json:"ip"` TaskContainerId string `json:"taskContainerId"` diff --git a/modules/auth/cloudbrain.go b/modules/auth/cloudbrain.go index b4f0c8f7c..335bc1666 100755 --- a/modules/auth/cloudbrain.go +++ b/modules/auth/cloudbrain.go @@ -12,6 +12,7 @@ type CreateCloudBrainForm struct { Attachment string `form:"attachment" binding:"Required"` JobType string `form:"job_type" binding:"Required"` BenchmarkCategory string `form:"get_benchmark_category"` + GpuType string `form:"gpu_type"` } type CommitImageCloudBrainForm struct { diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index 1e52bd096..2f22f9770 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -23,7 +23,7 @@ const ( Success = "S000" ) -func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType string) error { +func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType, gpuType string) error { dataActualPath := setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + setting.Attachment.Minio.BasePath + @@ -32,7 +32,7 @@ func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, jobResult, err := CreateJob(jobName, models.CreateJobParams{ JobName: jobName, RetryCount: 1, - GpuType: setting.JobType, + GpuType: gpuType, Image: image, TaskRoles: []models.TaskRole{ { diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 9b69d238a..7785028f8 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -437,6 +437,7 @@ var ( RestServerHost string JobPath string JobType string + GpuTypes string DebugServerHost string //benchmark config @@ -1145,7 +1146,8 @@ func NewContext() { RestServerHost = sec.Key("REST_SERVER_HOST").MustString("http://192.168.202.73") JobPath = sec.Key("JOB_PATH").MustString("/datasets/minio/data/opendata/jobs/") DebugServerHost = sec.Key("DEBUG_SERVER_HOST").MustString("http://192.168.202.73") - JobType = sec.Key("JOB_TYPE").MustString("debug_openi") + JobType = sec.Key("GPU_TYPE_DEFAULT").MustString("openidebug") + GpuTypes = sec.Key("GPU_TYPES").MustString("openidebug,openidgx") sec = Cfg.Section("benchmark") IsBenchmarkEnabled = sec.Key("ENABLED").MustBool(false) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 5ef8f2979..0c1b34836 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -134,6 +134,9 @@ func CloudBrainNew(ctx *context.Context) { var categories *models.Categories json.Unmarshal([]byte(setting.BenchmarkCategory), &categories) ctx.Data["benchmark_categories"] = categories.Category + var gpuTypes *models.GpuTypes + json.Unmarshal([]byte(setting.GpuTypes), &gpuTypes) + ctx.Data["gpu_types"] = gpuTypes.GpuType ctx.Data["snn4imagenet_path"] = cloudbrain.Snn4imagenetMountPath ctx.Data["is_snn4imagenet_enabled"] = setting.IsSnn4imagenetEnabled ctx.HTML(200, tplCloudBrainNew) @@ -146,6 +149,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { command := form.Command uuid := form.Attachment jobType := form.JobType + gpuType := setting.JobType codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath if jobType != string(models.JobTypeBenchmark) && jobType != string(models.JobTypeDebug) && jobType != string(models.JobTypeSnn4imagenet) { @@ -165,6 +169,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath if setting.IsBenchmarkEnabled && jobType == string(models.JobTypeBenchmark) { + gpuType = form.GpuType downloadRateCode(repo, jobName, setting.BenchmarkCode, benchmarkPath, form.BenchmarkCategory) } @@ -173,7 +178,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { downloadRateCode(repo, jobName, setting.Snn4imagenetCode, snn4imagenetPath, "") } - err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType) + err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType, gpuType) if err != nil { ctx.RenderWithErr(err.Error(), tplCloudBrainNew, &form) return diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index a2b307efb..6c07e427f 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -139,6 +139,15 @@ +
+ + +
+
+ +
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+ +
+
+
+
+
+ + {{.i18n.Tr "all"}} +
${repoTypeCount}
+ + + {{.i18n.Tr "sources"}} +
${repoTypeCount}
+ + + {{.i18n.Tr "forks"}} +
${repoTypeCount}
+ + + {{.i18n.Tr "mirrors"}} +
${repoTypeCount}
+ + + {{.i18n.Tr "collaborative"}} +
${repoTypeCount}
+ +
+ + + +
{{range .Repos}} From d486986b084120827ca3486fcb1b701cf16bf3c8 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Mon, 17 May 2021 10:46:05 +0800 Subject: [PATCH 11/54] mod index --- routers/routes/routes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 7237fedff..e8e33104d 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -285,7 +285,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Head("/", func() string { return "" }) - m.Get("/", routers.Home) + m.Get("/", routers.ExploreRepos) m.Get("/dashboard", routers.Dashboard) m.Group("/explore", func() { m.Get("", func(ctx *context.Context) { From 926912f8b9bf0b2adb3a4dd5c1aaf6f363382b8c Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 18 May 2021 15:23:48 +0800 Subject: [PATCH 12/54] mod dashboard --- routers/user/home.go | 2 +- routers/user/profile.go | 2 + templates/base/head_navbar.tmpl | 8 +- templates/explore/repo_list.tmpl | 243 +++++++++++++------------------ 4 files changed, 105 insertions(+), 150 deletions(-) mode change 100644 => 100755 routers/user/home.go mode change 100644 => 100755 routers/user/profile.go diff --git a/routers/user/home.go b/routers/user/home.go old mode 100644 new mode 100755 index 2fc0c60aa..9421ee7d1 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -156,7 +156,7 @@ func Dashboard(ctx *context.Context) { if ctx.Written() { return } - ctx.HTML(200, tplDashboard) + //ctx.HTML(200, tplDashboard) } // Milestones render the user milestones page diff --git a/routers/user/profile.go b/routers/user/profile.go old mode 100644 new mode 100755 index 0e29b6117..0fcc6453a --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -261,6 +261,8 @@ func Profile(ctx *context.Context) { ctx.Data["ShowUserEmail"] = len(ctxUser.Email) > 0 && ctx.IsSigned && (!ctxUser.KeepEmailPrivate || ctxUser.ID == ctx.User.ID) + Dashboard(ctx) + ctx.HTML(200, tplProfile) } diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 1eada0a01..fd6634a7d 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -9,7 +9,7 @@
{{if .IsSigned}} - {{.i18n.Tr "dashboard"}} + {{.i18n.Tr "dashboard"}} {{.i18n.Tr "custom.head.openi"}} {{if not .UnitIssuesGlobalDisabled}} {{.i18n.Tr "issues"}} @@ -109,13 +109,9 @@
- - {{svg "octicon-info" 16}} - {{.i18n.Tr "your_dashboard"}} - {{svg "octicon-person" 16}} - {{.i18n.Tr "your_profile"}} + {{.i18n.Tr "your_dashboard"}} {{svg "octicon-star" 16}} diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index f6463f20a..89be6fc74 100755 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -1,31 +1,9 @@

{{.i18n.Tr "explore.repos"}}

-
- -
- - {{.i18n.Tr "repo.issues.filter_sort"}} - - -
- {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.moststars"}} - {{.i18n.Tr "repo.issues.filter_sort.feweststars"}} - {{.i18n.Tr "repo.issues.filter_sort.mostforks"}} - {{.i18n.Tr "repo.issues.filter_sort.fewestforks"}} -
-
-
-
- - -

- {{.i18n.Tr "home.my_repos"}} ${reposTotalCount} - {{if or (not .ContextUser.IsOrganization) .IsOrganizationOwner}} -
- - - {{.i18n.Tr "new_repo"}} - -
- {{end}} -

-
-
- - -
- -
-
- -
- - -
-
- - -
- - -
- {{range .Repos}} -
-
- {{if .RelAvatarLink}} - - {{end}} - - {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} - {{if .IsArchived}}{{end}} - - {{if .IsPrivate}} - {{svg "octicon-lock" 16}} - {{else if .IsFork}} - {{svg "octicon-repo-forked" 16}} - {{else if .IsMirror}} - {{svg "octicon-repo-clone" 16}} - {{else if .Owner}} - {{if .Owner.Visibility.IsPrivate}} - {{svg "octicon-lock" 16}} - {{end}} - {{end}} -
- {{if .PrimaryLanguage }} - {{ .PrimaryLanguage.Language }} - {{end}} - {{svg "octicon-star" 16}} {{.NumStars}} - {{svg "octicon-git-branch" 16}} {{.NumForks}} -
-
-
- {{if .DescriptionHTML}}

{{.DescriptionHTML}}

{{end}} - {{if .Topics }} -
- {{range .Topics}} - {{if ne . "" }}
{{.}}
{{end}} - {{end}} -
- {{end}} -

{{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}

+
+
- {{else}} -
- {{$.i18n.Tr "explore.repo_no_results"}}
- {{end}} +
From fcd0e2aaf9dc52c18e0755035529f7f7f218f190 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 18 May 2021 17:22:57 +0800 Subject: [PATCH 13/54] add tmpl --- templates/explore/repo_list_dashboard.tmpl | 131 +++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100755 templates/explore/repo_list_dashboard.tmpl diff --git a/templates/explore/repo_list_dashboard.tmpl b/templates/explore/repo_list_dashboard.tmpl new file mode 100755 index 000000000..89be6fc74 --- /dev/null +++ b/templates/explore/repo_list_dashboard.tmpl @@ -0,0 +1,131 @@ +

+ {{.i18n.Tr "explore.repos"}} +

+
+ From e26d03fea31a19f75fd88b33021f7f5f084ae743 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 18 May 2021 18:00:55 +0800 Subject: [PATCH 14/54] explore_repo --- templates/explore/repo_list.tmpl | 186 ++++++------------ .../dashboard}/repo_list_dashboard.tmpl | 0 templates/user/profile.tmpl | 2 +- 3 files changed, 66 insertions(+), 122 deletions(-) rename templates/{explore => user/dashboard}/repo_list_dashboard.tmpl (100%) mode change 100644 => 100755 templates/user/profile.tmpl diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 89be6fc74..b10a860ae 100755 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -1,131 +1,75 @@

{{.i18n.Tr "explore.repos"}}

+
+ +
+ + {{.i18n.Tr "repo.issues.filter_sort"}} + + +
+ {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.filter_sort.oldest"}} + {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.moststars"}} + {{.i18n.Tr "repo.issues.filter_sort.feweststars"}} + {{.i18n.Tr "repo.issues.filter_sort.mostforks"}} + {{.i18n.Tr "repo.issues.filter_sort.fewestforks"}} +
+
+
+
-
- -
-
-
-
- - -
- -
-
- -
- - -
-
- - -
-
- - -
- -
-
- -
- - -
-
- - -
-
- - -
- -
-
-
-
-
- - {{.i18n.Tr "all"}} -
${repoTypeCount}
- - - {{.i18n.Tr "sources"}} -
${repoTypeCount}
- - - {{.i18n.Tr "forks"}} -
${repoTypeCount}
- - - {{.i18n.Tr "mirrors"}} -
${repoTypeCount}
- - - {{.i18n.Tr "collaborative"}} -
${repoTypeCount}
- + +
+ {{range .Repos}} +
+
+ {{if .RelAvatarLink}} + + {{end}} + + {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} + {{if .IsArchived}}{{end}} + + {{if .IsPrivate}} + {{svg "octicon-lock" 16}} + {{else if .IsFork}} + {{svg "octicon-repo-forked" 16}} + {{else if .IsMirror}} + {{svg "octicon-repo-clone" 16}} + {{else if .Owner}} + {{if .Owner.Visibility.IsPrivate}} + {{svg "octicon-lock" 16}} + {{end}} + {{end}} +
+ {{if .PrimaryLanguage }} + {{ .PrimaryLanguage.Language }} + {{end}} + {{svg "octicon-star" 16}} {{.NumStars}} + {{svg "octicon-git-branch" 16}} {{.NumForks}}
-
- +
+ {{if .DescriptionHTML}}

{{.DescriptionHTML}}

{{end}} + {{if .Topics }} +
+ {{range .Topics}} + {{if ne . "" }}
{{.}}
{{end}} + {{end}} +
+ {{end}} +

{{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}

+ {{else}} +
+ {{$.i18n.Tr "explore.repo_no_results"}}
- + {{end}}
diff --git a/templates/explore/repo_list_dashboard.tmpl b/templates/user/dashboard/repo_list_dashboard.tmpl similarity index 100% rename from templates/explore/repo_list_dashboard.tmpl rename to templates/user/dashboard/repo_list_dashboard.tmpl diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl old mode 100644 new mode 100755 index 58f6cc471..8967ab566 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -136,7 +136,7 @@ {{template "base/paginate" .}} {{else}} {{template "explore/repo_search" .}} - {{template "explore/repo_list" .}} + {{template "user/dashboard/repo_list_dashboard" .}} {{template "base/paginate" .}} {{end}}
From 61dda6232210805de21a24cddc737a9c5fb0cda1 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 19 May 2021 15:31:54 +0800 Subject: [PATCH 15/54] add baidu tongji --- templates/base/head.tmpl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index ce5d9892d..4392e5536 100755 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -176,6 +176,15 @@ {{end}} {{template "custom/header" .}} + {{template "custom/body_outer_pre" .}} From 46e44d98da09012ade276c264c839f4b5cd061b9 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 21 May 2021 10:39:03 +0800 Subject: [PATCH 16/54] delete search --- templates/user/profile.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 8967ab566..108761c6d 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -135,7 +135,6 @@ {{template "explore/dataset_list" .}} {{template "base/paginate" .}} {{else}} - {{template "explore/repo_search" .}} {{template "user/dashboard/repo_list_dashboard" .}} {{template "base/paginate" .}} {{end}} From 9bd41a94c516d87479fae89048546a9adb3c3889 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 10:45:47 +0800 Subject: [PATCH 17/54] add activity filter --- templates/user/profile.tmpl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 108761c6d..14e723b1b 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -89,7 +89,7 @@ {{svg "octicon-inbox" 16}} {{.i18n.Tr "user.datasets"}} - + {{svg "octicon-rss" 16}} {{.i18n.Tr "user.activity"}} @@ -117,6 +117,10 @@
{{end}} +
{{template "user/dashboard/feeds" .}}
From 2504060a18cca6574234a75c7b47acdca1d909d6 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 10:49:54 +0800 Subject: [PATCH 18/54] adjust filter style --- templates/user/profile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 14e723b1b..02a049f74 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -117,7 +117,7 @@
{{end}} -
+ From 159c70745fc99c2c2eb1fc72d629d985db8c2f09 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 21 May 2021 11:01:13 +0800 Subject: [PATCH 19/54] add type for activity --- routers/user/home.go | 14 +++++++------- routers/user/profile.go | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/routers/user/home.go b/routers/user/home.go index 9421ee7d1..7d1f247ea 100755 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -145,13 +145,13 @@ func Dashboard(ctx *context.Context) { ctx.Data["MirrorCount"] = len(mirrors) ctx.Data["Mirrors"] = mirrors - retrieveFeeds(ctx, models.GetFeedsOptions{ - RequestedUser: ctxUser, - Actor: ctx.User, - IncludePrivate: true, - OnlyPerformedBy: false, - IncludeDeleted: false, - }) + //retrieveFeeds(ctx, models.GetFeedsOptions{ + // RequestedUser: ctxUser, + // Actor: ctx.User, + // IncludePrivate: true, + // OnlyPerformedBy: false, + // IncludeDeleted: false, + //}) if ctx.Written() { return diff --git a/routers/user/profile.go b/routers/user/profile.go index 0fcc6453a..062adf0f7 100755 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -178,10 +178,16 @@ func Profile(ctx *context.Context) { total = ctxUser.NumFollowing case "activity": + typeQuery := ctx.Query("type") + onlyPerformedBy := true + if typeQuery == "all" { + onlyPerformedBy = false + } + retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser, Actor: ctx.User, IncludePrivate: showPrivate, - OnlyPerformedBy: true, + OnlyPerformedBy: onlyPerformedBy, IncludeDeleted: false, }) if ctx.Written() { From c9bb11b7138c54df824fe0ad13633dbd718166a9 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 11:01:24 +0800 Subject: [PATCH 20/54] adjust filter style --- templates/user/profile.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 02a049f74..019059038 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -118,8 +118,8 @@
{{end}}
{{template "user/dashboard/feeds" .}} From cccb74a54233a39934e527ccedef9c9352017968 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 11:23:25 +0800 Subject: [PATCH 21/54] adjust filter style --- templates/user/profile.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 019059038..bbcdcaf03 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -117,9 +117,9 @@
{{end}} -
- 个人 - 所有 +
{{template "user/dashboard/feeds" .}} From f3c11c9bed0d87f6ef4781a425398047d4979e84 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 11:37:38 +0800 Subject: [PATCH 22/54] adjust activity filter --- templates/user/profile.tmpl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index bbcdcaf03..0a3338912 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -121,6 +121,16 @@ 个人 所有
+
+
+ + {{.i18n.Tr "all"}} + + + {{.i18n.Tr "sources"}} + +
+
{{template "user/dashboard/feeds" .}}
From 2031a15362dc2c371486a1c5324bfef8a7af959d Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 12:09:28 +0800 Subject: [PATCH 23/54] adjust activity filter style --- options/locale/locale_en-US.ini | 3 ++- options/locale/locale_zh-CN.ini | 3 ++- templates/user/profile.tmpl | 16 ++++------------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 110c2a209..c4956c65f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -391,7 +391,8 @@ follow = Follow unfollow = Unfollow heatmap.loading = Loading Heatmap… user_bio = Biography - +own = Own +all = All form.name_reserved = The username '%s' is reserved. form.name_pattern_not_allowed = The pattern '%s' is not allowed in a username. form.name_chars_not_allowed = User name '%s' contains invalid characters. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 751aea64b..1eb590c17 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -391,7 +391,8 @@ follow=关注 unfollow=取消关注 heatmap.loading=正在加载热图... user_bio=简历 - +own = 个人 +all = 所有 form.name_reserved='%s' 用户名被保留。 form.name_pattern_not_allowed=用户名中不允许使用 "%s"。 form.name_chars_not_allowed=用户名 '%s' 包含无效字符。 diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 0a3338912..91b661836 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -118,18 +118,10 @@
{{end}}
- 个人 - 所有 -
-
-
- - {{.i18n.Tr "all"}} - - - {{.i18n.Tr "sources"}} - -
+ + {{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} + + {{svg "octicon-people" 16}} {{.i18n.Tr "user.all"}}
{{template "user/dashboard/feeds" .}} From 4477ec5fa9c6acad9a8543f41fef3cf4d037ca45 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 14:49:17 +0800 Subject: [PATCH 24/54] adjust activity filter style --- templates/user/profile.tmpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 91b661836..919d8ea01 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -123,6 +123,12 @@ {{svg "octicon-people" 16}} {{.i18n.Tr "user.all"}}
+
+ + {{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} + + {{svg "octicon-people" 16}} {{.i18n.Tr "user.all"}} +
{{template "user/dashboard/feeds" .}}
From 7226c5384b9212c3c6626398e4d61b46f35366a7 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 21 May 2021 15:17:37 +0800 Subject: [PATCH 25/54] organization --- templates/user/profile.tmpl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 919d8ea01..bf5ed67d7 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -117,17 +117,11 @@
{{end}} -
{{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} - {{svg "octicon-people" 16}} {{.i18n.Tr "user.all"}} + {{svg "octicon-organization" 16}} {{.i18n.Tr "user.all"}}
{{template "user/dashboard/feeds" .}} From af9d9313b7c2e5d02d5199d089e870faa9bae579 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 15:25:24 +0800 Subject: [PATCH 26/54] set activity tab style according to filter value --- routers/user/profile.go | 1 + templates/user/profile.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/routers/user/profile.go b/routers/user/profile.go index 062adf0f7..063b26914 100755 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -179,6 +179,7 @@ func Profile(ctx *context.Context) { total = ctxUser.NumFollowing case "activity": typeQuery := ctx.Query("type") + ctx.Data["ActTabName"] = typeQuery onlyPerformedBy := true if typeQuery == "all" { onlyPerformedBy = false diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index bf5ed67d7..4b1619f0c 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -118,9 +118,9 @@
{{end}}
- + {{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} - + {{svg "octicon-organization" 16}} {{.i18n.Tr "user.all"}}
From dd11c393f0201e82535bb73f3ea8be5356d5f5b0 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 21 May 2021 17:10:07 +0800 Subject: [PATCH 27/54] 1 --- .../user/dashboard/repo_list_dashboard.tmpl | 52 ++++++++++++++++++- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/templates/user/dashboard/repo_list_dashboard.tmpl b/templates/user/dashboard/repo_list_dashboard.tmpl index 89be6fc74..9a6b24883 100755 --- a/templates/user/dashboard/repo_list_dashboard.tmpl +++ b/templates/user/dashboard/repo_list_dashboard.tmpl @@ -90,7 +90,55 @@
    -
  • +
    + {{range .Repos}} +
    +
    + {{if .RelAvatarLink}} + + {{end}} + + {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} + {{if .IsArchived}}{{end}} + + {{if .IsPrivate}} + {{svg "octicon-lock" 16}} + {{else if .IsFork}} + {{svg "octicon-repo-forked" 16}} + {{else if .IsMirror}} + {{svg "octicon-repo-clone" 16}} + {{else if .Owner}} + {{if .Owner.Visibility.IsPrivate}} + {{svg "octicon-lock" 16}} + {{end}} + {{end}} +
    + {{if .PrimaryLanguage }} + {{ .PrimaryLanguage.Language }} + {{end}} + {{svg "octicon-star" 16}} {{.NumStars}} + {{svg "octicon-git-branch" 16}} {{.NumForks}} +
    +
    +
    + {{if .DescriptionHTML}}

    {{.DescriptionHTML}}

    {{end}} + {{if .Topics }} +
    + {{range .Topics}} + {{if ne . "" }}
    {{.}}
    {{end}} + {{end}} +
    + {{end}} +

    {{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}

    +
    +
    + {{else}} +
    + {{$.i18n.Tr "explore.repo_no_results"}} +
    + {{end}} +
    + {#
  • ${repo.full_name} @@ -122,7 +170,7 @@
- + #}
From 72ab6629b19e74f25d99da47402171b32d854267 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Mon, 24 May 2021 18:01:09 +0800 Subject: [PATCH 28/54] add gpu type --- models/cloudbrain.go | 1 + routers/repo/cloudbrain.go | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 00d4b00e6..7d9d951a9 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -167,6 +167,7 @@ type TaskInfo struct { CodeName string `json:"code_name"` BenchmarkCategory []string `json:"selected_category"` CodeLink string `json:"code_link"` + GpuType string `json:"gpu_type"` } func ConvertToTaskPod(input map[string]interface{}) (TaskPod, error) { diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 0c1b34836..f3d28eb5f 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -170,12 +170,12 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath if setting.IsBenchmarkEnabled && jobType == string(models.JobTypeBenchmark) { gpuType = form.GpuType - downloadRateCode(repo, jobName, setting.BenchmarkCode, benchmarkPath, form.BenchmarkCategory) + downloadRateCode(repo, jobName, setting.BenchmarkCode, benchmarkPath, form.BenchmarkCategory, gpuType) } snn4imagenetPath := setting.JobPath + jobName + cloudbrain.Snn4imagenetMountPath if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) { - downloadRateCode(repo, jobName, setting.Snn4imagenetCode, snn4imagenetPath, "") + downloadRateCode(repo, jobName, setting.Snn4imagenetCode, snn4imagenetPath, "", "") } err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType, gpuType) @@ -344,7 +344,7 @@ func downloadCode(repo *models.Repository, codePath string) error { return nil } -func downloadRateCode(repo *models.Repository, taskName, gitPath, codePath, benchmarkCategory string) error { +func downloadRateCode(repo *models.Repository, taskName, gitPath, codePath, benchmarkCategory, gpuType string) error { err := os.MkdirAll(codePath, os.ModePerm) if err != nil { log.Error("mkdir codePath failed", err.Error()) @@ -375,6 +375,7 @@ func downloadRateCode(repo *models.Repository, taskName, gitPath, codePath, benc CodeName: repo.Name, BenchmarkCategory: strings.Split(benchmarkCategory, ","), CodeLink: strings.TrimSuffix(repo.CloneLink().HTTPS, ".git"), + GpuType: gpuType, }) if err != nil { log.Error("json.Marshal failed", err.Error()) From 9c140c4d2447eb67ecd43e207c37b9dbe30e4ba7 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 25 May 2021 11:56:47 +0800 Subject: [PATCH 29/54] optimization --- models/cloudbrain.go | 6 +++--- modules/cloudbrain/cloudbrain.go | 4 ++-- routers/repo/cloudbrain.go | 24 ++++++++++++++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 7d9d951a9..c8000c5a6 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -277,11 +277,11 @@ type Category struct { Value string `json:"value"` } -type GpuTypes struct { - GpuType []*GpuType `json:"gpu_type"` +type GpuInfos struct { + GpuInfo []*GpuInfo `json:"gpu_type"` } -type GpuType struct { +type GpuInfo struct { Id int `json:"id"` Value string `json:"value"` Queue string `json:"queue"` diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index 2f22f9770..9fda84ee8 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -23,7 +23,7 @@ const ( Success = "S000" ) -func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType, gpuType string) error { +func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType, gpuQueue string) error { dataActualPath := setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + setting.Attachment.Minio.BasePath + @@ -32,7 +32,7 @@ func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, jobResult, err := CreateJob(jobName, models.CreateJobParams{ JobName: jobName, RetryCount: 1, - GpuType: gpuType, + GpuType: gpuQueue, Image: image, TaskRoles: []models.TaskRole{ { diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index f3d28eb5f..e6e56d2c8 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -25,6 +25,10 @@ const ( tplCloudBrainShow base.TplName = "repo/cloudbrain/show" ) +var ( + gpuInfos *models.GpuInfos +) + // MustEnableDataset check if repository enable internal cb func MustEnableCloudbrain(ctx *context.Context) { if !ctx.Repo.CanRead(models.UnitTypeCloudBrain) { @@ -134,9 +138,11 @@ func CloudBrainNew(ctx *context.Context) { var categories *models.Categories json.Unmarshal([]byte(setting.BenchmarkCategory), &categories) ctx.Data["benchmark_categories"] = categories.Category - var gpuTypes *models.GpuTypes - json.Unmarshal([]byte(setting.GpuTypes), &gpuTypes) - ctx.Data["gpu_types"] = gpuTypes.GpuType + + if gpuInfos == nil { + json.Unmarshal([]byte(setting.GpuTypes), &gpuInfos) + } + ctx.Data["gpu_types"] = gpuInfos.GpuInfo ctx.Data["snn4imagenet_path"] = cloudbrain.Snn4imagenetMountPath ctx.Data["is_snn4imagenet_enabled"] = setting.IsSnn4imagenetEnabled ctx.HTML(200, tplCloudBrainNew) @@ -149,7 +155,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { command := form.Command uuid := form.Attachment jobType := form.JobType - gpuType := setting.JobType + gpuQueue := setting.JobType codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath if jobType != string(models.JobTypeBenchmark) && jobType != string(models.JobTypeDebug) && jobType != string(models.JobTypeSnn4imagenet) { @@ -169,7 +175,13 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath if setting.IsBenchmarkEnabled && jobType == string(models.JobTypeBenchmark) { - gpuType = form.GpuType + gpuQueue = form.GpuType + var gpuType string + for _, gpuInfo := range gpuInfos.GpuInfo { + if gpuInfo.Queue == gpuQueue { + gpuType = gpuInfo.Value + } + } downloadRateCode(repo, jobName, setting.BenchmarkCode, benchmarkPath, form.BenchmarkCategory, gpuType) } @@ -178,7 +190,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { downloadRateCode(repo, jobName, setting.Snn4imagenetCode, snn4imagenetPath, "", "") } - err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType, gpuType) + err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType, gpuQueue) if err != nil { ctx.RenderWithErr(err.Error(), tplCloudBrainNew, &form) return From 4f1b6c3df1187f16aa2af1cdf68fcf5ffa77ce02 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 25 May 2021 15:56:09 +0800 Subject: [PATCH 30/54] add type info into task info --- routers/repo/cloudbrain.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index e6e56d2c8..8d8e97377 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -26,7 +26,8 @@ const ( ) var ( - gpuInfos *models.GpuInfos + gpuInfos *models.GpuInfos + categories *models.Categories ) // MustEnableDataset check if repository enable internal cb @@ -135,8 +136,9 @@ func CloudBrainNew(ctx *context.Context) { ctx.Data["benchmark_path"] = cloudbrain.BenchMarkMountPath ctx.Data["is_benchmark_enabled"] = setting.IsBenchmarkEnabled - var categories *models.Categories - json.Unmarshal([]byte(setting.BenchmarkCategory), &categories) + if categories == nil { + json.Unmarshal([]byte(setting.BenchmarkCategory), &categories) + } ctx.Data["benchmark_categories"] = categories.Category if gpuInfos == nil { From 2a328e3b6a29c01a540332e14526971f92433c06 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 26 May 2021 11:41:20 +0800 Subject: [PATCH 31/54] add cloudbrain type info into dataset index --- templates/repo/datasets/index.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index a887ebdee..335e012af 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -67,7 +67,7 @@
-

{{.i18n.Tr "datasets"}}

+

{{if eq .Type 0}}{{.i18n.Tr "repo.cloudbrain1"}}{{else}}{{.i18n.Tr "repo.cloudbrain2"}}{{end}}-{{.i18n.Tr "datasets"}}

From 508bcdead8c6d32d7bd65c1d32c03341f049604e Mon Sep 17 00:00:00 2001 From: avadesian Date: Thu, 27 May 2021 10:39:48 +0800 Subject: [PATCH 32/54] update repo list page within user profile --- modules/structs/repo.go | 4 + routers/api/v1/repo/repo.go | 14 ++- .../user/dashboard/repo_list_dashboard.tmpl | 109 +++++------------- templates/user/profile.tmpl | 3 +- web_src/js/index.js | 11 +- 5 files changed, 55 insertions(+), 86 deletions(-) diff --git a/modules/structs/repo.go b/modules/structs/repo.go index 70de9b746..07be4aec2 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -5,6 +5,7 @@ package structs import ( + "html/template" "time" ) @@ -75,6 +76,7 @@ type Repository struct { Created time.Time `json:"created_at"` // swagger:strfmt date-time Updated time.Time `json:"updated_at"` + TimeSinceUnixUpdatedHtml template.HTML `json:"timeSinceUnixUpdatedHtml"` Permissions *Permission `json:"permissions,omitempty"` HasIssues bool `json:"has_issues"` InternalTracker *InternalTracker `json:"internal_tracker,omitempty"` @@ -88,6 +90,8 @@ type Repository struct { AllowRebaseMerge bool `json:"allow_rebase_explicit"` AllowSquash bool `json:"allow_squash_merge"` AvatarURL string `json:"avatar_url"` + PrimaryLanguage string `json:"primaryLanguage"` + PrimaryLanguageColor string `json:"primaryLanguageColor"` } // CreateRepoOption options when creating repository diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index a724ebcc3..0258676ad 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -6,20 +6,20 @@ package repo import ( - "fmt" - "net/http" - "strings" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/routers/api/v1/utils" repo_service "code.gitea.io/gitea/services/repository" + "fmt" + "net/http" + "strings" ) var searchOrderByMap = map[string]map[string]models.SearchOrderBy{ @@ -199,6 +199,7 @@ func Search(ctx *context.APIContext) { } results := make([]*api.Repository, len(repos)) + for i, repo := range repos { if err = repo.GetOwner(); err != nil { ctx.JSON(http.StatusInternalServerError, api.SearchError{ @@ -215,6 +216,11 @@ func Search(ctx *context.APIContext) { }) } results[i] = repo.APIFormat(accessMode) + results[i].TimeSinceUnixUpdatedHtml = timeutil.TimeSinceUnix(repo.UpdatedUnix,ctx.Language()) + if repo.PrimaryLanguage != nil { + results[i].PrimaryLanguage = repo.PrimaryLanguage.Language + results[i].PrimaryLanguageColor = repo.PrimaryLanguage.Color + } } ctx.SetLinkHeader(int(count), opts.PageSize) diff --git a/templates/user/dashboard/repo_list_dashboard.tmpl b/templates/user/dashboard/repo_list_dashboard.tmpl index 9a6b24883..2809fdd7b 100755 --- a/templates/user/dashboard/repo_list_dashboard.tmpl +++ b/templates/user/dashboard/repo_list_dashboard.tmpl @@ -4,7 +4,7 @@
    -
    - {{range .Repos}} -
    -
    - {{if .RelAvatarLink}} - - {{end}} - - {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} - {{if .IsArchived}}{{end}} - - {{if .IsPrivate}} - {{svg "octicon-lock" 16}} - {{else if .IsFork}} - {{svg "octicon-repo-forked" 16}} - {{else if .IsMirror}} - {{svg "octicon-repo-clone" 16}} - {{else if .Owner}} - {{if .Owner.Visibility.IsPrivate}} - {{svg "octicon-lock" 16}} - {{end}} - {{end}} -
    - {{if .PrimaryLanguage }} - {{ .PrimaryLanguage.Language }} - {{end}} - {{svg "octicon-star" 16}} {{.NumStars}} - {{svg "octicon-git-branch" 16}} {{.NumForks}} -
    -
    -
    - {{if .DescriptionHTML}}

    {{.DescriptionHTML}}

    {{end}} - {{if .Topics }} -
    - {{range .Topics}} - {{if ne . "" }}
    {{.}}
    {{end}} - {{end}} -
    - {{end}} -

    {{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}

    +
    +
    +
    + {{if .RelAvatarLink}} + + {{end}} + + ${repo.full_name} + + + {{svg "octicon-lock" 16}} + {{svg "octicon-repo-forked" 16}} + {{svg "octicon-repo-clone" 16}} +
    + + + ${repo.primaryLanguage} + + {{svg "octicon-star" 16}} ${repo.stars_count} + {{svg "octicon-git-branch" 16}} ${repo.forks_count}
    - {{else}} -
    - {{$.i18n.Tr "explore.repo_no_results"}} -
    - {{end}} -
    - {#
  • - - - ${repo.full_name} - - - ${repo.stars_count} {{svg "octicon-star" 16}} - - -
    • -
  • -
    - -
    • #} +
    +
    + {{$.i18n.Tr "explore.repo_no_results"}} +
-
+
\ No newline at end of file diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 4b1619f0c..12c35fd7c 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -141,8 +141,7 @@ {{template "explore/dataset_list" .}} {{template "base/paginate" .}} {{else}} - {{template "user/dashboard/repo_list_dashboard" .}} - {{template "base/paginate" .}} + {{template "user/dashboard/repo_list_dashboard" .}} {{end}}
diff --git a/web_src/js/index.js b/web_src/js/index.js index ddb69f701..e1078db4e 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3324,7 +3324,16 @@ function initVueComponents() { self.$refs.search.focus(); }); }, - + updated: function () { + $('.time-since').each(function () { + $(this) + .addClass('poping up') + .attr('data-content', $(this).attr('title')) + .attr('data-variation', 'inverted tiny') + .attr('title', ''); + }); + $('.poping.up').popup(); + }, methods: { changeTab(t) { this.tab = t; From 47128c1168f5c9b0116c48a8b51c298854c356e4 Mon Sep 17 00:00:00 2001 From: avadesian Date: Thu, 27 May 2021 11:16:42 +0800 Subject: [PATCH 33/54] merge develop --- templates/user/dashboard/repo_list_dashboard.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/dashboard/repo_list_dashboard.tmpl b/templates/user/dashboard/repo_list_dashboard.tmpl index 2809fdd7b..a4fa2e590 100755 --- a/templates/user/dashboard/repo_list_dashboard.tmpl +++ b/templates/user/dashboard/repo_list_dashboard.tmpl @@ -127,4 +127,4 @@
-
\ No newline at end of file +
From ceb15c0709a9a7654fa6abc6356071f47242d71c Mon Sep 17 00:00:00 2001 From: avadesian Date: Thu, 27 May 2021 11:53:51 +0800 Subject: [PATCH 34/54] reformat import --- routers/api/v1/repo/repo.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 0258676ad..a0ea2166f 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -6,6 +6,10 @@ package repo import ( + "fmt" + "net/http" + "strings" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" @@ -17,9 +21,6 @@ import ( "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/routers/api/v1/utils" repo_service "code.gitea.io/gitea/services/repository" - "fmt" - "net/http" - "strings" ) var searchOrderByMap = map[string]map[string]models.SearchOrderBy{ @@ -216,7 +217,7 @@ func Search(ctx *context.APIContext) { }) } results[i] = repo.APIFormat(accessMode) - results[i].TimeSinceUnixUpdatedHtml = timeutil.TimeSinceUnix(repo.UpdatedUnix,ctx.Language()) + results[i].TimeSinceUnixUpdatedHtml = timeutil.TimeSinceUnix(repo.UpdatedUnix, ctx.Language()) if repo.PrimaryLanguage != nil { results[i].PrimaryLanguage = repo.PrimaryLanguage.Language results[i].PrimaryLanguageColor = repo.PrimaryLanguage.Color From 7682ad040ea8819df3662598dccdb068934a460a Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Mon, 31 May 2021 18:04:59 +0800 Subject: [PATCH 35/54] error when no type --- routers/repo/dataset.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 9c8557afa..521ef907c 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -49,6 +49,12 @@ func DatasetIndex(ctx *context.Context) { ctx.NotFound("GetDatasetByRepo", err) return } + + if ctx.Query("type") == "" { + log.Error("not found param type") + ctx.NotFound("type error", nil) + return + } err = models.GetDatasetAttachments(ctx.QueryInt("type"), dataset) if err != nil { ctx.ServerError("GetDatasetAttachments", err) From 142e8c4cea77545faac3c5d37b24b70c99ee9f26 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 2 Jun 2021 14:29:58 +0800 Subject: [PATCH 36/54] add type when edit dataset --- modules/auth/dataset.go | 1 + routers/repo/dataset.go | 2 +- templates/repo/datasets/index.tmpl | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 modules/auth/dataset.go diff --git a/modules/auth/dataset.go b/modules/auth/dataset.go old mode 100644 new mode 100755 index f9658a0d6..577637273 --- a/modules/auth/dataset.go +++ b/modules/auth/dataset.go @@ -31,4 +31,5 @@ type EditDatasetForm struct { Private bool ReleaseID int64 `xorm:"INDEX"` Files []string + Type string `binding:"Required"` } diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 521ef907c..3be36fbe4 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -122,5 +122,5 @@ func EditDatasetPost(ctx *context.Context, form auth.EditDatasetForm) { ctx.HTML(200, tplIndex) log.Error("%v", err) } - ctx.Redirect(ctx.Repo.RepoLink + "/datasets") + ctx.Redirect(ctx.Repo.RepoLink + "/datasets?type=" + form.Type) } diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 335e012af..721ad61eb 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -55,6 +55,7 @@
+
{{.i18n.Tr "cancel"}} From 1ace40758fe7b5d6965bb34313d83b516b1f6604 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 2 Jun 2021 18:00:59 +0800 Subject: [PATCH 37/54] add interface --- routers/repo/cloudbrain.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 8d8e97377..55d809ec9 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -23,6 +23,7 @@ const ( tplCloudBrainIndex base.TplName = "repo/cloudbrain/index" tplCloudBrainNew base.TplName = "repo/cloudbrain/new" tplCloudBrainShow base.TplName = "repo/cloudbrain/show" + tplCloudBrainShowModels base.TplName = "repo/cloudbrain/show_models" ) var ( @@ -332,6 +333,24 @@ func CloudBrainDel(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain") } +func CloudBrainGetModels(ctx *context.Context) { + ctx.Data["PageIsCloudBrain"] = true + + var jobID = ctx.Params(":jobid") + task, err := models.GetCloudbrainByJobID(jobID) + if err != nil { + log.Error("no such job!") + ctx.RenderWithErr("no such job!", tplCloudBrainIndex, nil) + return + } + + + + ctx.Data["task"] = task + ctx.Data["jobID"] = jobID + ctx.HTML(200, tplCloudBrainShowModels) +} + func GetRate(ctx *context.Context) { var jobID = ctx.Params(":jobid") job, err := models.GetCloudbrainByJobID(jobID) From 21459fcb776794d1b4e9747728648b07822d2ff8 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 8 Jun 2021 16:33:43 +0800 Subject: [PATCH 38/54] 2 --- routers/repo/cloudbrain.go | 18 +++++++++++++++++- routers/routes/routes.go | 6 ++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 55d809ec9..154dbb402 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -2,8 +2,10 @@ package repo import ( "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/storage" "encoding/json" "errors" + "net/http" "os" "os/exec" "strconv" @@ -333,7 +335,7 @@ func CloudBrainDel(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain") } -func CloudBrainGetModels(ctx *context.Context) { +func CloudBrainShowModels(ctx *context.Context) { ctx.Data["PageIsCloudBrain"] = true var jobID = ctx.Params(":jobid") @@ -344,6 +346,7 @@ func CloudBrainGetModels(ctx *context.Context) { return } + //get dirs ctx.Data["task"] = task @@ -351,6 +354,19 @@ func CloudBrainGetModels(ctx *context.Context) { ctx.HTML(200, tplCloudBrainShowModels) } +func CloudBrainDownloadModel(ctx *context.Context) { + filePath := ctx.Query("file_path") + fileName := ctx.Query("file_name") + url, err := storage.Attachments.PresignedGetURL(filePath, fileName) + if err != nil { + log.Error("PresignedGetURL failed: %v", err.Error()) + ctx.ServerError("PresignedGetURL", err) + return + } + + http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently) +} + func GetRate(ctx *context.Context) { var jobID = ctx.Params(":jobid") job, err := models.GetCloudbrainByJobID(jobID) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index e8e33104d..81f15f27d 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -910,9 +910,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/commit_image", reqRepoCloudBrainWriter, bindIgnErr(auth.CommitImageCloudBrainForm{}), repo.CloudBrainCommitImage) m.Post("/stop", reqRepoCloudBrainWriter, repo.CloudBrainStop) m.Post("/del", reqRepoCloudBrainWriter, repo.CloudBrainDel) - m.Get("/rate", reqRepoCloudBrainWriter, repo.GetRate) + m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate) + m.Get("/models", reqRepoCloudBrainReader, repo.CloudBrainShowModels) + m.Get("/download_model", reqRepoCloudBrainReader, repo.CloudBrainDownloadModel) }) - m.Get("/create", reqRepoCloudBrainWriter, repo.CloudBrainNew) + m.Get("/create", reqRepoCloudBrainReader, repo.CloudBrainNew) m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainCreate) }, context.RepoRef()) From 7d762d30e17ca6053caedae1cef2e315fae20fad Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 8 Jun 2021 16:52:40 +0800 Subject: [PATCH 39/54] when job has been stopped in cloudbrain, dont failed --- modules/cloudbrain/resty.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/cloudbrain/resty.go b/modules/cloudbrain/resty.go index 3fb3abc52..ed6157776 100755 --- a/modules/cloudbrain/resty.go +++ b/modules/cloudbrain/resty.go @@ -1,6 +1,7 @@ package cloudbrain import ( + "code.gitea.io/gitea/modules/log" "fmt" "code.gitea.io/gitea/models" @@ -14,6 +15,10 @@ var ( TOKEN string ) +const ( + JobHasBeenStopped = "S410" +) + func getRestyClient() *resty.Client { if restyClient == nil { restyClient = resty.New() @@ -240,7 +245,11 @@ sendjob: } if result.Code != Success { - return fmt.Errorf("StopJob err: %s", res.String()) + if result.Code == JobHasBeenStopped { + log.Info("StopJob(%s) failed:%s", jobID, result.Msg) + } else { + return fmt.Errorf("StopJob err: %s", res.String()) + } } return nil From d96077748461dceb8339b7b8e93bc588b32a0ce9 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 9 Jun 2021 17:59:39 +0800 Subject: [PATCH 40/54] revert dashboard --- modules/structs/repo.go | 4 - routers/api/v1/repo/repo.go | 7 - routers/user/home.go | 16 +-- routers/user/profile.go | 11 +- templates/base/head_navbar.tmpl | 8 +- .../user/dashboard/repo_list_dashboard.tmpl | 130 ------------------ templates/user/profile.tmpl | 12 +- web_src/js/index.js | 10 -- 8 files changed, 19 insertions(+), 179 deletions(-) mode change 100644 => 100755 modules/structs/repo.go mode change 100644 => 100755 routers/api/v1/repo/repo.go delete mode 100755 templates/user/dashboard/repo_list_dashboard.tmpl diff --git a/modules/structs/repo.go b/modules/structs/repo.go old mode 100644 new mode 100755 index 07be4aec2..70de9b746 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -5,7 +5,6 @@ package structs import ( - "html/template" "time" ) @@ -76,7 +75,6 @@ type Repository struct { Created time.Time `json:"created_at"` // swagger:strfmt date-time Updated time.Time `json:"updated_at"` - TimeSinceUnixUpdatedHtml template.HTML `json:"timeSinceUnixUpdatedHtml"` Permissions *Permission `json:"permissions,omitempty"` HasIssues bool `json:"has_issues"` InternalTracker *InternalTracker `json:"internal_tracker,omitempty"` @@ -90,8 +88,6 @@ type Repository struct { AllowRebaseMerge bool `json:"allow_rebase_explicit"` AllowSquash bool `json:"allow_squash_merge"` AvatarURL string `json:"avatar_url"` - PrimaryLanguage string `json:"primaryLanguage"` - PrimaryLanguageColor string `json:"primaryLanguageColor"` } // CreateRepoOption options when creating repository diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go old mode 100644 new mode 100755 index a0ea2166f..a724ebcc3 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -16,7 +16,6 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/routers/api/v1/utils" @@ -200,7 +199,6 @@ func Search(ctx *context.APIContext) { } results := make([]*api.Repository, len(repos)) - for i, repo := range repos { if err = repo.GetOwner(); err != nil { ctx.JSON(http.StatusInternalServerError, api.SearchError{ @@ -217,11 +215,6 @@ func Search(ctx *context.APIContext) { }) } results[i] = repo.APIFormat(accessMode) - results[i].TimeSinceUnixUpdatedHtml = timeutil.TimeSinceUnix(repo.UpdatedUnix, ctx.Language()) - if repo.PrimaryLanguage != nil { - results[i].PrimaryLanguage = repo.PrimaryLanguage.Language - results[i].PrimaryLanguageColor = repo.PrimaryLanguage.Color - } } ctx.SetLinkHeader(int(count), opts.PageSize) diff --git a/routers/user/home.go b/routers/user/home.go index 7d1f247ea..2fc0c60aa 100755 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -145,18 +145,18 @@ func Dashboard(ctx *context.Context) { ctx.Data["MirrorCount"] = len(mirrors) ctx.Data["Mirrors"] = mirrors - //retrieveFeeds(ctx, models.GetFeedsOptions{ - // RequestedUser: ctxUser, - // Actor: ctx.User, - // IncludePrivate: true, - // OnlyPerformedBy: false, - // IncludeDeleted: false, - //}) + retrieveFeeds(ctx, models.GetFeedsOptions{ + RequestedUser: ctxUser, + Actor: ctx.User, + IncludePrivate: true, + OnlyPerformedBy: false, + IncludeDeleted: false, + }) if ctx.Written() { return } - //ctx.HTML(200, tplDashboard) + ctx.HTML(200, tplDashboard) } // Milestones render the user milestones page diff --git a/routers/user/profile.go b/routers/user/profile.go index 063b26914..0e29b6117 100755 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -178,17 +178,10 @@ func Profile(ctx *context.Context) { total = ctxUser.NumFollowing case "activity": - typeQuery := ctx.Query("type") - ctx.Data["ActTabName"] = typeQuery - onlyPerformedBy := true - if typeQuery == "all" { - onlyPerformedBy = false - } - retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser, Actor: ctx.User, IncludePrivate: showPrivate, - OnlyPerformedBy: onlyPerformedBy, + OnlyPerformedBy: true, IncludeDeleted: false, }) if ctx.Written() { @@ -268,8 +261,6 @@ func Profile(ctx *context.Context) { ctx.Data["ShowUserEmail"] = len(ctxUser.Email) > 0 && ctx.IsSigned && (!ctxUser.KeepEmailPrivate || ctxUser.ID == ctx.User.ID) - Dashboard(ctx) - ctx.HTML(200, tplProfile) } diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index fd6634a7d..1eada0a01 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -9,7 +9,7 @@
{{if .IsSigned}} - {{.i18n.Tr "dashboard"}} + {{.i18n.Tr "dashboard"}} {{.i18n.Tr "custom.head.openi"}} {{if not .UnitIssuesGlobalDisabled}} {{.i18n.Tr "issues"}} @@ -109,9 +109,13 @@
+ + {{svg "octicon-info" 16}} + {{.i18n.Tr "your_dashboard"}} + {{svg "octicon-person" 16}} - {{.i18n.Tr "your_dashboard"}} + {{.i18n.Tr "your_profile"}} {{svg "octicon-star" 16}} diff --git a/templates/user/dashboard/repo_list_dashboard.tmpl b/templates/user/dashboard/repo_list_dashboard.tmpl deleted file mode 100755 index a4fa2e590..000000000 --- a/templates/user/dashboard/repo_list_dashboard.tmpl +++ /dev/null @@ -1,130 +0,0 @@ -

- {{.i18n.Tr "explore.repos"}} -

-
- diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 12c35fd7c..58f6cc471 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -89,7 +89,7 @@ {{svg "octicon-inbox" 16}} {{.i18n.Tr "user.datasets"}} - + {{svg "octicon-rss" 16}} {{.i18n.Tr "user.activity"}} @@ -117,12 +117,6 @@
{{end}} -
- - {{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} - - {{svg "octicon-organization" 16}} {{.i18n.Tr "user.all"}} -
{{template "user/dashboard/feeds" .}}
@@ -141,7 +135,9 @@ {{template "explore/dataset_list" .}} {{template "base/paginate" .}} {{else}} - {{template "user/dashboard/repo_list_dashboard" .}} + {{template "explore/repo_search" .}} + {{template "explore/repo_list" .}} + {{template "base/paginate" .}} {{end}}
diff --git a/web_src/js/index.js b/web_src/js/index.js index e1078db4e..1a4326f7d 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3324,16 +3324,6 @@ function initVueComponents() { self.$refs.search.focus(); }); }, - updated: function () { - $('.time-since').each(function () { - $(this) - .addClass('poping up') - .attr('data-content', $(this).attr('title')) - .attr('data-variation', 'inverted tiny') - .attr('title', ''); - }); - $('.poping.up').popup(); - }, methods: { changeTab(t) { this.tab = t; From 5a95f697f3e67c8130a76f44c0e085d97028f6fc Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 10 Jun 2021 16:07:24 +0800 Subject: [PATCH 41/54] fix-86 --- options/locale/locale_zh-CN.ini | 1 + templates/base/head_navbar.tmpl | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 1eb590c17..8c0509752 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1,4 +1,5 @@ home=个人中心 +index=首页 dashboard=个人中心 explore=探索 datasets=数据集 diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 1eada0a01..11dab3717 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -9,7 +9,7 @@ {{if .IsSigned}} - {{.i18n.Tr "dashboard"}} + {{.i18n.Tr "index"}} {{.i18n.Tr "custom.head.openi"}} {{if not .UnitIssuesGlobalDisabled}} {{.i18n.Tr "issues"}} @@ -109,10 +109,6 @@
- - {{svg "octicon-info" 16}} - {{.i18n.Tr "your_dashboard"}} - {{svg "octicon-person" 16}} {{.i18n.Tr "your_profile"}} From 2e112300fbffef237edd0465a8587ef777e64723 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 11 Jun 2021 17:24:43 +0800 Subject: [PATCH 42/54] fix-updatetime --- models/repo.go | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/models/repo.go b/models/repo.go index e431e0248..be84a462e 100755 --- a/models/repo.go +++ b/models/repo.go @@ -6,14 +6,12 @@ package models import ( + "code.gitea.io/gitea/modules/blockchain" "context" "crypto/md5" "errors" "fmt" "html/template" - "sync" - - "code.gitea.io/gitea/modules/blockchain" // Needed for jpeg support _ "image/jpeg" @@ -2409,15 +2407,6 @@ func (repo *Repository) GetTreePathLock(treePath string) (*LFSLock, error) { return nil, nil } -var lck sync.Mutex - -func (repo *Repository) IncreaseCloneCnt() { - lck.Lock() - defer lck.Unlock() - repo.CloneCnt++ - _ = UpdateRepositoryCols(repo, "clone_cnt") -} - func updateRepositoryCols(e Engine, repo *Repository, cols ...string) error { _, err := e.ID(repo.ID).Cols(cols...).Update(repo) return err @@ -2434,3 +2423,21 @@ func GetBlockChainUnSuccessRepos() ([]*Repository, error) { Where("block_chain_status != ?", RepoBlockChainSuccess). Find(&repos) } + +func (repo *Repository) IncreaseCloneCnt() { + sess := x.NewSession() + defer sess.Close() + + if err := sess.Begin(); err != nil { + return + } + if _, err := sess.Exec("UPDATE `repository` SET clone_cnt = clone_cnt + 1 WHERE id = ?", repo.ID); err != nil { + return + } + + if err := sess.Commit(); err != nil { + return + } + + return +} From 8df143d8edb61939580d0ed9c6e26e3ebc2f4143 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 15 Jun 2021 15:49:07 +0800 Subject: [PATCH 43/54] mod req --- routers/repo/cloudbrain.go | 12 ++++++++++++ routers/repo/dir.go | 15 ++++++++++----- templates/repo/datasets/dirs/dir_list.tmpl | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 154dbb402..7cac900c6 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -349,11 +349,23 @@ func CloudBrainShowModels(ctx *context.Context) { //get dirs + ctx.Data["task"] = task ctx.Data["jobID"] = jobID ctx.HTML(200, tplCloudBrainShowModels) } +func getModelDirs(uuid string, parentDir string) (string, error) { + var req string + if parentDir == "" { + req = "uuid=" + uuid + } else { + req = "uuid=" + uuid + "&parentDir=" + parentDir + } + + return getDirs(req) +} + func CloudBrainDownloadModel(ctx *context.Context) { filePath := ctx.Query("file_path") fileName := ctx.Query("file_name") diff --git a/routers/repo/dir.go b/routers/repo/dir.go index 388af34ec..ea1f80498 100755 --- a/routers/repo/dir.go +++ b/routers/repo/dir.go @@ -58,7 +58,7 @@ func DirIndex(ctx *context.Context) { dirArray = []string{attachment.Name} } - dirs, err := getDirs(uuid, parentDir) + dirs, err := getDatasetDirs(uuid, parentDir) if err != nil { log.Error("getDirs failed:", err.Error()) ctx.ServerError("getDirs failed:", err) @@ -75,13 +75,13 @@ func DirIndex(ctx *context.Context) { ctx.Data["Path"] = dirArray ctx.Data["Dirs"] = fileInfos + ctx.Data["Uuid"] = uuid ctx.Data["PageIsDataset"] = true ctx.HTML(200, tplDirIndex) } -func getDirs(uuid string, parentDir string) (string, error) { - var dirs string +func getDatasetDirs(uuid string, parentDir string) (string, error) { var req string if parentDir == "" { req = "uuid=" + uuid @@ -89,7 +89,13 @@ func getDirs(uuid string, parentDir string) (string, error) { req = "uuid=" + uuid + "&parentDir=" + parentDir } - url := setting.DecompressAddress + "/dirs?" + req + return getDirs(req) +} + +func getDirs(req string) (string, error) { + var dirs string + + url := setting.DecompressAddress + "/dirs/dataset?" + req reqHttp, err := http.NewRequest(http.MethodGet, url, nil) if err != nil { log.Error("http.NewRequest failed:", err.Error()) @@ -127,6 +133,5 @@ func getDirs(uuid string, parentDir string) (string, error) { } dirs = resp.FileInfos - return dirs, nil } diff --git a/templates/repo/datasets/dirs/dir_list.tmpl b/templates/repo/datasets/dirs/dir_list.tmpl index 98232e17e..9d10f509c 100755 --- a/templates/repo/datasets/dirs/dir_list.tmpl +++ b/templates/repo/datasets/dirs/dir_list.tmpl @@ -6,7 +6,7 @@ - + {{if .IsDir}} {{svg "octicon-file-directory" 16}}{{else}}{{svg "octicon-file" 16}}{{end}} {{.FileName}} From fda54d61aca25452013b01f6b5e94311c9e3430e Mon Sep 17 00:00:00 2001 From: avadesian Date: Tue, 15 Jun 2021 17:29:17 +0800 Subject: [PATCH 44/54] support value search for cloudbrain_image --- templates/repo/cloudbrain/new.tmpl | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 6c07e427f..c1afb9389 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -88,6 +88,17 @@ .inline.required.field.cloudbrain_snn4imagenet { display: none; } + + .select2-container .select2-selection--single{ + height:38px !important; + } + + .select2-container--default .select2-selection--single { + border : 1px solid rgba(34,36,38,.15) !important; + } + .select2-container--default .select2-selection--single .select2-selection__rendered{ + line-height: 38px !important; + }
@@ -150,7 +161,7 @@
- {{range .images}} {{end}} @@ -207,7 +218,8 @@
{{template "base/footer" .}} - + +