types: add backwards compat layer to filemode handling #816

merged

opened by

oppi.li 4 weeks ago targeting master from op/vkqnuulvrqxy

older knots return a full modestring for each file. use some primitive parsing to extract a filemode in these scenarios.

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+61 -1

types

tree.go

+61 -1

types/tree.go

···

       1
        
       package types

     

       2
        
       

     

       3
        
       import (

     

       0
        
       
     

       0
        
       
     

       4
        
       	"time"

     

       5
        
       

     

       6
        
       	"github.com/go-git/go-git/v5/plumbing"

     
···

       18
        
       }

     

       19
        
       

     

       20
        
       func (t *NiceTree) FileMode() (filemode.FileMode, error) {

     

       21
       -
       	return filemode.New(t.Mode)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
       }

     

       23
        
       

     

       24
        
       func (t *NiceTree) IsFile() bool {

···

       1
        
       package types

     

       2
        
       

     

       3
        
       import (

     

       4
       +
       	"fmt"

     

       5
       +
       	"os"

     

       6
        
       	"time"

     

       7
        
       

     

       8
        
       	"github.com/go-git/go-git/v5/plumbing"

     
···

       20
        
       }

     

       21
        
       

     

       22
        
       func (t *NiceTree) FileMode() (filemode.FileMode, error) {

     

       23
       +
       	if numericMode, err := filemode.New(t.Mode); err == nil {

     

       24
       +
       		return numericMode, nil

     

       25
       +
       	}

     

       26
       +
       

     

       27
       +
       	// TODO: this is here for backwards compat, can be removed in future versions

     

       28
       +
       	osMode, err := parseModeString(t.Mode)

     

       29
       +
       	if err != nil {

     

       30
       +
       		return filemode.Empty, nil

     

       31
       +
       	}

     

       32
       +
       

     

       33
       +
       	conv, err := filemode.NewFromOSFileMode(osMode)

     

       34
       +
       	if err != nil {

     

       35
       +
       		return filemode.Empty, nil

     

       36
       +
       	}

     

       37
       +
       

     

       38
       +
       	return conv, nil

     

       39
       +
       }

     

       40
       +
       

     

       41
       +
       // ParseFileModeString parses a file mode string like "-rw-r--r--"

     

       42
       +
       // and returns an os.FileMode

     

       43
       +
       func parseModeString(modeStr string) (os.FileMode, error) {

     

       44
       +
       	if len(modeStr) != 10 {

     

       45
       +
       		return 0, fmt.Errorf("invalid mode string length: expected 10, got %d", len(modeStr))

     

       46
       +
       	}

     

       47
       +
       

     

       48
       +
       	var mode os.FileMode

     

       49
       +
       

     

       50
       +
       	// Parse file type (first character)

     

       51
       +
       	switch modeStr[0] {

     

       52
       +
       	case 'd':

     

       53
       +
       		mode |= os.ModeDir

     

       54
       +
       	case 'l':

     

       55
       +
       		mode |= os.ModeSymlink

     

       56
       +
       	case '-':

     

       57
       +
       		// regular file

     

       58
       +
       	default:

     

       59
       +
       		return 0, fmt.Errorf("unknown file type: %c", modeStr[0])

     

       60
       +
       	}

     

       61
       +
       

     

       62
       +
       	// parse permissions for owner, group, and other

     

       63
       +
       	perms := modeStr[1:]

     

       64
       +
       	shifts := []int{6, 3, 0} // bit shifts for owner, group, other

     

       65
       +
       

     

       66
       +
       	for i := range 3 {

     

       67
       +
       		offset := i * 3

     

       68
       +
       		shift := shifts[i]

     

       69
       +
       

     

       70
       +
       		if perms[offset] == 'r' {

     

       71
       +
       			mode |= os.FileMode(4 << shift)

     

       72
       +
       		}

     

       73
       +
       		if perms[offset+1] == 'w' {

     

       74
       +
       			mode |= os.FileMode(2 << shift)

     

       75
       +
       		}

     

       76
       +
       		if perms[offset+2] == 'x' {

     

       77
       +
       			mode |= os.FileMode(1 << shift)

     

       78
       +
       		}

     

       79
       +
       	}

     

       80
       +
       

     

       81
       +
       	return mode, nil

     

       82
        
       }

     

       83
        
       

     

       84
        
       func (t *NiceTree) IsFile() bool {