3fb73c6c9a
The conversion from a known path prefix to a variable is now done in a
case-insensitive way. This means that if the variable `{storage}` has
value `S:\Flamenco`, a path `s:\flamenco\project\file.blend` will be
recognised and replaced with `{storage}\project\file.blend`.
This happens uniformly, regardless of the platform. So also on Linux,
which has a case-sensitive filesystem, this matching is done in a
case-insensitive way. It is very unlikely that a Flamenco configuration
has two separate variables, for paths that only differ in their case.
Fixes: #104336 Drive letter case mismatch causes two way variables not
to work correctly
79 lines
3.3 KiB
Go
79 lines
3.3 KiB
Go
package config
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestReplaceTwowayVariablesMixedSlashes(t *testing.T) {
|
|
c := DefaultConfig(func(c *Conf) {
|
|
c.Variables["shared"] = Variable{
|
|
IsTwoWay: true,
|
|
Values: []VariableValue{
|
|
{Value: "/shared/flamenco", Platform: VariablePlatformLinux},
|
|
{Value: `Y:\shared\flamenco`, Platform: VariablePlatformWindows},
|
|
},
|
|
}
|
|
})
|
|
|
|
replacerWin := c.NewVariableToValueConverter(VariableAudienceWorkers, VariablePlatformWindows)
|
|
replacerLnx := c.NewVariableToValueConverter(VariableAudienceWorkers, VariablePlatformLinux)
|
|
|
|
// This is the real reason for this test: forward slashes in the path should
|
|
// still be matched to the backslashes in the variable value.
|
|
assert.Equal(t, `{shared}\shot\file.blend`, replacerWin.Replace(`Y:\shared\flamenco\shot\file.blend`))
|
|
assert.Equal(t, `{shared}/shot/file.blend`, replacerWin.Replace(`Y:/shared/flamenco/shot/file.blend`))
|
|
|
|
assert.Equal(t, `{shared}\shot\file.blend`, replacerLnx.Replace(`/shared\flamenco\shot\file.blend`))
|
|
assert.Equal(t, `{shared}/shot/file.blend`, replacerLnx.Replace(`/shared/flamenco/shot/file.blend`))
|
|
}
|
|
|
|
func TestExpandTwowayVariablesMixedSlashes(t *testing.T) {
|
|
c := DefaultConfig(func(c *Conf) {
|
|
c.Variables["shared"] = Variable{
|
|
IsTwoWay: true,
|
|
Values: []VariableValue{
|
|
{Value: "/shared/flamenco", Platform: VariablePlatformLinux},
|
|
{Value: `Y:\shared\flamenco`, Platform: VariablePlatformWindows},
|
|
},
|
|
}
|
|
})
|
|
|
|
expanderWin := c.NewVariableExpander(VariableAudienceWorkers, VariablePlatformWindows)
|
|
expanderLnx := c.NewVariableExpander(VariableAudienceWorkers, VariablePlatformLinux)
|
|
|
|
// Slashes should always be normalised for the target platform, on the entire path, not just the replaced part.
|
|
assert.Equal(t, `Y:\shared\flamenco\shot\file.blend`, expanderWin.Expand(`{shared}\shot\file.blend`))
|
|
assert.Equal(t, `Y:\shared\flamenco\shot\file.blend`, expanderWin.Expand(`{shared}/shot/file.blend`))
|
|
|
|
assert.Equal(t, `/shared/flamenco/shot/file.blend`, expanderLnx.Expand(`{shared}\shot\file.blend`))
|
|
assert.Equal(t, `/shared/flamenco/shot/file.blend`, expanderLnx.Expand(`{shared}/shot/file.blend`))
|
|
}
|
|
|
|
func TestReplaceTwowayVariablesMixedCase(t *testing.T) {
|
|
c := DefaultConfig(func(c *Conf) {
|
|
c.Variables["shared"] = Variable{
|
|
IsTwoWay: true,
|
|
Values: []VariableValue{
|
|
{Value: "/shared/flamenco", Platform: VariablePlatformLinux},
|
|
{Value: `Y:\shared\flamenco`, Platform: VariablePlatformWindows},
|
|
},
|
|
}
|
|
})
|
|
|
|
replacerWin := c.NewVariableToValueConverter(VariableAudienceWorkers, VariablePlatformWindows)
|
|
|
|
// Both uppercase and lowercase drive letter should match.
|
|
assert.Equal(t, `{shared}\shot\file.blend`, replacerWin.Replace(`y:\shared\flamenco\shot\file.blend`),
|
|
"Lower-case drive letter should match")
|
|
assert.Equal(t, `{shared}\shot\file.blend`, replacerWin.Replace(`Y:\shared\flamenco\shot\file.blend`),
|
|
"Same-case drive letter should match")
|
|
|
|
// Both uppercase and lowercase path should match.
|
|
assert.Equal(t, `{shared}\shot\file.blend`, replacerWin.Replace(`Y:\SHARED\flamenco\shot\file.blend`),
|
|
"Upper case 1st directory component should match")
|
|
assert.Equal(t, `{shared}\SHOT\file.blend`, replacerWin.Replace(`Y:\shared\FLAMENCO\SHOT\file.blend`),
|
|
"Upper case 2nd directory component should match")
|
|
}
|