aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--handle_index.go4
-rw-r--r--handle_repo_index.go30
-rw-r--r--handle_repo_tree.go34
-rw-r--r--main.go5
4 files changed, 42 insertions, 31 deletions
diff --git a/handle_index.go b/handle_index.go
index 5d54e6a..ebbc4e0 100644
--- a/handle_index.go
+++ b/handle_index.go
@@ -10,7 +10,7 @@ func handle_index(w http.ResponseWriter, r *http.Request) {
entries, err := os.ReadDir(config.Git.Root)
if err != nil {
- w.Write([]byte("Error listing categories: " + err.Error()))
+ _, _ = w.Write([]byte("Error listing categories: " + err.Error()))
return
}
@@ -22,7 +22,7 @@ func handle_index(w http.ResponseWriter, r *http.Request) {
err = templates.ExecuteTemplate(w, "index", data)
if err != nil {
- w.Write([]byte("Error rendering template: " + err.Error()))
+ _, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
}
diff --git a/handle_repo_index.go b/handle_repo_index.go
index 20cfb89..89aeba6 100644
--- a/handle_repo_index.go
+++ b/handle_repo_index.go
@@ -19,19 +19,19 @@ func handle_repo_index(w http.ResponseWriter, r *http.Request) {
data["project_name"], data["repo_name"] = project_name, repo_name
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
}
data["ref"] = head.Name().Short()
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_index(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_index(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
}
readme_file, err := tree.File("README.md")
@@ -60,14 +60,18 @@ func handle_repo_index(w http.ResponseWriter, r *http.Request) {
data["readme"] = "There is no README for this repository."
} 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())
- return
+ data["readme"] = "There is no README for this repository."
+ } 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())
+ return
+ }
+ 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)
@@ -91,7 +95,7 @@ func handle_repo_index(w http.ResponseWriter, r *http.Request) {
err = templates.ExecuteTemplate(w, "repo_index", data)
if err != nil {
- w.Write([]byte("Error rendering template: " + err.Error()))
+ _, _ = w.Write([]byte("Error rendering template: " + err.Error()))
return
}
}
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
}
}
diff --git a/main.go b/main.go
index 3552cba..8f9482d 100644
--- a/main.go
+++ b/main.go
@@ -40,5 +40,8 @@ func main() {
clog.Fatal(1, "Listening: "+err.Error())
}
- http.Serve(listener, nil)
+ err = http.Serve(listener, nil)
+ if err != nil {
+ clog.Fatal(1, "Serving: "+err.Error())
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 10:33:29 +0000