Coracle/nostrlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grasp: repository path uses the pubkey now.

Browse Source
This commit is contained in:
fiatjaf
2025-12-01 10:03:01 -03:00
parent 020e4a8f56
commit fb1603e062
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
khatru/grasp/helpers.go
View File

@@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"path/filepath"
"slices" "slices"
"strings" "strings"
@@ -142,6 +143,10 @@ func (gs *GraspServer) validatePush(
return nil return nil
} }
func (gs *GraspServer) getRepositoryPath(pubkey nostr.PubKey, repoName string) string {
return filepath.Join(gs.RepositoryDir, pubkey.Hex(), repoName)
}
// repoExists checks if a repository has an announcement event (kind 30617) // repoExists checks if a repository has an announcement event (kind 30617)
func (gs *GraspServer) repoExists(pubkey nostr.PubKey, repoName string) bool { func (gs *GraspServer) repoExists(pubkey nostr.PubKey, repoName string) bool {
for range gs.Relay.QueryStored(context.Background(), nostr.Filter{ for range gs.Relay.QueryStored(context.Background(), nostr.Filter{

3
khatru/grasp/info.go
View File

@@ -7,7 +7,6 @@ import (
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"strings" "strings"
"syscall" "syscall"
@@ -28,7 +27,7 @@ func (gs *GraspServer) handleInfoRefs(
return return
} }
repoPath := filepath.Join(gs.RepositoryDir, repoName) repoPath := gs.getRepositoryPath(pubkey, repoName)
serviceName := r.URL.Query().Get("service") serviceName := r.URL.Query().Get("service")
w.Header().Set("Connection", "Keep-Alive") w.Header().Set("Connection", "Keep-Alive")

3
khatru/grasp/read.go
View File

@@ -8,7 +8,6 @@ import (
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"syscall" "syscall"
"fiatjaf.com/nostr" "fiatjaf.com/nostr"
@@ -20,7 +19,7 @@ func (gs *GraspServer) handleGitUploadPack(
pubkey nostr.PubKey, pubkey nostr.PubKey,
repoName string, repoName string,
) { ) {
repoPath := filepath.Join(gs.RepositoryDir, repoName) repoPath := gs.getRepositoryPath(pubkey, repoName)
// for upload-pack (pull), check if repository exists // for upload-pack (pull), check if repository exists
if !gs.repoExists(pubkey, repoName) { if !gs.repoExists(pubkey, repoName) {

3
khatru/grasp/write.go
View File

@@ -8,7 +8,6 @@ import (
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"strings" "strings"
"sync" "sync"
"syscall" "syscall"
@@ -45,7 +44,7 @@ func (gs *GraspServer) handleGitReceivePack(
} }
} }
repoPath := filepath.Join(gs.RepositoryDir, repoName) repoPath := gs.getRepositoryPath(pubkey, repoName)
// initialize git repo if it doesn't exist // initialize git repo if it doesn't exist
if _, err := os.Stat(repoPath); os.IsNotExist(err) { if _, err := os.Stat(repoPath); os.IsNotExist(err) {