Update/longtail v0.2.16 (#197)

* Update longtail lib to 0.2.16 * fix lint issues * Fix UNC path handling in NormalizePath * release notes
DanEngelbrecht · Feb 25, 2022 · 937ca90 · 937ca90
1 parent a47b60c
commit 937ca90
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -125,7 +125,8 @@ jobs:
         release_name: Release ${{ github.ref }}
         body: |
           Changes in this Release
-          - **UPDATED** Updated longtail to v0.2.14 - fixes handling of non-ascii file names on Windows
+          - **UPDATED** Updated longtail to v0.2.16 - fixes handling of UNC paths
+          - **FIX** Minor logging tweaks
         draft: false
         prerelease: false
     - name: Download Linux artifacts

diff --git a/longtaillib/longtail/liblongtail_darwin_x64.a b/longtaillib/longtail/liblongtail_darwin_x64.a
diff --git a/longtaillib/longtail/liblongtail_linux_x64.a b/longtaillib/longtail/liblongtail_linux_x64.a
diff --git a/longtaillib/longtail/liblongtail_win32_x64.a b/longtaillib/longtail/liblongtail_win32_x64.a
diff --git a/longtailutils/debug.go b/longtailutils/debug.go
@@ -47,7 +47,7 @@ func ParseLevel(lvl string) (int, error) {
 		return 4, nil
 	}
 
-	return -1, errors.Wrap(fmt.Errorf("Invalid log Level: %s", lvl), fname)
+	return -1, errors.Wrap(fmt.Errorf("invalid log Level: %s", lvl), fname)
 }
 
 // AssertData ...

diff --git a/longtailutils/longtailutils.go b/longtailutils/longtailutils.go
@@ -12,7 +12,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/sirupsen/logrus"
-	log "github.com/sirupsen/logrus"
 )
 
 type getExistingContentCompletionAPI struct {
@@ -23,6 +22,10 @@ type getExistingContentCompletionAPI struct {
 
 func (a *getExistingContentCompletionAPI) OnComplete(storeIndex longtaillib.Longtail_StoreIndex, err error) {
 	const fname = "getExistingContentCompletionAPI.OnComplete"
+	log := logrus.WithContext(context.Background()).WithFields(logrus.Fields{
+		"fname": fname,
+		"err":   err,
+	})
 	log.Debug(fname)
 	a.err = err
 	a.storeIndex = storeIndex
@@ -37,6 +40,11 @@ type pruneBlocksCompletionAPI struct {
 
 func (a *pruneBlocksCompletionAPI) OnComplete(prunedBlockCount uint32, err error) {
 	const fname = "pruneBlocksCompletionAPI.OnComplete"
+	log := logrus.WithContext(context.Background()).WithFields(logrus.Fields{
+		"fname":            fname,
+		"prunedBlockCount": prunedBlockCount,
+		"err":              err,
+	})
 	log.Debug(fname)
 	a.prunedBlockCount = prunedBlockCount
 	a.wg.Done()
@@ -50,6 +58,10 @@ type flushCompletionAPI struct {
 
 func (a *flushCompletionAPI) OnComplete(err error) {
 	const fname = "flushCompletionAPI.OnComplete"
+	log := logrus.WithContext(context.Background()).WithFields(logrus.Fields{
+		"fname": fname,
+		"err":   err,
+	})
 	log.Debug(fname)
 	a.err = err
 	a.wg.Done()
@@ -64,6 +76,10 @@ type GetStoredBlockCompletionAPI struct {
 
 func (a *GetStoredBlockCompletionAPI) OnComplete(storedBlock longtaillib.Longtail_StoredBlock, err error) {
 	const fname = "GetStoredBlockCompletionAPI.OnComplete"
+	log := logrus.WithContext(context.Background()).WithFields(logrus.Fields{
+		"fname": fname,
+		"err":   err,
+	})
 	log.Debug(fname)
 	a.Err = err
 	a.StoredBlock = storedBlock
@@ -459,7 +475,7 @@ func GetCompressionType(compressionAlgorithm string) (uint32, error) {
 	if compressionType, exists := compressionTypeMap[compressionAlgorithm]; exists {
 		return compressionType, nil
 	}
-	err := fmt.Errorf("Unsupported compression algorithm: `%s`", compressionAlgorithm)
+	err := fmt.Errorf("unsupported compression algorithm: `%s`", compressionAlgorithm)
 	return 0, errors.Wrap(err, fname)
 }
 

diff --git a/longtailutils/pathfilter.go b/longtailutils/pathfilter.go
@@ -11,11 +11,16 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+const uncprefix = "\\\\?\\"
+
 func NormalizePath(path string) string {
 	doubleForwardRemoved := strings.Replace(path, "//", "/", -1)
+	if strings.HasPrefix(doubleForwardRemoved, uncprefix) {
+		doubleBackwardRemoved := uncprefix + strings.Replace(doubleForwardRemoved[4:], "\\\\", "\\", -1)
+		return doubleBackwardRemoved
+	}
 	doubleBackwardRemoved := strings.Replace(doubleForwardRemoved, "\\\\", "/", -1)
-	backwardRemoved := strings.Replace(doubleBackwardRemoved, "\\", "/", -1)
-	return backwardRemoved
+	return doubleBackwardRemoved
 }
 
 type regexPathFilter struct {