diff --git a/ChangeLog.md b/ChangeLog.md index 65726c3..4fc7f60 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,10 @@ ## Pre-V1.0.0 --- +- ## Version 0.8.2 + - Fixed bugs #120 and #118. There was an update to the telophony website we use. This broke NASR2SCT + - Modified backend code to account for HTML updates from various websites NASR2SCT uses. + - ## Version 0.8.1 - Change log on Update question will display all changes from user version and up to the latest release. - FAQ button added. This will take you to a Facts And Questions google slide. diff --git a/ClassData/DataAccess/GetTelephony.cs b/ClassData/DataAccess/GetTelephony.cs index fc5d434..079f867 100644 --- a/ClassData/DataAccess/GetTelephony.cs +++ b/ClassData/DataAccess/GetTelephony.cs @@ -20,13 +20,20 @@ public void readFAAData(string websiteFilePath) bool inTableRow = false; bool inTableData = false; + bool inParagraph = false; TelephonyModel currentTelephony = new TelephonyModel(); int count = 0; + string completedLine = ""; foreach (string line in allLines) { + if (inParagraph == false) + { + completedLine = ""; + } + if (line.Contains("")) { inTableRow = true; @@ -56,9 +63,40 @@ public void readFAAData(string websiteFilePath) { string[] badCharacters = new string[] { " ", ",", ".", "/", "!", "@", "#", "$", "%", "^", "&", "*", "\'", ";", "_", "(", ")", ":", "|", "[", "]", "-", "~", "`", "+", "\"" }; + if (line.Contains("")) + { + completedLine = line.Trim(); + inParagraph = false; + } + else if (line.Contains("")) + { + inParagraph = false; + completedLine += " " + line.Trim(); + } + else if (inParagraph) + { + completedLine += " " + line.Trim(); + continue; + } + else + { + continue; + } + + + if (completedLine == "") + { + throw new Exception("Error creating full paragraph tag."); + } if (count == 1) { - string telephonyData = line.Split('>')[1]; + string telephonyData = completedLine.Split('>')[1]; if (telephonyData.Contains('<')) { @@ -78,7 +116,7 @@ public void readFAAData(string websiteFilePath) } else if (count == 4) { - string threeLDData = line.Split('>')[1]; + string threeLDData = completedLine.Split('>')[1]; if (threeLDData.Contains('<')) { diff --git a/ClassData/GlobalConfig.cs b/ClassData/GlobalConfig.cs index 4ab5b02..aadf7de 100644 --- a/ClassData/GlobalConfig.cs +++ b/ClassData/GlobalConfig.cs @@ -24,7 +24,7 @@ namespace NASARData /// public class GlobalConfig { - public static readonly string ProgramVersion = "0.8.1"; + public static readonly string ProgramVersion = "0.8.2"; public static string GithubVersion = ""; diff --git a/NASR_GUI/Properties/AssemblyInfo.cs b/NASR_GUI/Properties/AssemblyInfo.cs index ef5e02d..52f0f05 100644 --- a/NASR_GUI/Properties/AssemblyInfo.cs +++ b/NASR_GUI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.8.1")] -[assembly: AssemblyFileVersion("0.8.1")] +[assembly: AssemblyVersion("0.8.2")] +[assembly: AssemblyFileVersion("0.8.2")] diff --git a/ReleaseTemplate.txt b/ReleaseTemplate.txt index 06a81f0..5445a6f 100644 --- a/ReleaseTemplate.txt +++ b/ReleaseTemplate.txt @@ -1,6 +1,6 @@ -0.8.1 +0.8.2 -Release Candidate V-0.8.1 +Release Candidate V-0.8.2 ## Instructions to install: 1. Download the zip file named "NASR2SCT-0.8.1.zip" @@ -9,13 +9,5 @@ Release Candidate V-0.8.1 4. Run the Setup.exe ## Change log: -- Change log on Update question will display all changes from user version and up to the latest release. -- FAQ button added. This will take you to a Facts And Questions google slide. -- Choosing AIRAC cycle phrase/question changed. -- Fixed bug where program crashes if the user is not connected to the internet. -- Fixed bug where program states it's complete when it really is not. This happened when a file download failed. -- Fixed Credit screen title. -- New Functionality to FAA Chart Recal Commands - - Charts without computer codes will be generated with the first 5 characters (not including spaces) of the chart name. -- Gather WX Station data from Vatsim - - This may cause issues, if so please report in issues section on github. +- Fixed backend code to account for HTML changes for the websites NASR2SCT uses. +- Fixed bugs #118 and #120 diff --git a/packages/squirrel.windows.2.0.1/tools/Squirrel-Releasify.log b/packages/squirrel.windows.2.0.1/tools/Squirrel-Releasify.log index 6f6b294..8fbe380 100644 --- a/packages/squirrel.windows.2.0.1/tools/Squirrel-Releasify.log +++ b/packages/squirrel.windows.2.0.1/tools/Squirrel-Releasify.log @@ -1,18 +1,9 @@ -[03/06/21 10:48:37] info: Program: Starting Squirrel Updater: --releasify NASR2SCT.0.8.0.nupkg -[03/06/21 10:48:37] info: Program: Bootstrapper EXE found at:C:\Repos\NASR2SCT\packages\squirrel.windows.2.0.1\tools\Setup.exe -[03/06/21 10:48:37] info: Program: Creating release package: C:\Repos\NASR2SCT\Releases\NASR2SCT.0.8.0.nupkg -[03/06/21 10:48:37] info: ReleasePackage: Creating release package: C:\Repos\NASR2SCT\Releases\NASR2SCT.0.8.0.nupkg => C:\Repos\NASR2SCT\Releases\NASR2SCT-0.8.0-full.nupkg -[03/06/21 10:48:37] info: ReleasePackage: Extracting dependent packages: [] -[03/06/21 10:48:37] info: ReleasePackage: Removing unnecessary data -[03/06/21 10:48:37] info: ReleasePackage: No release notes found in C:\Users\Pocono Coast West\AppData\Local\SquirrelTemp\tempc\NASR2SCT.nuspec -[03/06/21 10:48:38] info: Program: Building embedded zip file for Setup.exe -[03/06/21 10:48:42] info: Program: Finished Squirrel Updater -[03/08/21 18:11:03] info: Program: Starting Squirrel Updater: --releasify NASR2SCT.0.8.1.nupkg -[03/08/21 18:11:03] info: Program: Bootstrapper EXE found at:C:\Repos\NASR2SCT\packages\squirrel.windows.2.0.1\tools\Setup.exe -[03/08/21 18:11:03] info: Program: Creating release package: C:\Repos\NASR2SCT\Releases\NASR2SCT.0.8.1.nupkg -[03/08/21 18:11:04] info: ReleasePackage: Creating release package: C:\Repos\NASR2SCT\Releases\NASR2SCT.0.8.1.nupkg => C:\Repos\NASR2SCT\Releases\NASR2SCT-0.8.1-full.nupkg -[03/08/21 18:11:04] info: ReleasePackage: Extracting dependent packages: [] -[03/08/21 18:11:04] info: ReleasePackage: Removing unnecessary data -[03/08/21 18:11:04] info: ReleasePackage: No release notes found in C:\Users\nikol\AppData\Local\SquirrelTemp\tempa\NASR2SCT.nuspec -[03/08/21 18:11:06] info: Program: Building embedded zip file for Setup.exe -[03/08/21 18:11:11] info: Program: Finished Squirrel Updater +[28/08/21 12:48:50] info: Program: Starting Squirrel Updater: --releasify NASR2SCT.0.8.2.nupkg +[28/08/21 12:48:50] info: Program: Bootstrapper EXE found at:C:\Repos\NASR2SCT\packages\squirrel.windows.2.0.1\tools\Setup.exe +[28/08/21 12:48:50] info: Program: Creating release package: C:\Repos\NASR2SCT\Releases\NASR2SCT.0.8.2.nupkg +[28/08/21 12:48:50] info: ReleasePackage: Creating release package: C:\Repos\NASR2SCT\Releases\NASR2SCT.0.8.2.nupkg => C:\Repos\NASR2SCT\Releases\NASR2SCT-0.8.2-full.nupkg +[28/08/21 12:48:50] info: ReleasePackage: Extracting dependent packages: [] +[28/08/21 12:48:50] info: ReleasePackage: Removing unnecessary data +[28/08/21 12:48:50] info: ReleasePackage: No release notes found in C:\Users\Pocono Coast West\AppData\Local\SquirrelTemp\tempc\NASR2SCT.nuspec +[28/08/21 12:48:51] info: Program: Building embedded zip file for Setup.exe +[28/08/21 12:48:55] info: Program: Finished Squirrel Updater