mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-07-24 20:19:39 +02:00
move blobLineCount to disencentive its usage
This commit is contained in:
parent
744363597d
commit
6ed62c14d3
2 changed files with 20 additions and 29 deletions
|
@ -172,33 +172,6 @@ func (b *Blob) GetBlobContent(limit int64) (string, error) {
|
||||||
return string(buf), err
|
return string(buf), err
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetBlobLineCount gets line count of the blob
|
|
||||||
func (b *Blob) GetBlobLineCount() (int, error) {
|
|
||||||
reader, err := b.DataAsync()
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
defer reader.Close()
|
|
||||||
buf := make([]byte, 32*1024)
|
|
||||||
count := 1
|
|
||||||
lineSep := []byte{'\n'}
|
|
||||||
|
|
||||||
c, err := reader.Read(buf)
|
|
||||||
if c == 0 && err == io.EOF {
|
|
||||||
return 0, nil
|
|
||||||
}
|
|
||||||
for {
|
|
||||||
count += bytes.Count(buf[:c], lineSep)
|
|
||||||
switch {
|
|
||||||
case err == io.EOF:
|
|
||||||
return count, nil
|
|
||||||
case err != nil:
|
|
||||||
return count, err
|
|
||||||
}
|
|
||||||
c, err = reader.Read(buf)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetBlobContentBase64 Reads the content of the blob with a base64 encode and returns the encoded string
|
// GetBlobContentBase64 Reads the content of the blob with a base64 encode and returns the encoded string
|
||||||
func (b *Blob) GetBlobContentBase64() (string, error) {
|
func (b *Blob) GetBlobContentBase64() (string, error) {
|
||||||
dataRc, err := b.DataAsync()
|
dataRc, err := b.DataAsync()
|
||||||
|
|
|
@ -440,11 +440,29 @@ func getCommitFileLineCount(commit *git.Commit, filePath string) int {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
lineCount, err := blob.GetBlobLineCount()
|
reader, err := blob.DataAsync()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
return lineCount
|
defer reader.Close()
|
||||||
|
buf := make([]byte, 32*1024)
|
||||||
|
count := 1
|
||||||
|
lineSep := []byte{'\n'}
|
||||||
|
|
||||||
|
c, err := reader.Read(buf)
|
||||||
|
if c == 0 && err == io.EOF {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
for {
|
||||||
|
count += bytes.Count(buf[:c], lineSep)
|
||||||
|
switch {
|
||||||
|
case err == io.EOF:
|
||||||
|
return count
|
||||||
|
case err != nil:
|
||||||
|
return count
|
||||||
|
}
|
||||||
|
c, err = reader.Read(buf)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Diff represents a difference between two git trees.
|
// Diff represents a difference between two git trees.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue