diff options
Diffstat (limited to 'handle_repo_tree.go')
| -rw-r--r-- | handle_repo_tree.go | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/handle_repo_tree.go b/handle_repo_tree.go index 4e2d012..8b8630d 100644 --- a/handle_repo_tree.go +++ b/handle_repo_tree.go @@ -20,18 +20,18 @@ func handle_repo_tree(w http.ResponseWriter, r *http.Request) { data["project_name"], data["repo_name"], data["path_spec"] = project_name, repo_name, path_spec repo, err := git.PlainOpen(filepath.Join(config.Git.Root, project_name, repo_name+".git")) if err != nil { - w.Write([]byte("Error opening repo: " + err.Error())) + _, _ = w.Write([]byte("Error opening repo: " + err.Error())) return } head, err := repo.Head() if err != nil { - w.Write([]byte("Error getting repo HEAD: " + err.Error())) + _, _ = w.Write([]byte("Error getting repo HEAD: " + err.Error())) return } head_hash := head.Hash() commit_iter, err := repo.Log(&git.LogOptions{From: head_hash}) if err != nil { - w.Write([]byte("Error getting repo commits: " + err.Error())) + _, _ = w.Write([]byte("Error getting repo commits: " + err.Error())) return } recent_commits := make([]*object.Commit, 0) @@ -39,7 +39,7 @@ func handle_repo_tree(w http.ResponseWriter, r *http.Request) { for range 3 { this_recent_commit, err := commit_iter.Next() if err != nil { - w.Write([]byte("Error getting a recent commit: " + err.Error())) + _, _ = w.Write([]byte("Error getting a recent commit: " + err.Error())) return } recent_commits = append(recent_commits, this_recent_commit) @@ -47,12 +47,12 @@ func handle_repo_tree(w http.ResponseWriter, r *http.Request) { data["commits"] = recent_commits commit_object, err := repo.CommitObject(head_hash) if err != nil { - w.Write([]byte("Error getting commit object: " + err.Error())) + _, _ = w.Write([]byte("Error getting commit object: " + err.Error())) return } tree, err := commit_object.Tree() if err != nil { - w.Write([]byte("Error getting file tree: " + err.Error())) + _, _ = w.Write([]byte("Error getting file tree: " + err.Error())) return } @@ -60,17 +60,17 @@ func handle_repo_tree(w http.ResponseWriter, r *http.Request) { if err != nil { file, err := tree.File(path_spec) if err != nil { - w.Write([]byte("Error retrieving path: " + err.Error())) + _, _ = w.Write([]byte("Error retrieving path: " + err.Error())) return } data["file_contents"], err = file.Contents() if err != nil { - w.Write([]byte("Error reading file: " + err.Error())) + _, _ = w.Write([]byte("Error reading file: " + err.Error())) return } err = templates.ExecuteTemplate(w, "repo_tree_file", data) if err != nil { - w.Write([]byte("Error rendering template: " + err.Error())) + _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return } return @@ -81,13 +81,17 @@ func handle_repo_tree(w http.ResponseWriter, r *http.Request) { data["readme"] = "There is no README for this directory." } else { readme_file_contents, err := readme_file.Contents() - var readme_rendered_unsafe bytes.Buffer - err = goldmark.Convert([]byte(readme_file_contents), &readme_rendered_unsafe) if err != nil { - readme_rendered_unsafe.WriteString("Unable to render README: " + err.Error()) + data["readme"] = "There is no README for this directory." + } else { + var readme_rendered_unsafe bytes.Buffer + err = goldmark.Convert([]byte(readme_file_contents), &readme_rendered_unsafe) + if err != nil { + readme_rendered_unsafe.WriteString("Unable to render README: " + err.Error()) + } + readme_rendered_safe := template.HTML(bluemonday.UGCPolicy().SanitizeBytes(readme_rendered_unsafe.Bytes())) + data["readme"] = readme_rendered_safe } - readme_rendered_safe := template.HTML(bluemonday.UGCPolicy().SanitizeBytes(readme_rendered_unsafe.Bytes())) - data["readme"] = readme_rendered_safe } display_git_tree := make([]display_git_tree_entry_t, 0) @@ -111,7 +115,7 @@ func handle_repo_tree(w http.ResponseWriter, r *http.Request) { err = templates.ExecuteTemplate(w, "repo_tree_dir", data) if err != nil { - w.Write([]byte("Error rendering template: " + err.Error())) + _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return } } |