phares3757/met08resimapcde
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nuget bump and QP oversight

Browse Source
This commit is contained in:
Mike Phares
2023-03-22 10:46:29 -07:00
parent c872a67ac1
commit e8dbeab4b0
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Adaptation/FileHandlers/RsM/ProcessData.cs
View File

@ -93,7 +93,7 @@ public class ProcessData : IProcessData
reactor = defaultReactor;
else
reactor = segments[0];
if (segments.Length <= 1 || !int.TryParse(segments[1], out int rdsValue) || rdsValue < 99)
if (segments.Length <= 1 || !int.TryParse(segments[1].Replace("QP", string.Empty), out int rdsValue) || rdsValue < 99)
rds = defaultRDS;
else
rds = segments[1];
@ -193,7 +193,7 @@ public class ProcessData : IProcessData
title = title.Substring(2);
run = title;
string[] segments = title.Split('-');
bool hasRDS = Regex.IsMatch(title, "[-]?[0-9]{5,}[-]?");
bool hasRDS = Regex.IsMatch(title, "[-]?([QP][0-9]{4,}|[0-9]{5,})[-]?");
(reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments, hasRDS);
(layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments, hasRDS);
zone = GetZone(segments);

4
Adaptation/FileHandlers/txt/ProcessData.cs
View File

@ -250,7 +250,7 @@ public class ProcessData : IProcessData
reactor = defaultReactor;
else
reactor = segments[0];
if (segments.Length <= 1 || !int.TryParse(segments[1], out int rdsValue) || rdsValue < 99)
if (segments.Length <= 1 || !int.TryParse(segments[1].Replace("QP", string.Empty), out int rdsValue) || rdsValue < 99)
rds = defaultRDS;
else
rds = segments[1];
@ -352,7 +352,7 @@ public class ProcessData : IProcessData
title = title.Substring(2);
run = title;
string[] segments = title.Split('-');
bool hasRDS = Regex.IsMatch(title, "[-]?[0-9]{5,}[-]?");
bool hasRDS = Regex.IsMatch(title, "[-]?([QP][0-9]{4,}|[0-9]{5,})[-]?");
(reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments, hasRDS);
(layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments, hasRDS);
zone = GetZone(segments);