From d11b0e29d2659f36e722c4902f18942900fb4489 Mon Sep 17 00:00:00 2001 From: etogood Date: Wed, 3 Jul 2024 16:24:01 +0300 Subject: [PATCH] add: cyrillic and numeric file naming --- src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrExTests.cs | 2 +- src/Asv.Mavlink/Microservices/AsvAudio/AsvAudioHelper.cs | 2 +- src/Asv.Mavlink/Microservices/AsvSdr/AsvSdrHelper.cs | 6 +++--- .../Microservices/ParamsExt/Tools/MavParamExtHelper.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrExTests.cs b/src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrExTests.cs index f22bcc3d..ea776ee6 100644 --- a/src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrExTests.cs +++ b/src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrExTests.cs @@ -624,7 +624,7 @@ await Assert.ThrowsAsync( async () => catch (Exception e) { _testOutputHelper.WriteLine(e.ToString()); - Assert.Equal("Record name 'Test*' not match regex '^[A-Za-z][A-Za-z0-9_\\- +]{2,28}$')", e.Message); + Assert.Equal("Record name 'Test*' not match regex '^[A-Za-zА-Яа-я0-9][A-Za-zА-Яа-я0-9_\\- +]{2,28}$')", e.Message); throw; } }); diff --git a/src/Asv.Mavlink/Microservices/AsvAudio/AsvAudioHelper.cs b/src/Asv.Mavlink/Microservices/AsvAudio/AsvAudioHelper.cs index 2c6e30e7..04365361 100644 --- a/src/Asv.Mavlink/Microservices/AsvAudio/AsvAudioHelper.cs +++ b/src/Asv.Mavlink/Microservices/AsvAudio/AsvAudioHelper.cs @@ -10,7 +10,7 @@ public static class AsvAudioHelper { public const int MaxPacketStreamData = AsvAudioStreamPayload.DataMaxItemsCount; public const int DeviceNameMaxLength = 16; - private const string DeviceNameRegexString = "^[A-Za-z][A-Za-z0-9_\\- +]{2,16}$"; + private const string DeviceNameRegexString = "^[A-Za-zА-Яа-я0-9][A-Za-zА-Яа-я0-9_\\- +]{2,16}$"; private static readonly Regex RecordNameRegex = new(DeviceNameRegexString, RegexOptions.Compiled); public static void CheckDeviceName(string name) diff --git a/src/Asv.Mavlink/Microservices/AsvSdr/AsvSdrHelper.cs b/src/Asv.Mavlink/Microservices/AsvSdr/AsvSdrHelper.cs index 61725465..5bf1e0e2 100644 --- a/src/Asv.Mavlink/Microservices/AsvSdr/AsvSdrHelper.cs +++ b/src/Asv.Mavlink/Microservices/AsvSdr/AsvSdrHelper.cs @@ -12,17 +12,17 @@ public static class AsvSdrHelper public const int RecordTagValueLength = 8; public const int RecordNameMaxLength = 28; - private const string RecordNameRegexString = "^[A-Za-z][A-Za-z0-9_\\- +]{2,28}$"; + private const string RecordNameRegexString = "^[A-Za-zА-Яа-я0-9][A-Za-zА-Яа-я0-9_\\- +]{2,28}$"; private static readonly Regex RecordNameRegex = new(RecordNameRegexString, RegexOptions.Compiled); public const int RecordTagNameMaxLength = 16; - private const string RecordTagNameRegexString = "^[A-Za-z][A-Za-z0-9_\\- +]{2,16}$"; + private const string RecordTagNameRegexString = "^[A-Za-zА-Яа-я0-9][A-Za-zА-Яа-я0-9_\\- +]{2,16}$"; private static readonly Regex RecordTagNameRegex = new(RecordTagNameRegexString, RegexOptions.Compiled); public const int CalibrationTableNameMaxLength = 28; - private const string CalibrationTableNameRegexString = "^[A-Za-z][A-Za-z0-9_\\- +]{2,28}$"; + private const string CalibrationTableNameRegexString = "^[A-Za-zА-Яа-я0-9][A-Za-zА-Яа-я0-9_\\- +]{2,28}$"; private static readonly Regex CalibrationTableNameRegex = new(CalibrationTableNameRegexString, RegexOptions.Compiled); public static void CheckCalibrationTableName(string name) diff --git a/src/Asv.Mavlink/Microservices/ParamsExt/Tools/MavParamExtHelper.cs b/src/Asv.Mavlink/Microservices/ParamsExt/Tools/MavParamExtHelper.cs index a09e4184..08d9efe9 100644 --- a/src/Asv.Mavlink/Microservices/ParamsExt/Tools/MavParamExtHelper.cs +++ b/src/Asv.Mavlink/Microservices/ParamsExt/Tools/MavParamExtHelper.cs @@ -11,7 +11,7 @@ namespace Asv.Mavlink; public static class MavParamExtHelper { public const int ParamExtNameMaxLength = 16; - private const string ParamExtNameRegexString = "^[A-Za-z][A-Za-z0-9_]{2,16}$"; + private const string ParamExtNameRegexString = "^[A-Za-zА-Яа-я0-9][A-Za-zА-Яа-я0-9_]{2,16}$"; private static readonly Regex RecordNameRegex = new(ParamExtNameRegexString, RegexOptions.Compiled); public static void CheckParamName(string name)