Windows fixes

.github/workflows/test.yml

@@ -4,11 +4,21 @@ on: [push]
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
           go-version: '^1.18.0'
       - run: go test ./pmtiles
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.18.0'
       - run: if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then exit 1; fi

pmtiles/bucket.go

@@ -78,18 +78,22 @@ func NormalizeBucketKey(bucket string, prefix string, key string) (string, strin
 			}
 			return u.Scheme + "://" + u.Host + dir, file, nil
 		} else {
+			fileprotocol := "file://"
+			if string(os.PathSeparator) != "/" {
+				fileprotocol += "/"
+			}
 			if prefix != "" {
 				abs, err := filepath.Abs(prefix)
 				if err != nil {
 					return "", "", err
 				}
-				return "file://" + abs, key, nil
+				return fileprotocol + filepath.ToSlash(abs), key, nil
 			}
 			abs, err := filepath.Abs(key)
 			if err != nil {
 				return "", "", err
 			}
-			return "file://" + filepath.Dir(abs), filepath.Base(abs), nil
+			return fileprotocol + filepath.ToSlash(filepath.Dir(abs)), filepath.Base(abs), nil
 		}
 	}
 
@@ -116,7 +120,7 @@ func OpenBucket(ctx context.Context, bucketURL string, bucketPrefix string) (Buc
 		if err != nil {
 			return nil, err
 		}
-		if bucketPrefix != "/" && bucketPrefix != "." {
+		if bucketPrefix != "" && bucketPrefix != "/" && bucketPrefix != "." {
 			bucket = blob.PrefixedBucket(bucket, path.Clean(bucketPrefix)+string(os.PathSeparator))
 		}
 		wrapped_bucket := BucketAdapter{bucket}

pmtiles/bucket_test.go

@@ -1,8 +1,8 @@
 package pmtiles
 
 import (
-	"fmt"
 	"github.com/stretchr/testify/assert"
+	"os"
 	"strings"
 	"testing"
 )
@@ -14,6 +14,15 @@ func TestNormalizeLocalFile(t *testing.T) {
 	assert.True(t, strings.HasPrefix(bucket, "file://"))
 }
 
+func TestNormalizeLocalFileWindows(t *testing.T) {
+	if string(os.PathSeparator) != "/" {
+		bucket, key, _ := NormalizeBucketKey("", "", "\\foo\\bar.pmtiles")
+		assert.Equal(t, "bar.pmtiles", key)
+		assert.True(t, strings.HasSuffix(bucket, "/foo"))
+		assert.True(t, strings.HasPrefix(bucket, "file://"))
+	}
+}
+
 func TestNormalizeHttp(t *testing.T) {
 	bucket, key, _ := NormalizeBucketKey("", "", "http://example.com/foo/bar.pmtiles")
 	assert.Equal(t, "bar.pmtiles", key)
@@ -25,10 +34,10 @@ func TestNormalizeAwsSdkVersion(t *testing.T) {
 	assert.Equal(t, "abc", key)
 	assert.Equal(t, "s3://mybucket?awssdk=v2&endpoint=https%3A%2F%2Ffoo.bar", bucket)
 }
+
 func TestNormalizePathPrefixServer(t *testing.T) {
 	bucket, key, _ := NormalizeBucketKey("", "../foo", "")
 	assert.Equal(t, "", key)
-	fmt.Println(bucket)
 	assert.True(t, strings.HasSuffix(bucket, "/foo"))
 	assert.True(t, strings.HasPrefix(bucket, "file://"))
 }