diff --git a/core/external_metadata.go b/core/external_metadata.go index ffa5c7da..8c8db7d1 100644 --- a/core/external_metadata.go +++ b/core/external_metadata.go @@ -8,7 +8,7 @@ import ( "time" "github.com/Masterminds/squirrel" - "github.com/kennygrant/sanitize" + "github.com/deluan/sanitize" "github.com/navidrome/navidrome/consts" "github.com/navidrome/navidrome/core/agents" _ "github.com/navidrome/navidrome/core/agents/lastfm" diff --git a/db/migration/20211023184825_add_order_title_to_media_file.go b/db/migration/20211023184825_add_order_title_to_media_file.go index 012ab76d..42f8a67f 100644 --- a/db/migration/20211023184825_add_order_title_to_media_file.go +++ b/db/migration/20211023184825_add_order_title_to_media_file.go @@ -4,7 +4,7 @@ import ( "database/sql" "strings" - "github.com/kennygrant/sanitize" + "github.com/deluan/sanitize" "github.com/navidrome/navidrome/log" "github.com/pressly/goose" diff --git a/go.mod b/go.mod index 0aa9563c..4e2b43e8 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/bradleyjkemp/cupaloy/v2 v2.8.0 github.com/cespare/reflex v0.3.1 github.com/deluan/rest v0.0.0-20211101235434-380523c4bb47 + github.com/deluan/sanitize v0.0.0-20180806073457-06ec0d0dbcd4 github.com/dhowden/tag v0.0.0-20220618230019-adf36e896086 github.com/disintegration/imaging v1.6.2 github.com/djherbis/atime v1.1.0 @@ -25,7 +26,6 @@ require ( github.com/google/uuid v1.3.0 github.com/google/wire v0.5.0 github.com/hashicorp/go-multierror v1.1.1 - github.com/kennygrant/sanitize v0.0.0-20170120101633-6a0bfdde8629 github.com/kr/pretty v0.3.1 github.com/lestrrat-go/jwx/v2 v2.0.8 github.com/matoous/go-nanoid v1.5.0 diff --git a/go.sum b/go.sum index dd4628fb..a82cf6f5 100644 --- a/go.sum +++ b/go.sum @@ -139,6 +139,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= github.com/deluan/rest v0.0.0-20211101235434-380523c4bb47 h1:IhGAYGDi212gspq0XkYAI+DN5e9lfAIm8Qgu1wj9yN4= github.com/deluan/rest v0.0.0-20211101235434-380523c4bb47/go.mod h1:tSgDythFsl0QgS/PFWfIZqcJKnkADWneY80jaVRlqK8= +github.com/deluan/sanitize v0.0.0-20180806073457-06ec0d0dbcd4 h1:InFtwusyW3EYzJij24J+1dAHnQnXx1no2FlY52XBdyQ= +github.com/deluan/sanitize v0.0.0-20180806073457-06ec0d0dbcd4/go.mod h1:y973LnzsvCnDm0L+WTN/QMcFCdxehofrM9ejXZNhbjA= github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= github.com/denisenkom/go-mssqldb v0.10.0 h1:QykgLZBorFE95+gO3u9esLd0BmbvpWp0/waNNZfHBM8= @@ -392,8 +394,6 @@ github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY= github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -github.com/kennygrant/sanitize v0.0.0-20170120101633-6a0bfdde8629 h1:m1E9veL+2sjZOMSM7y3a6jJ9fNVaGyIJCXYDPm9U+/0= -github.com/kennygrant/sanitize v0.0.0-20170120101633-6a0bfdde8629/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak= github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c= github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= diff --git a/scanner/mapping.go b/scanner/mapping.go index 9581ca2a..79367f1d 100644 --- a/scanner/mapping.go +++ b/scanner/mapping.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/kennygrant/sanitize" + "github.com/deluan/sanitize" "github.com/navidrome/navidrome/conf" "github.com/navidrome/navidrome/consts" "github.com/navidrome/navidrome/model" diff --git a/server/subsonic/searching.go b/server/subsonic/searching.go index ba72d8e6..f1d8c37d 100644 --- a/server/subsonic/searching.go +++ b/server/subsonic/searching.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/kennygrant/sanitize" + "github.com/deluan/sanitize" "github.com/navidrome/navidrome/log" "github.com/navidrome/navidrome/model" "github.com/navidrome/navidrome/server/subsonic/responses" diff --git a/utils/sanitize_strings.go b/utils/sanitize_strings.go index 93a36ebb..a8d9b576 100644 --- a/utils/sanitize_strings.go +++ b/utils/sanitize_strings.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/kennygrant/sanitize" + "github.com/deluan/sanitize" "github.com/microcosm-cc/bluemonday" )