diff --git a/routers/repo/dir.go b/routers/repo/dir.go index 87ec28432..4d7cdafe8 100755 --- a/routers/repo/dir.go +++ b/routers/repo/dir.go @@ -2,8 +2,9 @@ package repo import ( "errors" - "io/ioutil" + "os" "path" + "sort" "strings" "code.gitea.io/gitea/models" @@ -52,7 +53,7 @@ func DirIndex(ctx *context.Context) { dirArray = []string{attachment.Name} } - files, err := ioutil.ReadDir(setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + setting.Attachment.Minio.BasePath + + files, err := readDir(setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + setting.Attachment.Minio.BasePath + path.Join(uuid[0:1], uuid[1:2], uuid+uuid) + "/" + parentDir) if err != nil { log.Error("ReadDir failed:", err.Error()) @@ -93,3 +94,19 @@ func DirIndex(ctx *context.Context) { ctx.HTML(200, tplDirIndex) } + +// readDir reads the directory named by dirname and returns +// a list of directory entries sorted by filename. +func readDir(dirname string) ([]os.FileInfo, error) { + f, err := os.Open(dirname) + if err != nil { + return nil, err + } + list, err := f.Readdir(100) + f.Close() + if err != nil { + return nil, err + } + sort.Slice(list, func(i, j int) bool { return list[i].Name() < list[j].Name() }) + return list, nil +} diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index a1b85c6b3..fd77cfaf1 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -315,7 +315,6 @@ export default { _csrf: csrf } }); - console.log('getUploadChunkUrl: ', res); urls[currentChunk] = res.data.url; }