blue
/
croc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #750 from schollz:schollz/issue574 

Sending folders from the root of a drive always goes to the same path on the receiver's end
This commit is contained in:
Zack 2024-07-04 05:52:38 -07:00 committed by GitHub
parent 4c120c4963 232e162f8c
commit 8577745d74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/croc/croc.go
View File

@ -421,8 +421,14 @@ func GetFilesInfo(fnames []string, zipfolder bool, ignoreGit bool) (filesInfo []
if err != nil { if err != nil {
return err return err
} }
remoteFolder := strings.TrimPrefix(filepath.Dir(pathName), absPathWithSeparator := filepath.Dir(absPath)
filepath.Dir(absPath)+string(os.PathSeparator)) if !strings.HasSuffix(absPathWithSeparator, string(os.PathSeparator)) {
absPathWithSeparator += string(os.PathSeparator)
}
if strings.HasSuffix(absPathWithSeparator, string(os.PathSeparator)+string(os.PathSeparator)) {
absPathWithSeparator = strings.TrimSuffix(absPathWithSeparator, string(os.PathSeparator))
}
remoteFolder := strings.TrimPrefix(filepath.Dir(pathName), absPathWithSeparator)
if !info.IsDir() { if !info.IsDir() {
fInfo := FileInfo{ fInfo := FileInfo{
Name: info.Name(), Name: info.Name(),