mirror of
https://github.com/syncthing/syncthing.git
synced 2025-12-23 14:08:06 -05:00
fix(all): various typos (#10242)
This commit is contained in:
4
.github/workflows/build-syncthing.yaml
vendored
4
.github/workflows/build-syncthing.yaml
vendored
@@ -15,7 +15,7 @@ env:
|
|||||||
# expression.
|
# expression.
|
||||||
GO_VERSION: "~1.24.0"
|
GO_VERSION: "~1.24.0"
|
||||||
|
|
||||||
# Optimize compatibility on the slow archictures.
|
# Optimize compatibility on the slow architectures.
|
||||||
GOMIPS: softfloat
|
GOMIPS: softfloat
|
||||||
GOARM: "6"
|
GOARM: "6"
|
||||||
|
|
||||||
@@ -207,7 +207,7 @@ jobs:
|
|||||||
go run build.go -tags "${{env.TAGS}}" -goos windows -goarch amd64 -cc "zig cc -target x86_64-windows" zip $tgt
|
go run build.go -tags "${{env.TAGS}}" -goos windows -goarch amd64 -cc "zig cc -target x86_64-windows" zip $tgt
|
||||||
go run build.go -tags "${{env.TAGS}}" -goos windows -goarch 386 -cc "zig cc -target x86-windows" zip $tgt
|
go run build.go -tags "${{env.TAGS}}" -goos windows -goarch 386 -cc "zig cc -target x86-windows" zip $tgt
|
||||||
go run build.go -tags "${{env.TAGS}}" -goos windows -goarch arm64 -cc "zig cc -target aarch64-windows" zip $tgt
|
go run build.go -tags "${{env.TAGS}}" -goos windows -goarch arm64 -cc "zig cc -target aarch64-windows" zip $tgt
|
||||||
# go run build.go -tags "${{env.TAGS}}" -goos windows -goarch arm -cc "zig cc -target thumb-windows" zip $tgt # failes with linker errors
|
# go run build.go -tags "${{env.TAGS}}" -goos windows -goarch arm -cc "zig cc -target thumb-windows" zip $tgt # fails with linker errors
|
||||||
done
|
done
|
||||||
env:
|
env:
|
||||||
CGO_ENABLED: "1"
|
CGO_ENABLED: "1"
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ type cli struct {
|
|||||||
SentryQueue int `help:"Maximum number of reports to queue for sending to Sentry" default:"64" env:"SENTRY_QUEUE"`
|
SentryQueue int `help:"Maximum number of reports to queue for sending to Sentry" default:"64" env:"SENTRY_QUEUE"`
|
||||||
DiskQueue int `help:"Maximum number of reports to queue for writing to disk" default:"64" env:"DISK_QUEUE"`
|
DiskQueue int `help:"Maximum number of reports to queue for writing to disk" default:"64" env:"DISK_QUEUE"`
|
||||||
MetricsListen string `help:"HTTP listen address for metrics" default:":8081" env:"METRICS_LISTEN_ADDRESS"`
|
MetricsListen string `help:"HTTP listen address for metrics" default:":8081" env:"METRICS_LISTEN_ADDRESS"`
|
||||||
IngorePatterns string `help:"File containing ignore patterns (regexp)" env:"IGNORE_PATTERNS" type:"existingfile"`
|
IgnorePatterns string `help:"File containing ignore patterns (regexp)" env:"IGNORE_PATTERNS" type:"existingfile"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -68,9 +68,9 @@ func main() {
|
|||||||
go ss.Serve(context.Background())
|
go ss.Serve(context.Background())
|
||||||
|
|
||||||
var ip *ignorePatterns
|
var ip *ignorePatterns
|
||||||
if params.IngorePatterns != "" {
|
if params.IgnorePatterns != "" {
|
||||||
var err error
|
var err error
|
||||||
ip, err = loadIgnorePatterns(params.IngorePatterns)
|
ip, err = loadIgnorePatterns(params.IgnorePatterns)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Failed to load ignore patterns: %v", err)
|
log.Fatalf("Failed to load ignore patterns: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ func (p *githubReleases) serveReleases(w http.ResponseWriter, req *http.Request)
|
|||||||
osv := req.Header.Get("Syncthing-Os-Version")
|
osv := req.Header.Get("Syncthing-Os-Version")
|
||||||
if ua != "" && osv != "" {
|
if ua != "" && osv != "" {
|
||||||
// We should determine the compatibility of the releases.
|
// We should determine the compatibility of the releases.
|
||||||
rels = filterForCompabitility(rels, ua, osv)
|
rels = filterForCompatibility(rels, ua, osv)
|
||||||
} else {
|
} else {
|
||||||
metricFilterCalls.WithLabelValues("no-ua-or-osversion").Inc()
|
metricFilterCalls.WithLabelValues("no-ua-or-osversion").Inc()
|
||||||
}
|
}
|
||||||
@@ -224,7 +224,7 @@ func filterForLatest(rels []upgrade.Release) []upgrade.Release {
|
|||||||
|
|
||||||
var userAgentOSArchExp = regexp.MustCompile(`^syncthing.*\(.+ (\w+)-(\w+)\)$`)
|
var userAgentOSArchExp = regexp.MustCompile(`^syncthing.*\(.+ (\w+)-(\w+)\)$`)
|
||||||
|
|
||||||
func filterForCompabitility(rels []upgrade.Release, ua, osv string) []upgrade.Release {
|
func filterForCompatibility(rels []upgrade.Release, ua, osv string) []upgrade.Release {
|
||||||
osArch := userAgentOSArchExp.FindStringSubmatch(ua)
|
osArch := userAgentOSArchExp.FindStringSubmatch(ua)
|
||||||
if len(osArch) != 3 {
|
if len(osArch) != 3 {
|
||||||
metricFilterCalls.WithLabelValues("bad-os-arch").Inc()
|
metricFilterCalls.WithLabelValues("bad-os-arch").Inc()
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ angular.module('syncthing.core')
|
|||||||
// before modal show animation
|
// before modal show animation
|
||||||
$(element).on('show.bs.modal', function () {
|
$(element).on('show.bs.modal', function () {
|
||||||
|
|
||||||
// cycle through open modals, acertain modal with highest z-index
|
// cycle through open modals, ascertain modal with highest z-index
|
||||||
var largestZ = 1040;
|
var largestZ = 1040;
|
||||||
$('.modal:visible').each(function (i) {
|
$('.modal:visible').each(function (i) {
|
||||||
var thisZ = parseInt($(this).css('zIndex'));
|
var thisZ = parseInt($(this).css('zIndex'));
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
-- version of each file is considered the "global" version - the latest one,
|
-- version of each file is considered the "global" version - the latest one,
|
||||||
-- that all other devices strive to replicate. This instance gets the Global
|
-- that all other devices strive to replicate. This instance gets the Global
|
||||||
-- flag bit set. There may be other identical instances of this file
|
-- flag bit set. There may be other identical instances of this file
|
||||||
-- announced by other devices, but only one onstance gets the Global flag;
|
-- announced by other devices, but only one instance gets the Global flag;
|
||||||
-- this simplifies accounting. If the current device has the Global version,
|
-- this simplifies accounting. If the current device has the Global version,
|
||||||
-- the LocalDeviceID instance of the file is the one that has the Global
|
-- the LocalDeviceID instance of the file is the one that has the Global
|
||||||
-- bit.
|
-- bit.
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ func (v VersionParts) Environment() string {
|
|||||||
func ParseVersion(line string) (VersionParts, error) {
|
func ParseVersion(line string) (VersionParts, error) {
|
||||||
m := longVersionRE.FindStringSubmatch(line)
|
m := longVersionRE.FindStringSubmatch(line)
|
||||||
if len(m) == 0 {
|
if len(m) == 0 {
|
||||||
return VersionParts{}, errors.New("unintelligeble version string")
|
return VersionParts{}, errors.New("unintelligible version string")
|
||||||
}
|
}
|
||||||
|
|
||||||
v := VersionParts{
|
v := VersionParts{
|
||||||
|
|||||||
@@ -333,7 +333,7 @@ func (cfg *Configuration) prepareDeviceList() map[protocol.DeviceID]*DeviceConfi
|
|||||||
// - free from duplicates
|
// - free from duplicates
|
||||||
// - no devices with empty ID
|
// - no devices with empty ID
|
||||||
// - sorted by ID
|
// - sorted by ID
|
||||||
// Happen before preparting folders as that needs a correct device list.
|
// Happen before preparing folders as that needs a correct device list.
|
||||||
cfg.Devices = ensureNoDuplicateOrEmptyIDDevices(cfg.Devices)
|
cfg.Devices = ensureNoDuplicateOrEmptyIDDevices(cfg.Devices)
|
||||||
slices.SortFunc(cfg.Devices, func(a, b DeviceConfiguration) int {
|
slices.SortFunc(cfg.Devices, func(a, b DeviceConfiguration) int {
|
||||||
return a.DeviceID.Compare(b.DeviceID)
|
return a.DeviceID.Compare(b.DeviceID)
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ func (opts OptionsConfiguration) MaxFolderConcurrency() int {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
// Otherwise default to the number of CPU cores in the system as a rough
|
// Otherwise default to the number of CPU cores in the system as a rough
|
||||||
// approximation of system powerfullness.
|
// approximation of system powerfulness.
|
||||||
if n := runtime.GOMAXPROCS(-1); n > 0 {
|
if n := runtime.GOMAXPROCS(-1); n > 0 {
|
||||||
return n
|
return n
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -657,7 +657,7 @@ func (*fakeFS) SetXattr(_ string, _ []protocol.Xattr, _ XattrFilter) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// A basic glob-impelementation that should be able to handle
|
// A basic glob-implementation that should be able to handle
|
||||||
// simple test cases.
|
// simple test cases.
|
||||||
func (fs *fakeFS) Glob(pattern string) ([]string, error) {
|
func (fs *fakeFS) Glob(pattern string) ([]string, error) {
|
||||||
dir := filepath.Dir(pattern)
|
dir := filepath.Dir(pattern)
|
||||||
|
|||||||
@@ -323,7 +323,7 @@ func Canonicalize(file string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The relative path should be clean from internal dotdots and similar
|
// The relative path should be clean from internal dotdots and similar
|
||||||
// funkyness.
|
// funkiness.
|
||||||
file = filepath.Clean(file)
|
file = filepath.Clean(file)
|
||||||
|
|
||||||
// It is not acceptable to attempt to traverse upwards.
|
// It is not acceptable to attempt to traverse upwards.
|
||||||
|
|||||||
@@ -1494,7 +1494,7 @@ func TestEscapePipe(t *testing.T) {
|
|||||||
|
|
||||||
// overrideBackslashTests has the same wants as the pipeTests tests.
|
// overrideBackslashTests has the same wants as the pipeTests tests.
|
||||||
// The only difference in the tests is the pipe symbol in the pattern has been
|
// The only difference in the tests is the pipe symbol in the pattern has been
|
||||||
// changed to a backslash. This could be done programatically, if desired.
|
// changed to a backslash. This could be done programmatically, if desired.
|
||||||
var overrideBackslashTests = []escapeTest{
|
var overrideBackslashTests = []escapeTest{
|
||||||
{`a\*`, `a*`, true},
|
{`a\*`, `a*`, true},
|
||||||
{`a\*b`, `a*b`, true},
|
{`a\*b`, `a*b`, true},
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// deviceFolderFileDownloadState holds current download state of a file that
|
// deviceFolderFileDownloadState holds current download state of a file that
|
||||||
// a remote device has advertised. blockIndexes represends indexes within
|
// a remote device has advertised. blockIndexes represents indexes within
|
||||||
// FileInfo.Blocks that the remote device already has, and version represents
|
// FileInfo.Blocks that the remote device already has, and version represents
|
||||||
// the version of the file that the remote device is downloading.
|
// the version of the file that the remote device is downloading.
|
||||||
type deviceFolderFileDownloadState struct {
|
type deviceFolderFileDownloadState struct {
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ func TestDeviceDownloadState(t *testing.T) {
|
|||||||
[]protocol.FileDownloadProgressUpdate{f1v1p1, f1v1p2, f1v2p2},
|
[]protocol.FileDownloadProgressUpdate{f1v1p1, f1v1p2, f1v2p2},
|
||||||
},
|
},
|
||||||
{ // 7
|
{ // 7
|
||||||
// v2 replacees v1, v2 gets deleted, and v2 part 2 gets added.
|
// v2 replaces v1, v2 gets deleted, and v2 part 2 gets added.
|
||||||
[]protocol.FileDownloadProgressUpdate{f1v1p1, f1v1p2, f1v2p1, f1v2del, f1v2p2},
|
[]protocol.FileDownloadProgressUpdate{f1v1p1, f1v1p2, f1v2p1, f1v2del, f1v2p2},
|
||||||
[]protocol.FileDownloadProgressUpdate{f1v2p2},
|
[]protocol.FileDownloadProgressUpdate{f1v2p2},
|
||||||
[]protocol.FileDownloadProgressUpdate{f1v1p1, f1v1p2, f1v2p1},
|
[]protocol.FileDownloadProgressUpdate{f1v1p1, f1v1p2, f1v2p1},
|
||||||
|
|||||||
@@ -951,7 +951,7 @@ func (f *folder) scanTimerFired() error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
f.sl.Error("Failed initial scan", slogutil.Error(err))
|
f.sl.Error("Failed initial scan", slogutil.Error(err))
|
||||||
} else {
|
} else {
|
||||||
f.sl.Info("Competed initial scan")
|
f.sl.Info("Completed initial scan")
|
||||||
}
|
}
|
||||||
close(f.initialScanFinished)
|
close(f.initialScanFinished)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1541,7 +1541,7 @@ func (m *model) ccCheckEncryption(fcfg config.FolderConfiguration, folderDevice
|
|||||||
}
|
}
|
||||||
|
|
||||||
if isEncryptedRemote && isEncryptedLocal {
|
if isEncryptedRemote && isEncryptedLocal {
|
||||||
// Should never happen, but config racyness and be safe.
|
// Should never happen, but config raciness and be safe.
|
||||||
return errEncryptionInvConfigLocal
|
return errEncryptionInvConfigLocal
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3105,7 +3105,7 @@ func (m *model) CommitConfiguration(from, to config.Configuration) bool {
|
|||||||
|
|
||||||
// Some options don't require restart as those components handle it fine
|
// Some options don't require restart as those components handle it fine
|
||||||
// by themselves. Compare the options structs containing only the
|
// by themselves. Compare the options structs containing only the
|
||||||
// attributes that require restart and act apprioriately.
|
// attributes that require restart and act appropriately.
|
||||||
if !reflect.DeepEqual(from.Options.RequiresRestartOnly(), to.Options.RequiresRestartOnly()) {
|
if !reflect.DeepEqual(from.Options.RequiresRestartOnly(), to.Options.RequiresRestartOnly()) {
|
||||||
l.Debugln(m, "requires restart, options differ")
|
l.Debugln(m, "requires restart, options differ")
|
||||||
return false
|
return false
|
||||||
|
|||||||
@@ -745,7 +745,7 @@ func TestRequestRemoteRenameChanged(t *testing.T) {
|
|||||||
}
|
}
|
||||||
case strings.HasPrefix(path, b+".sync-conflict-"):
|
case strings.HasPrefix(path, b+".sync-conflict-"):
|
||||||
if err := equalContents(tfs, path, otherData); err != nil {
|
if err := equalContents(tfs, path, otherData); err != nil {
|
||||||
t.Error(`Sync conflict of "b" has unexptected content`)
|
t.Error(`Sync conflict of "b" has unexpected content`)
|
||||||
}
|
}
|
||||||
case path == "." || strings.HasPrefix(path, ".stfolder"):
|
case path == "." || strings.HasPrefix(path, ".stfolder"):
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// GetInterfaceAddrs returns the IP networks of all interfaces that are up.
|
// GetInterfaceAddrs returns the IP networks of all interfaces that are up.
|
||||||
// Point-to-point interfaces are exluded unless includePtP is true.
|
// Point-to-point interfaces are excluded unless includePtP is true.
|
||||||
func GetInterfaceAddrs(includePtP bool) ([]*net.IPNet, error) {
|
func GetInterfaceAddrs(includePtP bool) ([]*net.IPNet, error) {
|
||||||
intfs, err := netutil.Interfaces()
|
intfs, err := netutil.Interfaces()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -933,7 +933,7 @@ func (c *rawConnection) shouldCompressMessage(msg proto.Message) bool {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close is called when the connection is regularely closed and thus the Close
|
// Close is called when the connection is regularly closed and thus the Close
|
||||||
// BEP message is sent before terminating the actual connection. The error
|
// BEP message is sent before terminating the actual connection. The error
|
||||||
// argument specifies the reason for closing the connection.
|
// argument specifies the reason for closing the connection.
|
||||||
func (c *rawConnection) Close(err error) {
|
func (c *rawConnection) Close(err error) {
|
||||||
|
|||||||
@@ -289,7 +289,7 @@ func TestWriteCompressed(t *testing.T) {
|
|||||||
|
|
||||||
msg := (&Response{Data: make([]byte, 10240)}).toWire()
|
msg := (&Response{Data: make([]byte, 10240)}).toWire()
|
||||||
if random {
|
if random {
|
||||||
// This should make the message uncompressible.
|
// This should make the message incompressible.
|
||||||
rand.Read(msg.Data)
|
rand.Read(msg.Data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ type dynamicAnnouncement struct {
|
|||||||
// relayAddressesOrder checks the latency to each relay, rounds latency down to
|
// relayAddressesOrder checks the latency to each relay, rounds latency down to
|
||||||
// the closest 50ms, and puts them in buckets of 50ms latency ranges. Then
|
// the closest 50ms, and puts them in buckets of 50ms latency ranges. Then
|
||||||
// shuffles each bucket, and returns all addresses starting with the ones from
|
// shuffles each bucket, and returns all addresses starting with the ones from
|
||||||
// the lowest latency bucket, ending with the highest latency buceket.
|
// the lowest latency bucket, ending with the highest latency bucket.
|
||||||
func relayAddressesOrder(ctx context.Context, input []string) []string {
|
func relayAddressesOrder(ctx context.Context, input []string) []string {
|
||||||
buckets := make(map[int][]string)
|
buckets := make(map[int][]string)
|
||||||
|
|
||||||
|
|||||||
@@ -1133,7 +1133,7 @@ fi
|
|||||||
|
|
||||||
if [ "$ft_search" = "1" ];
|
if [ "$ft_search" = "1" ];
|
||||||
then
|
then
|
||||||
# detect bower comoponents location
|
# detect bower components location
|
||||||
bower_components="bower_components"
|
bower_components="bower_components"
|
||||||
bower_rc=$(cd "$git_root" && cat .bowerrc 2>/dev/null || echo "")
|
bower_rc=$(cd "$git_root" && cat .bowerrc 2>/dev/null || echo "")
|
||||||
if [ "$bower_rc" != "" ];
|
if [ "$bower_rc" != "" ];
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ func setupAndBenchmarkTransfer(t *testing.T, files, sizeExp int) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TestBenchmarkTransferSameFiles doesn't actually transfer anything, but tests
|
// TestBenchmarkTransferSameFiles doesn't actually transfer anything, but tests
|
||||||
// how fast two devicees get in sync if they have the same data locally.
|
// how fast two devices get in sync if they have the same data locally.
|
||||||
func TestBenchmarkTransferSameFiles(t *testing.T) {
|
func TestBenchmarkTransferSameFiles(t *testing.T) {
|
||||||
cleanBenchmarkTransfer(t)
|
cleanBenchmarkTransfer(t)
|
||||||
|
|
||||||
|
|||||||
@@ -443,7 +443,7 @@ func startWalker(dir string, res chan<- fileInfo, abort <-chan struct{}) chan er
|
|||||||
name: rn,
|
name: rn,
|
||||||
mode: info.Mode(),
|
mode: info.Mode(),
|
||||||
// comparing timestamps with better precision than a second
|
// comparing timestamps with better precision than a second
|
||||||
// is problematic as there is rounding and truncatign going
|
// is problematic as there is rounding and truncation going
|
||||||
// on at every level
|
// on at every level
|
||||||
mod: info.ModTime().Unix(),
|
mod: info.ModTime().Unix(),
|
||||||
size: info.Size(),
|
size: info.Size(),
|
||||||
|
|||||||
Reference in New Issue
Block a user